fix for select_backend suggested G. Gombas (ITS 1090)

[openldap] / servers / slapd / unbind.c

diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index 1b0d820e68aa11be91e7e98fab34fdfc2503277c..cf2c975b60b379ff38685faff3bb80da36a5bd19 100644 (file)
--- a/servers/slapd/unbind.c
+++ b/servers/slapd/unbind.c
@@ -1,4 +1,9 @@
 /* unbind.c - decode an ldap unbind operation and pass it to a backend db */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
@@ -21,19 +26,20 @@
 
 #include "slap.h"
 
-extern Backend *select_backend();
-extern void      be_unbind();
-
-extern char            *default_referral;
-extern pthread_mutex_t new_conn_mutex;
 
-void
+int
 do_unbind(
     Connection *conn,
     Operation  *op
 )
 {
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "do_unbind: conn %d\n", conn ? conn->c_connid : -1 ));
+#else
        Debug( LDAP_DEBUG_TRACE, "do_unbind\n", 0, 0, 0 );
+#endif
+
 
        /*
         * Parse the unbind request.  It looks like this:
@@ -41,12 +47,11 @@ do_unbind(
         *      UnBindRequest ::= NULL
         */
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d UNBIND\n", conn->c_connid,
+       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d UNBIND\n", op->o_connid,
            op->o_opid, 0, 0, 0 );
 
        /* pass the unbind to all backends */
-       be_unbind( conn, op );
-       
-       /* close the connection to the client */
-       close_connection( conn, op->o_connid, op->o_opid );
+       backend_unbind( conn, op );
+
+       return 0;
 }