X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=7442953c7d19dc774b3a320dc9ee712a1f286664;hb=f8fb4aca7668c722f41941be719203aa8c298e12;hp=b7b16f13a1829186a38bd9826f902b06338101a6;hpb=5ee89d616797a8a62fa44dec95c52e2b94e8c83f;p=openldap diff --git a/servers/slapd/config.c b/servers/slapd/config.c index b7b16f13a1..7442953c7d 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -1,7 +1,7 @@ /* config.c - configuration file handling routines */ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -40,15 +40,14 @@ slap_mask_t global_disallows = 0; slap_mask_t global_requires = 0; slap_ssf_set_t global_ssf_set; char *replogfile; -int global_lastmod = ON; int global_idletimeout = 0; char *global_host = NULL; char *global_realm = NULL; char *ldap_srvtab = ""; char *default_passwd_hash; -char *default_search_base = NULL; -char *default_search_nbase = NULL; -int num_subs = 0; +struct berval default_search_base = { 0, NULL }; +struct berval default_search_nbase = { 0, NULL }; +unsigned num_subordinates = 0; ber_len_t sockbuf_max_incoming = SLAP_SB_MAX_INCOMING_DEFAULT; ber_len_t sockbuf_max_incoming_auth= SLAP_SB_MAX_INCOMING_AUTH; @@ -76,14 +75,13 @@ read_config( const char *fname ) char *cargv[MAXARGS+1]; int lineno, i; int rc; - struct berval *vals[2]; - struct berval val; + struct berval vals[2]; + static int lastmod = ON; static BackendInfo *bi = NULL; static BackendDB *be = NULL; - vals[0] = &val; - vals[1] = NULL; + vals[1].bv_val = NULL; if ( (fp = fopen( fname, "r" )) == NULL ) { ldap_syslog = 1; @@ -262,11 +260,11 @@ read_config( const char *fname ) if ( cargc < 2 ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing max in \"sockbuf_max_incoming \" line\n", fname, lineno )); #else Debug( LDAP_DEBUG_ANY, - "%s: line %d: missing max in \"sockbuf_max_incoming \" line\n", fname, lineno, 0 ); #endif @@ -335,8 +333,8 @@ read_config( const char *fname ) if ( cargc < 2 ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing dn in \"defaultSearchBase \" line\n", @@ -348,24 +346,23 @@ read_config( const char *fname ) } else if ( cargc > 2 ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: extra cruft after in " - "\"defaultSearchBase %s\" line (ignored)\n", - fname, lineno, cargv[1] )); + "%s: line %d: extra cruft after in " + "\"defaultSearchBase %s\" line (ignored)\n", + fname, lineno, cargv[1] )); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "extra cruft after in \"defaultSearchBase %s\", " "line (ignored)\n", fname, lineno, cargv[1] ); #endif - } if ( bi != NULL || be != NULL ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: defaultSearchBase line must appear " - "prior to any backend or database definitions\n", - fname, lineno )); + "%s: line %d: defaultSearchBase line must appear " + "prior to any backend or database definitions\n", + fname, lineno )); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "defaultSearchBaase line must appear prior to " @@ -376,42 +373,49 @@ read_config( const char *fname ) return 1; } - if ( default_search_nbase != NULL ) { + if ( default_search_nbase.bv_len ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: default search base \"%s\" already defined " - "(discarding old)\n", fname, lineno, default_search_base )); + LDAP_LOG(( "config", LDAP_LEVEL_INFO, "%s: line %d: " + "default search base \"%s\" already defined " + "(discarding old)\n", fname, lineno, + default_search_base->bv_val )); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "default search base \"%s\" already defined " "(discarding old)\n", - fname, lineno, default_search_base ); + fname, lineno, default_search_base.bv_val ); #endif - free( default_search_base ); - free( default_search_nbase ); + free( default_search_base.bv_val ); + free( default_search_nbase.bv_val ); } - default_search_base = ch_strdup( cargv[1] ); - default_search_nbase = ch_strdup( cargv[1] ); + if ( load_ucdata( NULL ) < 0 ) return 1; - if ( load_ucdata( NULL ) < 0 ) { - return( 1 ); - } - if( dn_normalize( default_search_nbase ) == NULL ) { + { + struct berval dn; + + dn.bv_val = cargv[1]; + dn.bv_len = strlen( dn.bv_val ); + + rc = dnPrettyNormal( NULL, &dn, + &default_search_base, + &default_search_nbase ); + + if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: %d: invalid default search base \"%s\"\n", - fname, lineno, default_search_base )); + LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + "%s: line %d: defaultSearchBase DN is invalid.\n", + fname, lineno )); #else - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "invalid default search base \"%s\"\n", - fname, lineno, default_search_base ); + Debug( LDAP_DEBUG_ANY, + "%s: line %d: defaultSearchBase DN is invalid\n", + fname, lineno, 0 ); #endif - - return 1; + return( 1 ); + } } - + /* set maximum threads in thread pool */ } else if ( strcasecmp( cargv[0], "threads" ) == 0 ) { int c; @@ -829,159 +833,162 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "subordinate" ) == 0 ) { if ( be == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: subordinate keyword must appear inside a database " - "definition (ignored).\n", fname, lineno )); + LDAP_LOG(( "config", LDAP_LEVEL_INFO, "%s: line %d: " + "subordinate keyword must appear inside a database " + "definition (ignored).\n", fname, lineno )); #else - Debug( LDAP_DEBUG_ANY, -"%s: line %d: suffix line must appear inside a database definition (ignored)\n", + Debug( LDAP_DEBUG_ANY, "%s: line %d: suffix line " + "must appear inside a database definition (ignored)\n", fname, lineno, 0 ); #endif } else { - be->be_glueflags |= SLAP_GLUE_SUBORDINATE; - num_subs++; + be->be_flags |= SLAP_BFLAG_GLUE_SUBORDINATE; + num_subordinates++; } /* set database suffix */ } else if ( strcasecmp( cargv[0], "suffix" ) == 0 ) { Backend *tmp_be; + struct berval dn; + struct berval *pdn = NULL; + struct berval *ndn = NULL; + if ( cargc < 2 ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing dn in \"suffix \" line.\n", - fname, lineno )); + "%s: line %d: missing dn in \"suffix \" line.\n", + fname, lineno )); #else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: missing dn in \"suffix \" line\n", + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "missing dn in \"suffix \" line\n", fname, lineno, 0 ); #endif return( 1 ); + } else if ( cargc > 2 ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: extra cruft after in \"suffix %s\"" - " line (ignored).\n", fname, lineno, cargv[1] )); + "%s: line %d: extra cruft after in \"suffix %s\"" + " line (ignored).\n", fname, lineno, cargv[1] )); #else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: extra cruft after in \"suffix %s\" line (ignored)\n", + Debug( LDAP_DEBUG_ANY, "%s: line %d: extra cruft " + "after in \"suffix %s\" line (ignored)\n", fname, lineno, cargv[1] ); #endif - } + if ( be == NULL ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: suffix line must appear inside a database " - "definition (ignored).\n", fname, lineno )); + "%s: line %d: suffix line must appear inside a database " + "definition.\n", fname, lineno )); #else - Debug( LDAP_DEBUG_ANY, -"%s: line %d: suffix line must appear inside a database definition (ignored)\n", + Debug( LDAP_DEBUG_ANY, "%s: line %d: suffix line " + "must appear inside a database definition\n", fname, lineno, 0 ); #endif + return( 1 ); #if defined(SLAPD_MONITOR_DN) /* "cn=Monitor" is reserved for monitoring slap */ } else if ( strcasecmp( cargv[1], SLAPD_MONITOR_DN ) == 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, -"%s: line %d: \"%s\" is reserved for monitoring slapd\n", - fname, lineno, SLAPD_MONITOR_DN )); + LDAP_LOG(( "config", LDAP_LEVEL_CRIT, "%s: line %d: \"" + SLAPD_MONITOR_DN "\" is reserved for monitoring slapd\n", + fname, lineno )); #else - Debug( LDAP_DEBUG_ANY, -"%s: line %d: \"%s\" is reserved for monitoring slapd\n", - fname, lineno, SLAPD_MONITOR_DN ); + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"" + SLAPD_MONITOR_DN "\" is reserved for monitoring slapd\n", + fname, lineno, 0 ); #endif return( 1 ); #endif /* SLAPD_MONITOR_DN */ + } + + if ( load_ucdata( NULL ) < 0 ) return 1; + + dn.bv_val = cargv[1]; + dn.bv_len = strlen( cargv[1] ); + pdn = ch_malloc( sizeof( struct berval )); + ndn = ch_malloc( sizeof( struct berval )); - } else if ( ( tmp_be = select_backend( cargv[1], 0, 0 ) ) == be ) { + rc = dnPrettyNormal( NULL, &dn, pdn, ndn ); + if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: suffix already served by this backend " - "(ignored)\n", fname, lineno )); + LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + "%s: line %d: suffix DN is invalid.\n", + fname, lineno )); #else Debug( LDAP_DEBUG_ANY, -"%s: line %d: suffix already served by this backend (ignored)\n", - fname, lineno, 0 ); + "%s: line %d: suffix DN is invalid\n", + fname, lineno, 0 ); #endif + return( 1 ); + } - } else if ( tmp_be != NULL ) { + tmp_be = select_backend( ndn, 0, 0 ); + if ( tmp_be == be ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: suffix already served by a preceding " - "backend \"%s\" (ignored)\n", fname, lineno, - tmp_be->be_suffix[0] )); + "%s: line %d: suffix already served by this backend " + "(ignored)\n", fname, lineno )); #else - Debug( LDAP_DEBUG_ANY, -"%s: line %d: suffix already served by a preceeding backend \"%s\" (ignored)\n", - fname, lineno, tmp_be->be_suffix[0] ); + Debug( LDAP_DEBUG_ANY, "%s: line %d: suffix " + "already served by this backend (ignored)\n", + fname, lineno, 0 ); #endif + ber_bvfree( pdn ); + ber_bvfree( ndn ); - } else { - char *dn; - - if ( load_ucdata( NULL ) < 0 ) { - return( 1 ); - } - dn = ch_strdup( cargv[1] ); - if( dn_validate( dn ) == NULL ) { + } else if ( tmp_be != NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: suffix DN invalid\"%s\"\n", - fname, lineno, cargv[1] )); + LDAP_LOG(( "config", LDAP_LEVEL_INFO, + "%s: line %d: suffix already served by a preceding " + "backend \"%s\"\n", fname, lineno, + tmp_be->be_suffix[0]->bv_val )); #else - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "suffix DN invalid \"%s\"\n", - fname, lineno, cargv[1] ); + Debug( LDAP_DEBUG_ANY, "%s: line %d: suffix " + "already served by a preceeding backend \"%s\"\n", + fname, lineno, tmp_be->be_suffix[0]->bv_val ); #endif - free( dn ); - return 1; + ber_bvfree( pdn ); + ber_bvfree( ndn ); + return( 1 ); - } else if( *dn == '\0' && default_search_nbase != NULL ) { + } else if( pdn->bv_len == 0 && default_search_nbase.bv_len ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: suffix DN empty and default search " - "base provided \"%s\" (assuming okay).\n", - fname, lineno, default_search_base )); + "%s: line %d: suffix DN empty and default search " + "base provided \"%s\" (assuming okay).\n", + fname, lineno, default_search_base.bv_val )); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "suffix DN empty and default " "search base provided \"%s\" (assuming okay)\n", - fname, lineno, default_search_base ); + fname, lineno, default_search_base.bv_val ); #endif - - } - charray_add( &be->be_suffix, dn ); - if ( dn_normalize( dn ) == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: " - "unable to normalize suffix " - "\"%s\"\n", fname, lineno, dn )); -#else - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "unable to normalize suffix " - "\"%s\"\n", fname, lineno, dn ); -#endif - free( dn ); - return 1; - } - ber_bvecadd( &be->be_nsuffix, ber_bvstr( dn ) ); } + ber_bvecadd( &be->be_suffix, pdn ); + ber_bvecadd( &be->be_nsuffix, ndn ); + /* set database suffixAlias */ } else if ( strcasecmp( cargv[0], "suffixAlias" ) == 0 ) { Backend *tmp_be; + struct berval alias, *palias, nalias; + struct berval aliased, *paliased, naliased; + if ( cargc < 2 ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing alias and aliased_dn in " - "\"suffixAlias \" line.\n", - fname, lineno )); + "%s: line %d: missing alias and aliased_dn in " + "\"suffixAlias \" line.\n", + fname, lineno )); #else Debug( LDAP_DEBUG_ANY, -"%s: line %d: missing alias and aliased_dn in \"suffixAlias \" line\n", + "%s: line %d: missing alias and aliased_dn in " + "\"suffixAlias \" line.\n", fname, lineno, 0 ); #endif @@ -989,25 +996,26 @@ read_config( const char *fname ) } else if ( cargc < 3 ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing aliased_dn in " - "\"suffixAlias \" line\n", - fname, lineno )); + "%s: line %d: missing aliased_dn in " + "\"suffixAlias \" line\n", + fname, lineno )); #else Debug( LDAP_DEBUG_ANY, -"%s: line %d: missing aliased_dn in \"suffixAlias \" line\n", - fname, lineno, 0 ); + "%s: line %d: missing aliased_dn in " + "\"suffixAlias \" line\n", + fname, lineno, 0 ); #endif return( 1 ); } else if ( cargc > 3 ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: extra cruft in suffixAlias line (ignored)\n", - fname, lineno )); + "%s: line %d: extra cruft in suffixAlias line (ignored)\n", + fname, lineno )); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: extra cruft in suffixAlias line (ignored)\n", - fname, lineno, 0 ); + fname, lineno, 0 ); #endif } @@ -1015,62 +1023,95 @@ read_config( const char *fname ) if ( be == NULL ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: suffixAlias line must appear inside a " - "database definition (ignored).\n", fname, lineno )); + "%s: line %d: suffixAlias line must appear inside a " + "database definition (ignored).\n", fname, lineno )); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: suffixAlias line" " must appear inside a database definition (ignored)\n", fname, lineno, 0 ); #endif + } + + if ( load_ucdata( NULL ) < 0 ) return 1; + + alias.bv_val = cargv[1]; + alias.bv_len = strlen( cargv[1] ); + palias = ch_malloc(sizeof(struct berval)); + + rc = dnPrettyNormal( NULL, &alias, palias, &nalias ); + if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + "%s: line %d: alias DN is invalid.\n", + fname, lineno )); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: alias DN is invalid\n", + fname, lineno, 0 ); +#endif + return( 1 ); + } - } else if ( (tmp_be = select_backend( cargv[1], 0, 0 )) != NULL ) { + tmp_be = select_backend( &nalias, 0, 0 ); + free( nalias.bv_val ); + if ( tmp_be && tmp_be != be ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: suffixAlias served by a preceeding " - "backend \"%s\" (ignored).\n", fname, lineno, - tmp_be->be_suffix[0] )); + "%s: line %d: suffixAlias served by a preceeding " + "backend \"%s\"\n", + fname, lineno, tmp_be->be_suffix[0]->bv_val )); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: suffixAlias served by" - " a preceeding backend \"%s\" (ignored)\n", - fname, lineno, tmp_be->be_suffix[0] ); + " a preceeding backend \"%s\"\n", + fname, lineno, tmp_be->be_suffix[0]->bv_val ); #endif + ber_bvfree( palias ); + return -1; + } + aliased.bv_val = cargv[2]; + aliased.bv_len = strlen( cargv[2] ); + paliased = ch_malloc(sizeof(struct berval)); - } else if ( (tmp_be = select_backend( cargv[2], 0, 0 )) != NULL ) { + rc = dnPrettyNormal( NULL, &aliased, paliased, &naliased ); + if( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + "%s: line %d: aliased DN is invalid.\n", + fname, lineno )); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: aliased DN is invalid\n", + fname, lineno, 0 ); +#endif + ber_bvfree( palias ); + return( 1 ); + } + + tmp_be = select_backend( &naliased, 0, 0 ); + free( naliased.bv_val ); + if ( tmp_be && tmp_be != be ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: suffixAlias derefs to a different backend " - "a preceeding backend \"%s\" (ignored)\n", - fname, lineno, tmp_be->be_suffix[0] )); + "%s: line %d: suffixAlias derefs to a different backend " + "a preceeding backend \"%s\"\n", + fname, lineno, tmp_be->be_suffix[0]->bv_val )); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: suffixAlias derefs to differnet backend" - " a preceeding backend \"%s\" (ignored)\n", - fname, lineno, tmp_be->be_suffix[0] ); + " a preceeding backend \"%s\"\n", + fname, lineno, tmp_be->be_suffix[0]->bv_val ); #endif - - - } else { - char *alias, *aliased_dn; - - if ( load_ucdata( NULL ) < 0 ) { - return( 1 ); - } - - alias = ch_strdup( cargv[1] ); - (void) dn_normalize( alias ); - - aliased_dn = ch_strdup( cargv[2] ); - (void) dn_normalize( aliased_dn ); - - ber_bvecadd( &be->be_suffixAlias, - ber_bvstr( alias ) ); - ber_bvecadd( &be->be_suffixAlias, - ber_bvstr( aliased_dn ) ); + ber_bvfree( palias ); + ber_bvfree( paliased ); + return -1; } + ber_bvecadd( &be->be_suffixAlias, palias ); + ber_bvecadd( &be->be_suffixAlias, paliased ); + /* set max deref depth */ } else if ( strcasecmp( cargv[0], "maxDerefDepth" ) == 0 ) { int i; @@ -1142,30 +1183,17 @@ read_config( const char *fname ) #endif } else { - struct berval dn, *pdn = NULL, *ndn = NULL; + struct berval dn; - if ( load_ucdata( NULL ) < 0 ) { - return( 1 ); - } + if ( load_ucdata( NULL ) < 0 ) return 1; dn.bv_val = cargv[1]; dn.bv_len = strlen( cargv[1] ); - rc = dnPretty( NULL, &dn, &pdn ); - if( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: rootdn DN is invalid.\n", - fname, lineno )); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: rootdn DN is invalid\n", - fname, lineno, 0 ); -#endif - return( 1 ); - } + rc = dnPrettyNormal( NULL, &dn, + &be->be_rootdn, + &be->be_rootndn ); - rc = dnNormalize( NULL, &dn, &ndn ); if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, @@ -1176,15 +1204,8 @@ read_config( const char *fname ) "%s: line %d: rootdn DN is invalid\n", fname, lineno, 0 ); #endif - ber_bvfree( ndn ); return( 1 ); } - - be->be_rootdn = *pdn; - be->be_rootndn = *ndn; - - free( pdn ); - free( ndn ); } /* set super-secret magic database password */ @@ -1557,8 +1578,8 @@ read_config( const char *fname ) return 1; } - vals[0]->bv_val = cargv[1]; - vals[0]->bv_len = strlen( vals[0]->bv_val ); + vals[0].bv_val = cargv[1]; + vals[0].bv_len = strlen( vals[0].bv_val ); value_add( &default_referral, vals ); #ifdef NEW_LOGGING @@ -1666,6 +1687,15 @@ read_config( const char *fname ) return( 1 ); } if ( strcasecmp( cargv[1], "off" ) == 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + "%s: line %d: schema checking disabled! your mileage may vary!\n", + fname, lineno )); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: schema checking disabled! your mileage may vary!\n", + fname, lineno, 0 ); +#endif global_schemacheck = 0; } else { global_schemacheck = 1; @@ -1820,16 +1850,14 @@ read_config( const char *fname ) #endif } else { - struct berval dn, *ndn = NULL; + struct berval dn; - if ( load_ucdata( NULL ) < 0 ) { - return( 1 ); - } + if ( load_ucdata( NULL ) < 0 ) return 1; dn.bv_val = cargv[1]; dn.bv_len = strlen( cargv[1] ); - rc = dnNormalize( NULL, &dn, &ndn ); + rc = dnNormalize2( NULL, &dn, &be->be_update_ndn ); if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, @@ -1842,9 +1870,6 @@ read_config( const char *fname ) #endif return 1; } - - be->be_update_ndn = *ndn; - free( ndn ); } } else if ( strcasecmp( cargv[0], "updateref" ) == 0 ) { @@ -1899,8 +1924,8 @@ read_config( const char *fname ) return 1; } - vals[0]->bv_val = cargv[1]; - vals[0]->bv_len = strlen( vals[0]->bv_val ); + vals[0].bv_val = cargv[1]; + vals[0].bv_len = strlen( vals[0].bv_val ); value_add( &be->be_update_refs, vals ); /* replication log file to which changes are appended */ @@ -1929,11 +1954,11 @@ read_config( const char *fname ) if ( cargc < 2 ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, "%s: line %d: " - "missing filename in \"rootDSEfile \" line.\n", + "missing filename in \"rootDSE \" line.\n", fname, lineno )); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "missing filename in \"rootDSEfile \" line.\n", + "missing filename in \"rootDSE \" line.\n", fname, lineno, 0 ); #endif return 1; @@ -1942,11 +1967,11 @@ read_config( const char *fname ) if( read_root_dse_file( cargv[1] ) ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, "%s: line %d: " - "could not read \"rootDSEfile \" line.\n", + "could not read \"rootDSE \" line.\n", fname, lineno )); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "could not read \"rootDSEfile \" line\n", + "could not read \"rootDSE \" line\n", fname, lineno, 0 ); #endif return 1; @@ -1968,15 +1993,17 @@ read_config( const char *fname ) return( 1 ); } if ( strcasecmp( cargv[1], "on" ) == 0 ) { - if ( be ) - be->be_lastmod = ON; - else - global_lastmod = ON; + if ( be ) { + be->be_flags &= ~SLAP_BFLAG_NOLASTMOD; + } else { + lastmod = ON; + } } else { - if ( be ) - be->be_lastmod = OFF; - else - global_lastmod = OFF; + if ( be ) { + be->be_flags |= SLAP_BFLAG_NOLASTMOD; + } else { + lastmod = OFF; + } } /* set idle timeout value */ @@ -2226,9 +2253,8 @@ read_config( const char *fname ) free( saveline ); } fclose( fp ); - if ( load_ucdata( NULL ) < 0 ) { - return( 1 ); - } + + if ( load_ucdata( NULL ) < 0 ) return 1; return( 0 ); }