X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Funbind.c;h=d67d86181d55717c97db18228195d323cfffff33;hb=e0952945d0b6da70703a711c91306be07d31ea1a;hp=7515837d516bc95156a1279240e89b6b4fa79488;hpb=e8c58b4e7f21caa6c0b6006e3528cbad9b8aed45;p=openldap

diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index 7515837d51..d67d86181d 100644
--- a/servers/slapd/unbind.c
+++ b/servers/slapd/unbind.c
@@ -1,12 +1,19 @@
 /* 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
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2008 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>.
  */
-
-/*
- * Copyright (c) 1995 Regents of the University of Michigan.
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -29,12 +36,8 @@
 int
 do_unbind( Operation *op, SlapReply *rs )
 {
-#ifdef NEW_LOGGING
-	LDAP_LOG( OPERATION, ENTRY, 
-		"do_unbind: conn %d\n", op->o_connid : -1, 0, 0 );
-#else
-	Debug( LDAP_DEBUG_TRACE, "do_unbind\n", 0, 0, 0 );
-#endif
+	Debug( LDAP_DEBUG_TRACE, "%s do_unbind\n",
+		op->o_log_prefix, 0, 0 );
 
 	/*
 	 * Parse the unbind request.  It looks like this:
@@ -42,11 +45,18 @@ do_unbind( Operation *op, SlapReply *rs )
 	 *	UnBindRequest ::= NULL
 	 */
 
-	Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu UNBIND\n", op->o_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 */
-	backend_unbind( op, rs );
+	(void)backend_unbind( op, rs );
 
 	return 0;
 }
+