ITS5282 fix for 2.3

[openldap] / servers / slapd / unbind.c

diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index 21e8be326ac9d941491653eb0fec3f1e3950b861..87263443a50686cfdf1889517ae5c54b59963616 100644 (file)
--- a/servers/slapd/unbind.c
+++ b/servers/slapd/unbind.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,12 +36,7 @@
 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:
@@ -49,11 +44,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;
 }
+