X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Funbind.c;h=32eb609fca49057ce504f7d4cba56a554b39deab;hb=47c6701a2293fec249cdb84f69b37addfb4b36fc;hp=0ec5ce8641b21b2dc69bf2dd7bc68b66d9f752db;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap

diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index 0ec5ce8641..32eb609fca 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-2002 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-2004 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
@@ -26,32 +33,27 @@
 
 #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 ));
+	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:
 	 *
 	 *	UnBindRequest ::= NULL
 	 */
 
-	Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d UNBIND\n", op->o_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 );
+	backend_unbind( op, rs );
 
 	return 0;
 }