Added ppolicy_hide_lockout keyword

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 6e2c934847980ae44c92d2f1a0a85e9045a3a991..5fe614e50a98f1d2b8aaf23678a451a5b0b60703 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -92,6 +92,8 @@ static ldap_pvt_thread_start_t connection_operation;
  */
 int connections_init(void)
 {
+       int i;
+
        assert( connections == NULL );
 
        if( connections != NULL) {
@@ -126,6 +128,8 @@ int connections_init(void)
        assert( connections[0].c_struct_state == SLAP_C_UNINITIALIZED );
        assert( connections[dtblsize-1].c_struct_state == SLAP_C_UNINITIALIZED );
 
+       for (i=0; i<dtblsize; i++) connections[i].c_conn_idx = i;
+
        /*
         * per entry initialization of the Connection array initialization
         * will be done by connection_init()
@@ -1163,15 +1167,16 @@ operations_error:
        return NULL;
 }
 
+static const Listener dummy_list = { {0, ""}, {0, ""} };
+
 int connection_client_setup(
        ber_socket_t s,
-       Listener *l,
        ldap_pvt_thread_start_t *func,
        void *arg )
 {
        Connection *c;
 
-       if ( connection_init( s, l, "", "", CONN_IS_CLIENT, 0, NULL ) < 0 ) {
+       if ( connection_init( s, &dummy_list, "", "", CONN_IS_CLIENT, 0, NULL ) < 0 ) {
                return -1;
        }
 
@@ -1626,7 +1631,7 @@ connection_input(
                defer = "awaiting write";
        } else if (conn->c_n_ops_executing >= connection_pool_max/2) {
                defer = "too many executing";
-       } else if (conn->c_conn_state == SLAP_C_BINDING ) {
+       } else if (conn->c_conn_state == SLAP_C_BINDING) {
                defer = "binding";
        } else if (tag != LDAP_REQ_ABANDON && conn->c_n_ops_pending) {
                defer = "pending operations";
@@ -1854,3 +1859,26 @@ int connection_write(ber_socket_t s)
        return 0;
 }
 
+void
+connection_fake_init(
+       Connection *conn,
+       Operation *op,
+       void *ctx )
+{
+       conn->c_connid = -1;
+       conn->c_send_ldap_result = slap_send_ldap_result;
+       conn->c_send_search_entry = slap_send_search_entry;
+       conn->c_send_search_reference = slap_send_search_reference;
+       conn->c_listener = (Listener *)&dummy_list;
+       conn->c_peer_name = slap_empty_bv;
+
+       /* set memory context */
+       op->o_tmpmemctx = sl_mem_create( SLMALLOC_SLAB_SIZE, ctx );
+       op->o_tmpmfuncs = &sl_mfuncs;
+       op->o_threadctx = ctx;
+
+       op->o_conn = conn;
+       op->o_connid = op->o_conn->c_connid;
+
+       op->o_time = slap_get_time();
+}