steffen: server/perl-kolab/Kolab-LDAP-Backend-slurpd slurpd.pm, 1.11, 1.12

cvs at intevation.de cvs at intevation.de
Mon Nov 8 00:07:29 CET 2004


Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd
In directory doto:/tmp/cvs-serv13907/perl-kolab/Kolab-LDAP-Backend-slurpd

Modified Files:
	slurpd.pm 
Log Message:
Hopefully a fix for issue513 (dead kolabd)

Index: slurpd.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd/slurpd.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- slurpd.pm	1 Sep 2004 22:14:15 -0000	1.11
+++ slurpd.pm	7 Nov 2004 23:07:27 -0000	1.12
@@ -292,25 +292,27 @@
                     Kolab::log('SD', "Unable to decode slurpd request, Error = `" . $LDAPRequest->error . "'", KOLAB_ERROR);
 		    $conn->close;
 		    undef $conn;
-                }
-                $_ = getRequestType($request);
-                Kolab::log('SD', "Request $_ received", KOLAB_DEBUG);
-                undef $pdu;
+		    undef $pdu;
+                } else {
+		    $_ = getRequestType($request);
+		    Kolab::log('SD', "Request $_ received", KOLAB_DEBUG);
+		    undef $pdu;
 
-                SWITCH: {
-                    if (/^bindRequest/) { $pdu = responseBind($request); last SWITCH; }
-                    if (/addRequest/) { $pdu = responseAdd($request); $changes = 1; last SWITCH; }
-                    if (/delRequest/) { $pdu = responseDel($request); $changes = 1; last SWITCH; }
-                    if (/modifyRequest/) { $pdu = responseMod($request); $changes = 1; last SWITCH; }
-                    if (/modDNRequest/) { $pdu = responseModDN($request); $changes = 1; last SWITCH; }
+		    SWITCH: {
+		      if (/^bindRequest/) { $pdu = responseBind($request); last SWITCH; }
+                      if (/addRequest/) { $pdu = responseAdd($request); $changes = 1; last SWITCH; }
+                      if (/delRequest/) { $pdu = responseDel($request); $changes = 1; last SWITCH; }
+                      if (/modifyRequest/) { $pdu = responseMod($request); $changes = 1; last SWITCH; }
+                      if (/modDNRequest/) { $pdu = responseModDN($request); $changes = 1; last SWITCH; }
 
-                    if( $conn ) {
-		      Kolab::log('SD', 'Unknown request, connection closed', KOLAB_DEBUG);
-		      $conn->close;
-		      undef $conn;
+                      if( $conn ) {
+		        Kolab::log('SD', 'Unknown request, connection closed', KOLAB_DEBUG);
+		        $conn->close;
+		        undef $conn;
+		      }
 		    }
-                }
-            }
+		}
+	    }
 
             if ($pdu) {
                 Kolab::log('SD', 'Writing response', KOLAB_DEBUG);





More information about the commits mailing list