steffen: server/kolabd/kolabd kolab_smtpdpolicy,1.3,1.4

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	kolab_smtpdpolicy 
Log Message:
Fix for Issue616 (policy...)

Index: kolab_smtpdpolicy
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_smtpdpolicy,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab_smtpdpolicy	14 Jan 2005 15:58:25 -0000	1.3
+++ kolab_smtpdpolicy	14 Jan 2005 16:45:54 -0000	1.4
@@ -176,14 +176,14 @@
       my $ldapobject = $mesg->entry(0);
       $username = lc($ldapobject->get_value('mail'));
       mylog($syslog_priority, "Translated username to $username") if $verbose;
-  } elsif( $mesg->code != LDAP_NO_SUCH_OBJECT ) {
+  } elsif( $mesg->code && $mesg->code != LDAP_NO_SUCH_OBJECT ) {
       if( $tries++ <= $ldap_max_tries ) {
-	  mylog($syslog_priority, "LDAP Connection error: ".$mesg->error.". trying to reconnect" );
+	  mylog($syslog_priority, "LDAP Connection error during LOOKUPUID: ".$mesg->error.". trying to reconnect" );
 	  ldap_connect;
 	  goto LOOKUPUID;
       } else {
-	  mylog($syslog_priority, "LDAP Connection error: ".$mesg->error.", giving up!" );
-	  return "DEFER_IF_PERMIT LDAP Error: ".$mesg->error;
+	  mylog($syslog_priority, "LDAP Connection error during LOOKUPUID: ".$mesg->error.", giving up!" );
+	  return "DEFER_IF_PERMIT LDAP Error during LOOKUPUID:: ".$mesg->error;
       }
   }
   # Check for allowed sender
@@ -209,12 +209,12 @@
   } else {
       # LDAP error?
       if( $mesg->code != LDAP_NO_SUCH_OBJECT && $tries++ <= $ldap_max_tries ) {
-	  mylog($syslog_priority, "LDAP Connection error: ".$mesg->error.", trying to reconnect" );
+	  mylog($syslog_priority, "LDAP Connection error during CHECKSENDER: ".$mesg->error.", trying to reconnect" );
 	  ldap_connect;
 	  goto CHECKSENDER;
       } else {
-	  mylog($syslog_priority, "Query returned error: ".$mesg->error ) if $verbose;	
-	  return "DEFER_IF_PERMIT Temporary LDAP error: ".$mesg->error;
+	  mylog($syslog_priority, "Query returned error during CHECKSENDER: ".$mesg->error ) if $verbose;	
+	  return "DEFER_IF_PERMIT Temporary LDAP error during CHECKSENDER: ".$mesg->error;
       }
   }
   if( $conf_allowunauth && !$username ) {
@@ -246,13 +246,13 @@
 	# 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 != LDAP_NO_SUCH_OBJECT && $tries++ <= $ldap_max_tries ) {
-	  mylog($syslog_priority, "LDAP Connection error: ".$mesg->error.", trying to reconnect" );
+      } elsif( $mesg->code && $mesg->code != LDAP_NO_SUCH_OBJECT && $tries++ <= $ldap_max_tries ) {
+	  mylog($syslog_priority, "LDAP Connection error during CHECKDISTLIST: ".$mesg->error.", trying to reconnect" );
 	  ldap_connect;
 	  goto CHECKDISTLIST;
-      } else {
-	mylog( $syslog_priority, "LDAP Error: ".$mesg->error ) if $verbose;
-	return "DEFER_IF_PERMIT Temporary LDAP error: ".$mesg->error;
+      } elsif( $mesg->code ) {
+	mylog( $syslog_priority, "LDAP Error during CHECKDISTLIST: ".$mesg->error ) if $verbose;
+	return "DEFER_IF_PERMIT LDAP error during CHECKDISTLIST: ".$mesg->error;
       }
     }
   }