mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix global configuration patch (ITS#3353)

Browse Source
This commit is contained in:
Pierangelo Masarati 2004-10-04 20:57:14 +00:00
parent 0c1f1f959f
commit bf8e890ea7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/slapd/back-sql/entry-id.c
View File

@ -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 );

2
servers/slapd/init.c
View File

@ -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();

8
servers/slapd/slapi/slapi_ops.c
View File

@ -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,