From bf8e890ea7aaae4e00edd70453b1dc2cc78e3d6d Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Mon, 4 Oct 2004 20:57:14 +0000 Subject: [PATCH] fix global configuration patch (ITS#3353) --- servers/slapd/back-sql/entry-id.c | 2 +- servers/slapd/init.c | 2 +- servers/slapd/slapi/slapi_ops.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/servers/slapd/back-sql/entry-id.c b/servers/slapd/back-sql/entry-id.c index 1153bd0ec7..638b754075 100644 --- 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 0f658614ad..30e1269bc9 100644 --- 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 c8e9783803..72d303debc 100644 --- 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, -- 2.39.5