Berkeley DB 4.2 support (DB 4.2 required by default)

[openldap] / servers / slapd / unbind.c

diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index 1416393343a1c4e395298ee0d0a6d73cf3c8e98e..e3d73bf55e0c433ef5db615c24becbcaf1e9ac7c 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-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
@@ -21,14 +26,15 @@
 
 #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:
@@ -36,12 +42,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 */
-       backend_unbind( conn, op );
-       
-       /* close the connection to the client */
-       close_connection( conn, op->o_connid, op->o_opid );
+       backend_unbind( op, rs );
+
+       return 0;
 }