Fix negative caching again, be sure it's really from zero entries returned

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 365509629f0b2d0fcb58421906921754c63a7816..16d9b429fb0fd617e2d31258944e8d986c8c11e9 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1998,7 +1998,6 @@ connection_init_log_prefix( Operation *op )
 static int connection_bind_cb( Operation *op, SlapReply *rs )
 {
        slap_callback *cb = op->o_callback;
-       op->o_callback = cb->sc_next;
 
        ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
        op->o_conn->c_conn_state = SLAP_C_ACTIVE;
@@ -2052,7 +2051,7 @@ static int connection_bind_cb( Operation *op, SlapReply *rs )
        }
        ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 
-       ch_free( cb );
+       ch_free( op->o_callback );
        op->o_callback = NULL;
 
        return SLAP_CB_CONTINUE;