Fixed invalid cookie in pagedResults control (ITS#3089)

[openldap] / servers / slapd / unbind.c

diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index c4c4f18542368b2dd8a69e9da4827b9c4e21db87..32eb609fca49057ce504f7d4cba56a554b39deab 100644 (file)
--- 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
@@ -27,19 +34,15 @@
 #include "slap.h"
 
 int
-do_unbind(
-    Connection *conn,
-    Operation  *op
-)
+do_unbind( Operation *op, SlapReply *rs )
 {
 #ifdef NEW_LOGGING
        LDAP_LOG( OPERATION, ENTRY, 
-               "do_unbind: conn %d\n", conn ? conn->c_connid : -1, 0, 0 );
+               "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:
         *
@@ -50,7 +53,7 @@ do_unbind(
            op->o_opid, 0, 0, 0 );
 
        /* pass the unbind to all backends */
-       backend_unbind( conn, op );
+       backend_unbind( op, rs );
 
        return 0;
 }