X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Funbind.c;h=32eb609fca49057ce504f7d4cba56a554b39deab;hb=47c6701a2293fec249cdb84f69b37addfb4b36fc;hp=500006c34f0a76218346a570a99fb6d992198863;hpb=42e0d83cb3a1a1c5b25183f1ab74ce7edbe25de7;p=openldap

diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index 500006c34f..32eb609fca 100644
--- a/servers/slapd/unbind.c
+++ b/servers/slapd/unbind.c
@@ -1,7 +1,19 @@
 /* unbind.c - decode an ldap unbind operation and pass it to a backend db */
-
-/*
- * Copyright (c) 1995 Regents of the University of Michigan.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -13,24 +25,23 @@
  *
  */
 
+#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
-do_unbind(
-    Connection	*conn,
-    Operation	*op
-)
+int
+do_unbind( Operation *op, SlapReply *rs )
 {
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, ENTRY, 
+		"do_unbind: conn %d\n", op->o_connid ? op->o_connid : -1, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, "do_unbind\n", 0, 0, 0 );
+#endif
 
 	/*
 	 * Parse the unbind request.  It looks like this:
@@ -38,12 +49,11 @@ do_unbind(
 	 *	UnBindRequest ::= NULL
 	 */
 
-	Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d UNBIND\n", conn->c_connid,
+	Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu 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( op, rs );
+
+	return 0;
 }