steffen: server/kolabd/kolabd kolab_smtpdpolicy,1.1.1.1,1.2

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv13287/kolabd/kolabd

Modified Files:
	kolab_smtpdpolicy 
Log Message:
fixes for issues 243 (recurrence) and 616 (policy server/ldap)

Index: kolab_smtpdpolicy
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_smtpdpolicy,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- kolab_smtpdpolicy	23 Nov 2004 20:26:47 -0000	1.1.1.1
+++ kolab_smtpdpolicy	14 Jan 2005 04:41:13 -0000	1.2
@@ -181,6 +181,7 @@
   } else {
     # LDAP error?
     mylog($syslog_priority, "Query returned error: ".$mesg->error ) if $verbose;	
+    return "DEFER_IF_PERMIT Temporary LDAP error: ".$mesg->error;
   }
   if( $conf_allowunauth && !$username ) {
     # Dont reject mail from other domains
@@ -204,14 +205,15 @@
     my $cn = $1;
     my $domain = $2;
     if( contains($domain,\@conf_domain ) ) {
-      $mesg = $ldap->search( base=> "cn=$cn,cn=internal,".$conf_basedn,
-                             scope=> 'exact', filter=> "(objectClass=kolabgroupofnames)");
+      $mesg = $ldap->search( base=> "cn=internal,".$conf_basedn,
+                             scope=> 'one', filter=> "(&(cn=$cn)(objectClass=kolabgroupofnames))");
       if( !$mesg->code && $mesg->count() > 0 ) {
 	# Ups, recipient is a restricted list, reject
 	mylog( $syslog_priority, "Attempt from $sender to access restricted list $recip" ) if $verbose;	
 	return "REJECT Access denied";
       } elsif( $mesg->code ) {
-	#mylog( $syslog_priority, "LDAP Error: ".$mesg->error );
+	mylog( $syslog_priority, "LDAP Error: ".$mesg->error ) if $verbose;
+	return "DEFER_IF_PERMIT Temporary LDAP error: ".$mesg->error;
       }
     }
   }
@@ -237,6 +239,7 @@
 sub fatal_exit {
     my($first) = shift(@_);
     mylog("err", "fatal: $first", @_);
+    print STDOUT "action=DEFER_IF_PERMIT $first\n\n";
     exit 1;
 }