fix ITS#3834

[openldap] / servers / slapd / unbind.c

diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index 487fbbead5af88c2fd0e214850d8d0be12863c74..0a9d4e4fd4d282b46147c2bdb4394342e1a176fe 100644 (file)
--- 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-2005 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
@@ -16,21 +28,13 @@
 #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 )
 {
        Debug( LDAP_DEBUG_TRACE, "do_unbind\n", 0, 0, 0 );
 
@@ -40,12 +44,18 @@ do_unbind(
         *      UnBindRequest ::= NULL
         */
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d UNBIND\n", conn->c_connid,
-           op->o_opid, 0, 0, 0 );
+       Statslog( LDAP_DEBUG_STATS, "%s UNBIND\n", op->o_log_prefix,
+               0, 0, 0, 0 );
+
+       if ( frontendDB->be_unbind ) {
+               op->o_bd = frontendDB;
+               (void)frontendDB->be_unbind( op, rs );
+               op->o_bd = NULL;
+       }
 
        /* 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 );
+       (void)backend_unbind( op, rs );
+
+       return 0;
 }
+