ITS#6045: Use copy of db when testing filter in matchops.

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index f03a11be8e388bb6ea1f13848a46cae4f369e8f7..e6c138b3ac66c5c726802a1107c1435f41977370 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -62,6 +62,7 @@ slap_mask_t           global_allows = 0;
 slap_mask_t            global_disallows = 0;
 int            global_gentlehup = 0;
 int            global_idletimeout = 0;
+int            global_writetimeout = 0;
 char   *global_host = NULL;
 char   *global_realm = NULL;
 char   *sasl_host = NULL;
@@ -1607,7 +1608,7 @@ int bindconf_tls_set( slap_bindconf *bc, LDAP *ld )
                }
        }
        if ( bc->sb_tls_reqcert ) {
-               rc = ldap_int_tls_config( ld, LDAP_OPT_X_TLS_REQUIRE_CERT,
+               rc = ldap_pvt_tls_config( ld, LDAP_OPT_X_TLS_REQUIRE_CERT,
                        bc->sb_tls_reqcert );
                if ( rc ) {
                        Debug( LDAP_DEBUG_ANY,
@@ -1618,7 +1619,7 @@ int bindconf_tls_set( slap_bindconf *bc, LDAP *ld )
                        newctx = 1;
        }
        if ( bc->sb_tls_protocol_min ) {
-               rc = ldap_int_tls_config( ld, LDAP_OPT_X_TLS_PROTOCOL_MIN,
+               rc = ldap_pvt_tls_config( ld, LDAP_OPT_X_TLS_PROTOCOL_MIN,
                        bc->sb_tls_protocol_min );
                if ( rc ) {
                        Debug( LDAP_DEBUG_ANY,
@@ -1630,7 +1631,7 @@ int bindconf_tls_set( slap_bindconf *bc, LDAP *ld )
        }
 #ifdef HAVE_OPENSSL_CRL
        if ( bc->sb_tls_crlcheck ) {
-               rc = ldap_int_tls_config( ld, LDAP_OPT_X_TLS_CRLCHECK,
+               rc = ldap_pvt_tls_config( ld, LDAP_OPT_X_TLS_CRLCHECK,
                        bc->sb_tls_crlcheck );
                if ( rc ) {
                        Debug( LDAP_DEBUG_ANY,