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 628b13b0b02d760fd6a1cb79a5d8fd81e80dc1ea..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
@@ -606,9 +606,7 @@ long connection_init(
                c->c_send_search_entry = slap_send_search_entry;
                c->c_send_search_reference = slap_send_search_reference;
                c->c_send_ldap_extended = slap_send_ldap_extended;
-#ifdef LDAP_RES_INTERMEDIATE
                c->c_send_ldap_intermediate = slap_send_ldap_intermediate;
-#endif
 
                BER_BVZERO( &c->c_authmech );
                BER_BVZERO( &c->c_dn );
@@ -2000,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;
@@ -2008,6 +2005,7 @@ static int connection_bind_cb( Operation *op, SlapReply *rs )
                ( rs->sr_err == LDAP_SASL_BIND_IN_PROGRESS );
 
        /* Moved here from bind.c due to ITS#4158 */
+       op->o_conn->c_sasl_bindop = NULL;
        if ( op->orb_method == LDAP_AUTH_SASL ) {
                if( rs->sr_err == LDAP_SUCCESS ) {
                        ber_dupbv(&op->o_conn->c_dn, &op->orb_edn);
@@ -2053,7 +2051,9 @@ 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;
 }
 
@@ -2237,6 +2237,11 @@ connection_fake_init(
        op->o_connid = op->o_conn->c_connid;
        connection_init_log_prefix( op );
 
+#ifdef LDAP_SLAPI
+       slapi_int_create_object_extensions( SLAPI_X_EXT_CONNECTION, conn );
+       slapi_int_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
+#endif /* LDAP_SLAPI */
+
        slap_op_time( &op->o_time, &op->o_tincr );
 }