X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Funbind.c;h=cf2c975b60b379ff38685faff3bb80da36a5bd19;hb=a26612bc00bacbc660fa4a26466f609a29a1d072;hp=487fbbead5af88c2fd0e214850d8d0be12863c74;hpb=b76c56ba3f45576b9c418ea9fe7f7b3440052904;p=openldap

diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index 487fbbead5..cf2c975b60 100644
--- 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.
@@ -16,23 +21,25 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include "slap.h"
 
-extern Backend	*select_backend();
-extern void      be_unbind();
+#include <ac/socket.h>
 
-extern char		*default_referral;
-extern pthread_mutex_t	new_conn_mutex;
+#include "slap.h"
 
-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:
@@ -40,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;
 }