X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Funbind.c;h=d67d86181d55717c97db18228195d323cfffff33;hb=3bf9998d7885ef6bbc4690d4229e5cb5068a35de;hp=cf2c975b60b379ff38685faff3bb80da36a5bd19;hpb=f49fd8a98e6849f74e50a01165f4214b065b9b00;p=openldap
diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index cf2c975b60..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-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * 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
+ * .
*/
-
-/*
- * 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
@@ -26,20 +33,11 @@
#include "slap.h"
-
int
-do_unbind(
- Connection *conn,
- Operation *op
-)
+do_unbind( Operation *op, SlapReply *rs )
{
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
- "do_unbind: conn %d\n", conn ? conn->c_connid : -1 ));
-#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:
@@ -47,11 +45,18 @@ do_unbind(
* UnBindRequest ::= NULL
*/
- Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d 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( conn, op );
+ (void)backend_unbind( op, rs );
return 0;
}
+