fix global configuration patch (ITS#3353)

diff --git a/servers/slapd/back-sql/entry-id.c b/servers/slapd/back-sql/entry-id.c
index 1153bd0ec7ee7bd352f22b8a0644d59a57f968f1..638b754075b32921beb9f2862f4c3649a5b0a00d 100644 (file)
--- a/servers/slapd/back-sql/entry-id.c
+++ b/servers/slapd/back-sql/entry-id.c
@@ -565,7 +565,7 @@ next:;
                                bsi, 0, AVL_INORDER );
        }
 
-       if ( global_schemacheck ) {
+       if ( SLAPD_GLOBAL(schemachecking) ) {
                const char      *text = NULL;
                char            textbuf[ 1024 ];
                size_t          textlen = sizeof( textbuf );

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 0f658614ad3b4792c5c7df71fb16ae89e97817da..30e1269bc9a8eb705a96a39ef48db0d0e993d106 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -126,7 +126,7 @@ slap_init( int mode, const char *name )
                ldap_pvt_thread_mutex_init( &SLAPD_GLOBAL(gmtime_mutex) );
 #endif
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
-               ldap_pvt_thread_mutex_init( &passwd_mutex );
+               ldap_pvt_thread_mutex_init( &SLAPD_GLOBAL(passwd_mutex) );
 #endif
 
                rc = slap_sasl_init();

diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index c8e978380300b5fc1139e78deb5e7b70c02ca0bb..72d303debc7929ba8069068d95646a42d5e9fc72 100644 (file)
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -125,7 +125,7 @@ slapi_int_init_connection(
        int OpType ) 
 { 
        Connection *pConn;
-       ber_len_t max = sockbuf_max_incoming;
+       ber_len_t max = SLAPD_GLOBAL(sockbuf_max_incoming);
 
        pConn = (Connection *) slapi_ch_calloc(1, sizeof(Connection));
        if (pConn == NULL) {
@@ -1180,12 +1180,12 @@ slapi_search_internal(
                }
        }
 
-       if ( !op->o_req_ndn.bv_len && default_search_nbase.bv_len ) {
+       if ( !op->o_req_ndn.bv_len && !BER_BVISNULL( &SLAPD_GLOBAL(default_search_nbase) ) ) {
                slapi_ch_free( (void **)&op->o_req_dn.bv_val );
                slapi_ch_free( (void **)&op->o_req_ndn.bv_val );
 
-               ber_dupbv( &op->o_req_dn, &default_search_base );
-               ber_dupbv( &op->o_req_ndn, &default_search_nbase );
+               ber_dupbv( &op->o_req_dn, &SLAPD_GLOBAL(default_search_base) );
+               ber_dupbv( &op->o_req_ndn, &SLAPD_GLOBAL(default_search_nbase) );
        }
 
        if ( slapi_control_present( controls,