fix substring_comp_candidates logic if intersection of candidates

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index dedadbc33803d166759a39d8edda2b4cdf24ed48..b05c8fbf0a8b2c7077d50e2275c24f11d6a7e8f9 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -421,6 +421,7 @@ connection_destroy( Connection *c )
     backend_connection_destroy(c);
 
     c->c_protocol = 0;
+    c->c_connid = -1;
 
     c->c_activitytime = c->c_starttime = 0;
 
@@ -794,6 +795,7 @@ int connection_read(ber_socket_t s)
                               "connection_read(%d): TLS accept error error=%d id=%ld, closing.\n",
                               s, rc, c->c_connid );
 
+                       c->c_needs_tls_accept = 0;
                        /* connections_mutex and c_mutex are locked */
                        connection_closing( c );
                        connection_close( c );
@@ -989,6 +991,7 @@ static int connection_op_activate( Connection *conn, Operation *op )
        arg->co_op->o_ndn = dn_normalize_case( ch_strdup( arg->co_op->o_dn ) );
 
        arg->co_op->o_protocol = conn->c_protocol;
+       arg->co_op->o_connid = conn->c_connid;
 
        arg->co_op->o_authtype = conn->c_authtype;
        arg->co_op->o_authmech = conn->c_authmech != NULL