fix substring_comp_candidates logic if intersection of candidates

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index d7fd7eb4c4aa5276d63e762d7ccb4e5a66ef0700..75a61b0ae283ea43f5cce52683b493ead1fcb4b3 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -549,7 +549,7 @@ typedef struct slap_op {
 
        LDAPControl     **o_ctrls;       /* controls */
 
-/*      long   o_connid;       *//* id of conn initiating this op  */
+       unsigned long   o_connid; /* id of conn initiating this op  */
 
 #ifdef LDAP_CONNECTIONLESS
        int             o_cldap;        /* != 0 if this came in via CLDAP */
@@ -601,6 +601,9 @@ typedef struct slap_conn {
        BerElement      *c_currentber;  /* ber we're attempting to read */
        int             c_writewaiter;  /* true if writer is waiting */
 
+       int     c_is_tls;               /* true if this LDAP over raw TLS */
+       int     c_needs_tls_accept;     /* true if SSL_accept should be called */
+
        long    c_n_ops_received;               /* num of ops received (next op_id) */
        long    c_n_ops_executing;      /* num of ops currently executing */
        long    c_n_ops_pending;                /* num of ops pending execution */