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 bea96c20b049a081ee1296cb1b796062a9852a7b..b05c8fbf0a8b2c7077d50e2275c24f11d6a7e8f9 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -394,20 +394,10 @@ long connection_init(
     c->c_conn_state = SLAP_C_INACTIVE;
     c->c_struct_state = SLAP_C_USED;
 
-#ifdef HAVE_TLS
     if ( use_tls ) {
-           /* FIXME: >0 means incomplete read */
-           if ( ldap_pvt_tls_accept( c->c_sb, NULL ) < 0 ) {
-                   Debug( LDAP_DEBUG_ANY,
-                          "connection_init(%d): TLS accept failed.\n",
-                               s, 0, 0);
-                   ldap_pvt_thread_mutex_unlock( &c->c_mutex );
-                   ldap_pvt_thread_mutex_unlock( &connections_mutex );
-                   connection_destroy( c );
-                   return -1;
-           }
+           c->c_is_tls = 1;
+           c->c_needs_tls_accept = 1;
     }
-#endif
 
     ldap_pvt_thread_mutex_unlock( &c->c_mutex );
     ldap_pvt_thread_mutex_unlock( &connections_mutex );
@@ -431,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;
 
@@ -796,6 +787,27 @@ int connection_read(ber_socket_t s)
                "connection_read(%d): checking for input on id=%ld\n",
                s, c->c_connid, 0 );
 
+#ifdef HAVE_TLS
+       if ( c->c_is_tls && c->c_needs_tls_accept ) {
+               rc = ldap_pvt_tls_accept( c->c_sb, NULL );
+               if ( rc < 0 ) {
+                       Debug( LDAP_DEBUG_TRACE,
+                              "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 );
+               } else if ( rc == 0 ) {
+                       c->c_needs_tls_accept = 0;
+               }
+               connection_return( c );
+               ldap_pvt_thread_mutex_unlock( &connections_mutex );
+               return 0;
+       }
+#endif
+
 #define CONNECTION_INPUT_LOOP 1
 
 #ifdef DATA_READY_LOOP
@@ -979,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