X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=8951f40664229f103fa8e1c54acede67ce3d63bc;hb=9b4bf8a973c8cfea809be9a4b658f785a6b16f2f;hp=b7b16f13a1829186a38bd9826f902b06338101a6;hpb=5ee89d616797a8a62fa44dec95c52e2b94e8c83f;p=openldap diff --git a/servers/slapd/config.c b/servers/slapd/config.c index b7b16f13a1..8951f40664 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-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -11,14 +11,18 @@ #include #include +#include #include #include -#include "lutil.h" #include "ldap_pvt.h" #include "slap.h" +#ifdef LDAP_SLAPI +#include "slapi.h" +#endif +#include "lutil.h" -#define MAXARGS 500 +#define ARGS_STEP 512 /* * defaults for various global variables @@ -29,7 +33,9 @@ struct slap_limits_set deflimit = { SLAPD_DEFAULT_SIZELIMIT, /* backward compatible limits */ 0, - -1 /* no limit on unchecked size */ + -1, /* no limit on unchecked size */ + 0, /* page limit */ + 0 /* hide number of entries left */ }; AccessControl *global_acl = NULL; @@ -40,57 +46,67 @@ 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_gentlehup = 0; 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; +char *default_passwd_hash = NULL; +int cargc = 0, cargv_size = 0; +char **cargv; +struct berval default_search_base = { 0, NULL }; +struct berval default_search_nbase = { 0, NULL }; +unsigned num_subordinates = 0; +struct berval global_schemadn = { 0, NULL }; +struct berval global_schemandn = { 0, NULL }; ber_len_t sockbuf_max_incoming = SLAP_SB_MAX_INCOMING_DEFAULT; ber_len_t sockbuf_max_incoming_auth= SLAP_SB_MAX_INCOMING_AUTH; +int slap_conn_max_pending = SLAP_CONN_MAX_PENDING_DEFAULT; +int slap_conn_max_pending_auth = SLAP_CONN_MAX_PENDING_AUTH; + char *slapd_pid_file = NULL; char *slapd_args_file = NULL; -int nSaslRegexp = 0; -SaslRegexp_t *SaslRegexp = NULL; -int sasl_external_x509dn_convert; +char *strtok_quote_ptr; + +int use_reverse_lookup = 0; static char *fp_getline(FILE *fp, int *lineno); static void fp_getline_init(int *lineno); -static int fp_parse_line(char *line, int *argcp, char **argv); +static int fp_parse_line(int lineno, char *line); static char *strtok_quote(char *line, char *sep); static int load_ucdata(char *path); int -read_config( const char *fname ) +read_config( const char *fname, int depth ) { FILE *fp; char *line, *savefname, *saveline; - int cargc, savelineno; - char *cargv[MAXARGS+1]; + int savelineno; int lineno, i; int rc; - struct berval *vals[2]; - struct berval val; + struct berval vals[2]; + static int lastmod = 1; static BackendInfo *bi = NULL; static BackendDB *be = NULL; - vals[0] = &val; - vals[1] = NULL; + vals[1].bv_val = NULL; + + if ( depth == 0 ) { + cargv = ch_calloc( ARGS_STEP + 1, sizeof(*cargv) ); + cargv_size = ARGS_STEP + 1; + } if ( (fp = fopen( fname, "r" )) == NULL ) { ldap_syslog = 1; #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_ENTRY, "read_config: " - "could not open config file \"%s\": %s (%d)\n", - fname, strerror(errno), errno )); + LDAP_LOG( CONFIG, ENTRY, + "read_config: " "could not open config file \"%s\": %s (%d)\n", + fname, strerror(errno), errno ); #else Debug( LDAP_DEBUG_ANY, "could not open config file \"%s\": %s (%d)\n", @@ -100,8 +116,8 @@ read_config( const char *fname ) } #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_ENTRY, - "read_config: reading config file %s\n", fname )); + LDAP_LOG( CONFIG, ENTRY, + "read_config: reading config file %s\n", fname, 0, 0 ); #else Debug( LDAP_DEBUG_CONFIG, "reading config file %s\n", fname, 0, 0 ); #endif @@ -115,26 +131,17 @@ read_config( const char *fname ) continue; } -#ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_DETAIL1, - "line %d (%s)\n", lineno, line )); -#else - Debug( LDAP_DEBUG_CONFIG, "line %d (%s)\n", lineno, line, 0 ); -#endif - - /* fp_parse_line is destructive, we save a copy */ saveline = ch_strdup( line ); - if ( fp_parse_line( line, &cargc, cargv ) != 0 ) { + if ( fp_parse_line( lineno, line ) != 0 ) { return( 1 ); } if ( cargc < 1 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: bad config line (ignored)\n", - fname, lineno )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: bad config line (ignored)\n", fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: bad config line (ignored)\n", @@ -147,9 +154,9 @@ read_config( const char *fname ) if ( strcasecmp( cargv[0], "backend" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s : line %d: missing type in \"backend\" line.\n", - fname, lineno )); + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing type in \"backend \" line\n", @@ -161,9 +168,9 @@ read_config( const char *fname ) if( be != NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: backend line must appear before any " - "database definition.\n", fname, lineno )); + "database definition.\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: backend line must appear before any database definition\n", @@ -177,9 +184,9 @@ read_config( const char *fname ) if( bi == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "read_config: backend %s initialization failed.\n", - cargv[1] )); + cargv[1], 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "backend %s initialization failed.\n", @@ -191,9 +198,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "database" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing type in \"database \" line\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing type in \"database \" line\n", + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing type in \"database \" line\n", @@ -208,9 +215,8 @@ read_config( const char *fname ) if( be == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "database %s initialization failed.\n", - cargv[1] )); + LDAP_LOG( CONFIG, CRIT, + "database %s initialization failed.\n", cargv[1], 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "database %s initialization failed.\n", @@ -225,9 +231,9 @@ read_config( const char *fname ) int c; if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing level in \"concurrency \" line\n", @@ -241,10 +247,9 @@ read_config( const char *fname ) if( c < 1 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: invalid level (%d) in " - "\"concurrency \" line.\n", - fname, lineno, c )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: invalid level (%d) in " + "\"concurrency \" line.\n", fname, lineno, c ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: invalid level (%d) in \"concurrency \" line\n", @@ -261,12 +266,12 @@ read_config( const char *fname ) long max; 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, 0 ); #else Debug( LDAP_DEBUG_ANY, - "%s: line %d: missing max in \"sockbuf_max_incoming \" line\n", fname, lineno, 0 ); #endif @@ -277,10 +282,10 @@ read_config( const char *fname ) if( max < 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: invalid max value (%ld) in " "\"sockbuf_max_incoming \" line.\n", - fname, lineno, max )); + fname, lineno, max ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: invalid max value (%ld) in " @@ -298,9 +303,9 @@ read_config( const char *fname ) long max; if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing max in \"sockbuf_max_incoming_auth \" line\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing max in \"sockbuf_max_incoming_auth " + "\" line\n", fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing max in \"sockbuf_max_incoming_auth \" line\n", @@ -314,10 +319,10 @@ read_config( const char *fname ) if( max < 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: invalid max value (%ld) in " "\"sockbuf_max_incoming_auth \" line.\n", - fname, lineno, max )); + fname, lineno, max ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: invalid max value (%ld) in " @@ -330,13 +335,87 @@ read_config( const char *fname ) sockbuf_max_incoming_auth = max; + /* set conn pending max */ + } else if ( strcasecmp( cargv[0], "conn_max_pending" ) == 0 ) { + long max; + if ( cargc < 2 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing max in \"conn_max_pending " + "\" line\n", fname, lineno, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: missing max in \"conn_max_pending \" line\n", + fname, lineno, 0 ); +#endif + + return( 1 ); + } + + max = atol( cargv[1] ); + + if( max < 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: invalid max value (%ld) in " + "\"conn_max_pending \" line.\n", + fname, lineno, max ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: invalid max value (%ld) in " + "\"conn_max_pending \" line.\n", + fname, lineno, max ); +#endif + + return( 1 ); + } + + slap_conn_max_pending = max; + + /* set conn pending max authenticated */ + } else if ( strcasecmp( cargv[0], "conn_max_pending_auth" ) == 0 ) { + long max; + if ( cargc < 2 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing max in \"conn_max_pending_auth " + "\" line\n", fname, lineno, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: missing max in \"conn_max_pending_auth \" line\n", + fname, lineno, 0 ); +#endif + + return( 1 ); + } + + max = atol( cargv[1] ); + + if( max < 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: invalid max value (%ld) in " + "\"conn_max_pending_auth \" line.\n", + fname, lineno, max ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: invalid max value (%ld) in " + "\"conn_max_pending_auth \" line.\n", + fname, lineno, max ); +#endif + + return( 1 ); + } + + slap_conn_max_pending_auth = max; + /* default search base */ } else if ( strcasecmp( cargv[0], "defaultSearchBase" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing dn in \"defaultSearchBase \" line\n", @@ -347,25 +426,24 @@ 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] )); + LDAP_LOG( CONFIG, INFO, + "%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 )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: defaultSearchBase line must appear " + "prior to any backend or database definitions\n", + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "defaultSearchBaase line must appear prior to " @@ -376,50 +454,57 @@ 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, 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, CRIT, + "%s: line %d: defaultSearchBase DN is invalid.\n", + fname, lineno, 0 ); #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; if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing count in \"threads \" line\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing count in \"threads \" line\n", + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing count in \"threads \" line\n", @@ -433,9 +518,9 @@ read_config( const char *fname ) if( c < 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: invalid level (%d) in \"threads \"" - "line\n",fname, lineno, c )); + "line\n", fname, lineno, c ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: invalid level (%d) in \"threads \" line\n", @@ -454,9 +539,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "pidfile" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d missing file name in \"pidfile \" line.\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d missing file name in \"pidfile \" " + "line.\n", fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing file name in \"pidfile \" line\n", @@ -472,10 +557,10 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "argsfile" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: %d: missing file name in " "\"argsfile \" line.\n", - fname, lineno )); + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing file name in \"argsfile \" line\n", @@ -491,10 +576,10 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "password-hash" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: missing hash in " "\"password-hash \" line.\n", - fname, lineno )); + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing hash in \"password-hash \" line\n", @@ -505,9 +590,9 @@ read_config( const char *fname ) } if ( default_passwd_hash != NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: already set default password_hash!\n", - fname, lineno )); + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: already set default password_hash!\n", @@ -516,18 +601,31 @@ read_config( const char *fname ) return 1; - } else { - default_passwd_hash = ch_strdup( cargv[1] ); } + if ( lutil_passwd_scheme( cargv[1] ) == 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: password scheme \"%s\" not available\n", + fname, lineno, cargv[1] ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: password scheme \"%s\" not available\n", + fname, lineno, cargv[1] ); +#endif + return 1; + } + + default_passwd_hash = ch_strdup( cargv[1] ); + } else if ( strcasecmp( cargv[0], "password-crypt-salt-format" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: missing format in " "\"password-crypt-salt-format \" line\n", - fname, lineno )); + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing format in " "\"password-crypt-salt-format \" line\n", @@ -539,141 +637,54 @@ read_config( const char *fname ) lutil_salt_format( cargv[1] ); - /* set SASL host */ - } else if ( strcasecmp( cargv[0], "sasl-host" ) == 0 ) { - if ( cargc < 2 ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing host in \"sasl-host \" line\n", - fname, lineno )); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: missing host in \"sasl-host \" line\n", - fname, lineno, 0 ); -#endif - - return( 1 ); - } - - if ( global_host != NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: already set sasl-host!\n", - fname, lineno )); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: already set sasl-host!\n", - fname, lineno, 0 ); -#endif - + /* SASL config options */ + } else if ( strncasecmp( cargv[0], "sasl", 4 ) == 0 ) { + if ( slap_sasl_config( cargc, cargv, line, fname, lineno ) ) return 1; - } else { - global_host = ch_strdup( cargv[1] ); - } - - /* set SASL realm */ - } else if ( strcasecmp( cargv[0], "sasl-realm" ) == 0 ) { + } else if ( strcasecmp( cargv[0], "schemadn" ) == 0 ) { + struct berval dn; if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing realm in \"sasl-realm \" line.\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing dn in " + "\"schemadn \" line.\n", fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, - "%s: line %d: missing realm in \"sasl-realm \" line\n", + "%s: line %d: missing dn in \"schemadn \" line\n", fname, lineno, 0 ); #endif - - return( 1 ); + return 1 ; } - - if ( global_realm != NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: already set sasl-realm!\n", - fname, lineno )); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: already set sasl-realm!\n", - fname, lineno, 0 ); -#endif - - return 1; - + ber_str2bv( cargv[1], 0, 0, &dn ); + if ( be ) { + rc = dnPrettyNormal( NULL, &dn, &be->be_schemadn, + &be->be_schemandn ); } else { - global_realm = ch_strdup( cargv[1] ); + rc = dnPrettyNormal( NULL, &dn, &global_schemadn, + &global_schemandn ); } - - } else if ( !strcasecmp( cargv[0], "sasl-regexp" ) - || !strcasecmp( cargv[0], "saslregexp" ) ) - { - int rc; - if ( cargc != 3 ) { + if ( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: need 2 args in " - "\"saslregexp \"\n", - fname, lineno )); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: need 2 args in \"saslregexp \"\n", - fname, lineno, 0 ); -#endif - - return( 1 ); - } - rc = slap_sasl_regexp_config( cargv[1], cargv[2] ); - if ( rc ) { - return rc; - } - - /* SASL security properties */ - } else if ( strcasecmp( cargv[0], "sasl-secprops" ) == 0 ) { - char *txt; - - if ( cargc < 2 ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing flags in " - "\"sasl-secprops \" line\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: schemadn DN is invalid.\n", + fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, - "%s: line %d: missing flags in \"sasl-secprops \" line\n", - fname, lineno, 0 ); -#endif - - return 1; - } - - txt = slap_sasl_secprops( cargv[1] ); - if ( txt != NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d sas-secprops: %s\n", - fname, lineno, txt )); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: sasl-secprops: %s\n", - fname, lineno, txt ); + "%s: line %d: schemadn DN is invalid\n", + fname, lineno, 0 ); #endif - return 1; } - } else if ( strcasecmp( cargv[0], "sasl-external-x509dn-convert" ) == 0 ) { - sasl_external_x509dn_convert++; - /* set UCDATA path */ } else if ( strcasecmp( cargv[0], "ucdata-path" ) == 0 ) { int err; if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: missing path in " - "\"ucdata-path \" line.\n", - fname, lineno )); + "\"ucdata-path \" line.\n", fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing path in \"ucdata-path \" line\n", @@ -687,11 +698,10 @@ read_config( const char *fname ) if ( err <= 0 ) { if ( err == 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: ucdata already loaded, ucdata-path " "must be set earlier in the file and/or be " - "specified only once!\n", - fname, lineno )); + "specified only once!\n", fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: ucdata already loaded, ucdata-path must be set earlier in the file and/or be specified only once!\n", @@ -709,9 +719,9 @@ read_config( const char *fname ) if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing limit in \"sizelimit \" line.\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing limit in \"sizelimit \" " + "line.\n", fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing limit in \"sizelimit \" line\n", @@ -730,27 +740,55 @@ read_config( const char *fname ) for ( i = 1; i < cargc; i++ ) { if ( strncasecmp( cargv[i], "size", 4 ) == 0 ) { rc = parse_limit( cargv[i], lim ); + if ( rc ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: unable " + "to parse value \"%s\" in \"sizelimit " + "\" line.\n", fname, lineno, cargv[i] ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: unable " + "to parse value \"%s\" " + "in \"sizelimit " + "\" line\n", + fname, lineno, cargv[i] ); +#endif + return( 1 ); + } + } else { - lim->lms_s_soft = atoi( cargv[i] ); - lim->lms_s_hard = 0; - } + if ( strcasecmp( cargv[i], "unlimited" ) == 0 ) { + lim->lms_s_soft = -1; + } else { + char *next; - if ( rc ) { + lim->lms_s_soft = strtol( cargv[i] , &next, 0 ); + if ( next == cargv[i] ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: unable " - "to parse value \"%s\" " - "in \"sizelimit " - "\" line.\n", - fname, lineno, cargv[i] )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: unable to parse limit \"%s\" in \"sizelimit \" " + "line.\n", fname, lineno, cargv[i] ); #else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: unable " - "to parse value \"%s\" " - "in \"sizelimit " - "\" line\n", - fname, lineno, cargv[i] ); + Debug( LDAP_DEBUG_ANY, + "%s: line %d: unable to parse limit \"%s\" in \"sizelimit \" line\n", + fname, lineno, cargv[i] ); #endif + return( 1 ); + + } else if ( next[0] != '\0' ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: trailing chars \"%s\" in \"sizelimit \" " + "line ignored.\n", fname, lineno, next ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: trailing chars \"%s\" in \"sizelimit \" line ignored\n", + fname, lineno, next ); +#endif + } + } + lim->lms_s_hard = 0; } } @@ -761,9 +799,9 @@ read_config( const char *fname ) if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d missing limit in \"timelimit \" line.\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d missing limit in \"timelimit \" " + "line.\n", fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing limit in \"timelimit \" line\n", @@ -782,27 +820,55 @@ read_config( const char *fname ) for ( i = 1; i < cargc; i++ ) { if ( strncasecmp( cargv[i], "time", 4 ) == 0 ) { rc = parse_limit( cargv[i], lim ); + if ( rc ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: unable to parse value \"%s\" " + "in \"timelimit \" line.\n", + fname, lineno, cargv[i] ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: unable " + "to parse value \"%s\" " + "in \"timelimit " + "\" line\n", + fname, lineno, cargv[i] ); +#endif + return( 1 ); + } + } else { - lim->lms_t_soft = atoi( cargv[i] ); - lim->lms_t_hard = 0; - } + if ( strcasecmp( cargv[i], "unlimited" ) == 0 ) { + lim->lms_t_soft = -1; + } else { + char *next; - if ( rc ) { + lim->lms_t_soft = strtol( cargv[i] , &next, 0 ); + if ( next == cargv[i] ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: unable " - "to parse value \"%s\" " - "in \"timelimit " - "\" line.\n", - fname, lineno, cargv[i] )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: unable to parse limit \"%s\" in \"timelimit \" " + "line.\n", fname, lineno, cargv[i] ); #else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: unable " - "to parse value \"%s\" " - "in \"timelimit " - "\" line\n", - fname, lineno, cargv[i] ); + Debug( LDAP_DEBUG_ANY, + "%s: line %d: unable to parse limit \"%s\" in \"timelimit \" line\n", + fname, lineno, cargv[i] ); #endif + return( 1 ); + + } else if ( next[0] != '\0' ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: trailing chars \"%s\" in \"timelimit \" " + "line ignored.\n", fname, lineno, next ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: trailing chars \"%s\" in \"timelimit \" line ignored\n", + fname, lineno, next ); +#endif + } + } + lim->lms_t_hard = 0; } } @@ -810,9 +876,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "limits" ) == 0 ) { if ( be == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_WARNING, - "%s: line %d \"limits\" allowed only in database environment.\n", - fname, lineno )); + LDAP_LOG( CONFIG, WARNING, + "%s: line %d \"limits\" allowed only in database " + "environment.\n", fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d \"limits\" allowed only in database environment.\n%s", @@ -829,256 +895,152 @@ 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, INFO, "%s: line %d: " + "subordinate keyword must appear inside a database " + "definition.\n", fname, lineno, 0 ); #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; + } 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, pdn, ndn; + if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing dn in \"suffix \" line.\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing dn in \"suffix \" line.\n", + fname, lineno, 0 ); #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] )); + LDAP_LOG( CONFIG, INFO, + "%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 )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: suffix line must appear inside a database " + "definition.\n", fname, lineno, 0 ); #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, CRIT, "%s: line %d: \"" + SLAPD_MONITOR_DN "\" is reserved for monitoring slapd\n", + fname, lineno, 0 ); #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 */ + } - } else if ( ( tmp_be = select_backend( cargv[1], 0, 0 ) ) == be ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%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 this backend (ignored)\n", - fname, lineno, 0 ); -#endif - - } else if ( tmp_be != NULL ) { -#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] )); -#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] ); -#endif - - } else { - char *dn; - - if ( load_ucdata( NULL ) < 0 ) { - return( 1 ); - } - dn = ch_strdup( cargv[1] ); - if( dn_validate( dn ) == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: suffix DN invalid\"%s\"\n", - fname, lineno, cargv[1] )); -#else - Debug( LDAP_DEBUG_ANY, "%s: line %d: " - "suffix DN invalid \"%s\"\n", - fname, lineno, cargv[1] ); -#endif - free( dn ); - return 1; - - } else if( *dn == '\0' && default_search_nbase != NULL ) { -#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 )); -#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 ); -#endif + if ( load_ucdata( NULL ) < 0 ) return 1; - } - 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 ) ); - } + dn.bv_val = cargv[1]; + dn.bv_len = strlen( cargv[1] ); - /* set database suffixAlias */ - } else if ( strcasecmp( cargv[0], "suffixAlias" ) == 0 ) { - Backend *tmp_be; - if ( cargc < 2 ) { + rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn ); + if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%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", + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: suffix DN is invalid.\n", fname, lineno, 0 ); -#endif - - return( 1 ); - } 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 )); #else Debug( LDAP_DEBUG_ANY, -"%s: line %d: missing aliased_dn in \"suffixAlias \" line\n", - fname, lineno, 0 ); + "%s: line %d: suffix DN is invalid\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 )); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: extra cruft in suffixAlias line (ignored)\n", - fname, lineno, 0 ); -#endif - } - if ( 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: suffixAlias line must appear inside a " - "database definition (ignored).\n", fname, lineno )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: suffix already served by this backend " + "(ignored)\n", fname, lineno, 0 ); #else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: suffixAlias line" - " must appear inside a database definition (ignored)\n", - fname, lineno, 0 ); + Debug( LDAP_DEBUG_ANY, "%s: line %d: suffix " + "already served by this backend (ignored)\n", + fname, lineno, 0 ); #endif + free( pdn.bv_val ); + free( ndn.bv_val ); - } else if ( (tmp_be = select_backend( cargv[1], 0, 0 )) != NULL ) { + } else if ( tmp_be != NULL ) { #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] )); + LDAP_LOG( CONFIG, 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: suffixAlias 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 a preceeding backend \"%s\"\n", + fname, lineno, tmp_be->be_suffix[0].bv_val ); #endif + free( pdn.bv_val ); + free( ndn.bv_val ); + return( 1 ); - - } else if ( (tmp_be = select_backend( cargv[2], 0, 0 )) != NULL ) { + } else if( pdn.bv_len == 0 && default_search_nbase.bv_len ) { #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] )); + LDAP_LOG( CONFIG, INFO, + "%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: suffixAlias derefs to differnet backend" - " a preceeding backend \"%s\" (ignored)\n", - fname, lineno, tmp_be->be_suffix[0] ); + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "suffix DN empty and default " + "search base provided \"%s\" (assuming okay)\n", + fname, lineno, default_search_base.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_bvarray_add( &be->be_suffix, &pdn ); + ber_bvarray_add( &be->be_nsuffix, &ndn ); + /* set max deref depth */ } else if ( strcasecmp( cargv[0], "maxDerefDepth" ) == 0 ) { int i; if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: missing depth in \"maxDerefDepth \"" - " line\n", fname, lineno )); + " line\n", fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing depth in \"maxDerefDepth \" line\n", @@ -1089,25 +1051,27 @@ read_config( const char *fname ) } if ( be == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, + LDAP_LOG( CONFIG, INFO, "%s: line %d: depth line must appear inside a database " - "definition (ignored)\n", fname, lineno )); + "definition.\n", fname, lineno ,0 ); #else Debug( LDAP_DEBUG_ANY, -"%s: line %d: depth line must appear inside a database definition (ignored)\n", +"%s: line %d: depth line must appear inside a database definition.\n", fname, lineno, 0 ); #endif + return 1; } else if ((i = atoi(cargv[1])) < 0) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: depth must be positive (ignored).\n", - fname, lineno )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: depth must be positive.\n", + fname, lineno ,0 ); #else Debug( LDAP_DEBUG_ANY, -"%s: line %d: depth must be positive (ignored)\n", +"%s: line %d: depth must be positive.\n", fname, lineno, 0 ); #endif + return 1; } else { @@ -1119,9 +1083,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "rootdn" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, + LDAP_LOG( CONFIG, INFO, "%s: line %d: missing dn in \"rootdn \" line.\n", - fname, lineno )); + fname, lineno ,0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing dn in \"rootdn \" line\n", @@ -1130,90 +1094,91 @@ read_config( const char *fname ) return( 1 ); } + if ( be == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, + LDAP_LOG( CONFIG, INFO, "%s: line %d: rootdn line must appear inside a database " - "definition (ignored).\n", fname, lineno )); + "definition.\n", fname, lineno ,0 ); #else Debug( LDAP_DEBUG_ANY, -"%s: line %d: rootdn line must appear inside a database definition (ignored)\n", +"%s: line %d: rootdn line must appear inside a database definition.\n", fname, lineno, 0 ); #endif + return 1; } 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, - "%s: line %d: rootdn DN is invalid.\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: rootdn DN is invalid.\n", + fname, lineno ,0 ); #else Debug( LDAP_DEBUG_ANY, "%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 */ } else if ( strcasecmp( cargv[0], "rootpw" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing passwd in \"rootpw \"" - " line\n", fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing passwd in \"rootpw \"" + " line\n", fname, lineno ,0 ); #else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: missing passwd in \"rootpw \" line\n", + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "missing passwd in \"rootpw \" line\n", fname, lineno, 0 ); #endif return( 1 ); } + if ( be == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: rootpw line must appear inside a database " - "definition (ignored)\n", fname, lineno )); + LDAP_LOG( CONFIG, INFO, "%s: line %d: " + "rootpw line must appear inside a database " + "definition.\n", fname, lineno ,0 ); #else - Debug( LDAP_DEBUG_ANY, -"%s: line %d: rootpw line must appear inside a database definition (ignored)\n", + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "rootpw line must appear inside a database " + "definition.\n", fname, lineno, 0 ); #endif + return 1; } else { + Backend *tmp_be = select_backend( &be->be_rootndn, 0, 0 ); + + if( tmp_be != be ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, + "%s: line %d: " + "rootpw can only be set when rootdn is under suffix\n", + fname, lineno, "" ); +#else + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "rootpw can only be set when rootdn is under suffix\n", + fname, lineno, 0 ); +#endif + return 1; + } + be->be_rootpw.bv_val = ch_strdup( cargv[1] ); be->be_rootpw.bv_len = strlen( be->be_rootpw.bv_val ); } @@ -1222,9 +1187,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "readonly" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing on|off in \"readonly \" line.\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing on|off in \"readonly \" " + "line.\n", fname, lineno ,0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing on|off in \"readonly \" line\n", @@ -1256,9 +1221,9 @@ read_config( const char *fname ) if ( be != NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, + LDAP_LOG( CONFIG, INFO, "%s: line %d: allow line must appear prior to " - "database definitions.\n", fname, lineno )); + "database definitions.\n", fname, lineno ,0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: allow line must appear prior to database definitions\n", @@ -1269,9 +1234,9 @@ read_config( const char *fname ) if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: missing feature(s) in \"allow \"" - " line\n", fname, lineno )); + " line\n", fname, lineno ,0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing feature(s) in \"allow \" line\n", @@ -1293,16 +1258,18 @@ read_config( const char *fname ) } else if( strcasecmp( cargv[i], "bind_anon_dn" ) == 0 ) { allows |= SLAP_ALLOW_BIND_ANON_DN; + } else if( strcasecmp( cargv[i], "update_anon" ) == 0 ) { + allows |= SLAP_ALLOW_UPDATE_ANON; + } else if( strcasecmp( cargv[i], "none" ) != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: unknown feature %s in " - "\"allow \" line.\n", - fname, lineno, cargv[1] )); + LDAP_LOG( CONFIG, CRIT, "%s: line %d: " + "unknown feature %s in \"allow \" line.\n", + fname, lineno, cargv[1] ); #else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: unknown feature %s in \"allow \" line\n", - fname, lineno, cargv[i] ); + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "unknown feature %s in \"allow \" line\n", + fname, lineno, cargv[i] ); #endif return( 1 ); @@ -1319,9 +1286,9 @@ read_config( const char *fname ) if ( be != NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, + LDAP_LOG( CONFIG, INFO, "%s: line %d: disallow line must appear prior to " - "database definitions.\n", fname, lineno )); + "database definitions.\n", fname, lineno ,0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: disallow line must appear prior to database definitions\n", @@ -1332,9 +1299,9 @@ read_config( const char *fname ) if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing feature(s) in \"disallow \"" - " line.\n", fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing feature(s) in \"disallow \"" + " line.\n", fname, lineno ,0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing feature(s) in \"disallow \" line\n", @@ -1364,10 +1331,10 @@ read_config( const char *fname ) } else if( strcasecmp( cargv[i], "none" ) != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: unknown feature %s in " "\"disallow \" line.\n", - fname, lineno, cargv[i] )); + fname, lineno, cargv[i] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: unknown feature %s in \"disallow \" line\n", @@ -1388,9 +1355,9 @@ read_config( const char *fname ) if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: missing feature(s) in " - "\"require \" line.\n", fname, lineno )); + "\"require \" line.\n", fname, lineno ,0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing feature(s) in \"require \" line\n", @@ -1420,10 +1387,10 @@ read_config( const char *fname ) } else if( strcasecmp( cargv[i], "none" ) != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: unknown feature %s in " - "\"require \" line.\n", - fname, lineno )); + "\"require \" line.\n", + fname, lineno , cargv[i] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: unknown feature %s in \"require \" line\n", @@ -1446,9 +1413,9 @@ read_config( const char *fname ) if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing factor(s) in \"security \"" - " line.\n", fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing factor(s) in \"security \"" + " line.\n", fname, lineno ,0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing factor(s) in \"security \" line\n", @@ -1513,12 +1480,18 @@ read_config( const char *fname ) set->sss_update_sasl = atoi( &cargv[i][sizeof("update_sasl")] ); + } else if( strncasecmp( cargv[i], "simple_bind=", + sizeof("simple_bind") ) == 0 ) + { + set->sss_simple_bind = + atoi( &cargv[i][sizeof("simple_bind")] ); + } else { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: unknown factor %S in " "\"security \" line.\n", - fname, lineno, cargv[1] )); + fname, lineno, cargv[1] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: unknown factor %s in \"security \" line\n", @@ -1532,9 +1505,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "referral" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing URL in \"referral \"" - " line.\n", fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing URL in \"referral \"" + " line.\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing URL in \"referral \" line\n", @@ -1546,9 +1519,9 @@ read_config( const char *fname ) if( validate_global_referral( cargv[1] ) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, "%s: line %d: " - "invalid URL (%s) in \"referral\" line.\n", - fname, lineno, cargv[1] )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: invalid URL (%s) in \"referral\" line.\n", + fname, lineno, cargv[1] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "invalid URL (%s) in \"referral\" line.\n", @@ -1557,18 +1530,19 @@ read_config( const char *fname ) return 1; } - vals[0]->bv_val = cargv[1]; - vals[0]->bv_len = strlen( vals[0]->bv_val ); - value_add( &default_referral, vals ); + vals[0].bv_val = cargv[1]; + vals[0].bv_len = strlen( vals[0].bv_val ); + if( value_add( &default_referral, vals ) ) + return LDAP_OTHER; #ifdef NEW_LOGGING } else if ( strcasecmp( cargv[0], "logfile" ) == 0 ) { FILE *logfile; if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: Error in logfile directive, " - "\"logfile \"\n", fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: Error in logfile directive, " + "\"logfile \"\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: Error in logfile directive, \"logfile filename\"\n", @@ -1578,7 +1552,7 @@ read_config( const char *fname ) return( 1 ); } logfile = fopen( cargv[1], "w" ); - if ( logfile != NULL ) lutil_debug_file( logfile ); + if ( logfile != NULL ) lutil_debug_file( logfile ); #endif /* start of a new database definition */ @@ -1586,9 +1560,9 @@ read_config( const char *fname ) int level; if ( cargc < 3 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: Error in debug directive, " - "\"debug \"\n", fname, lineno )); + "\"debug \"\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: Error in debug directive, \"debug subsys level\"\n", @@ -1607,40 +1581,71 @@ read_config( const char *fname ) /* specify an objectclass */ } else if ( strcasecmp( cargv[0], "objectclass" ) == 0 ) { - if ( *cargv[1] == '(' ) { + if ( cargc < 2 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, + "%s: line %d: illegal objectclass format.\n", + fname, lineno , 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: illegal objectclass format.\n", + fname, lineno, 0 ); +#endif + return( 1 ); + + } else if ( *cargv[1] == '(' /*')'*/) { char * p; - p = strchr(saveline,'('); + p = strchr(saveline,'(' /*')'*/); rc = parse_oc( fname, lineno, p, cargv ); if( rc ) return rc; } else { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: old objectclass format not supported\n", - fname, lineno )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: old objectclass format not supported\n", + fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: old objectclass format not supported.\n", fname, lineno, 0 ); #endif - } +#ifdef SLAP_EXTENDED_SCHEMA + } else if ( strcasecmp( cargv[0], "ditcontentrule" ) == 0 ) { + char * p; + p = strchr(saveline,'(' /*')'*/); + rc = parse_cr( fname, lineno, p, cargv ); + if( rc ) return rc; +#endif + /* specify an attribute type */ } else if (( strcasecmp( cargv[0], "attributetype" ) == 0 ) || ( strcasecmp( cargv[0], "attribute" ) == 0 )) { - if ( *cargv[1] == '(' ) { + if ( cargc < 2 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, "%s: line %d: " + "illegal attribute type format.\n", + fname, lineno , 0 ); +#else + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "illegal attribute type format.\n", + fname, lineno, 0 ); +#endif + return( 1 ); + + } else if ( *cargv[1] == '(' /*')'*/) { char * p; - p = strchr(saveline,'('); + p = strchr(saveline,'(' /*')'*/); rc = parse_at( fname, lineno, p, cargv ); if( rc ) return rc; } else { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: old attribute type format not supported.\n", - fname, lineno )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: old attribute type format not supported.\n", + fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: old attribute type format not supported.\n", @@ -1649,14 +1654,20 @@ read_config( const char *fname ) } + /* define attribute option(s) */ + } else if ( strcasecmp( cargv[0], "attributeoptions" ) == 0 ) { + ad_define_option( NULL, NULL, 0 ); + for ( i = 1; i < cargc; i++ ) + if ( ad_define_option( cargv[i], fname, lineno ) != 0 ) + return 1; + /* turn on/off schema checking */ } else if ( strcasecmp( cargv[0], "schemacheck" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing on|off in " - "\"schemacheck \" line.\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing on|off in \"schemacheck \"" + " line.\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing on|off in \"schemacheck \" line\n", @@ -1666,6 +1677,15 @@ read_config( const char *fname ) return( 1 ); } if ( strcasecmp( cargv[1], "off" ) == 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: schema checking disabled! your mileage may " + "vary!\n", fname, lineno , 0 ); +#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; @@ -1679,9 +1699,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "loglevel" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing level in \"loglevel \"" - " line.\n", fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing level in \"loglevel \"" + " line.\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing level in \"loglevel \" line\n", @@ -1701,9 +1721,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "replica" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing host in \"replica " - " \" line\n", @@ -1714,14 +1734,15 @@ read_config( const char *fname ) } if ( be == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: replica line must appear inside " - "a database definition (ignored).\n", fname, lineno )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: replica line must appear inside " + "a database definition.\n", fname, lineno, 0); #else Debug( LDAP_DEBUG_ANY, -"%s: line %d: replica line must appear inside a database definition (ignored)\n", +"%s: line %d: replica line must appear inside a database definition\n", fname, lineno, 0 ); #endif + return 1; } else { int nr = -1; @@ -1736,28 +1757,29 @@ read_config( const char *fname ) } if ( i == cargc ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: missing host in \"replica\" " - "line (ignored)\n", fname, lineno )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: missing host in \"replica\" line\n", + fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, - "%s: line %d: missing host in \"replica\" line (ignored)\n", + "%s: line %d: missing host in \"replica\" line\n", fname, lineno, 0 ); #endif + return 1; } else if ( nr == -1 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, + LDAP_LOG( CONFIG, INFO, "%s: line %d: unable to add" - " replica \"%s\"" - " (ignored)\n", + " replica \"%s\"\n", fname, lineno, - cargv[i] + 5 )); + cargv[i] + 5 ); #else Debug( LDAP_DEBUG_ANY, - "%s: line %d: unable to add replica \"%s\" (ignored)\n", + "%s: line %d: unable to add replica \"%s\"\n", fname, lineno, cargv[i] + 5 ); #endif + return 1; } else { for ( i = 1; i < cargc; i++ ) { if ( strncasecmp( cargv[i], "suffix=", 7 ) == 0 ) { @@ -1765,9 +1787,10 @@ read_config( const char *fname ) switch ( add_replica_suffix( be, nr, cargv[i] + 7 ) ) { case 1: #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: suffix \"%s\" in \"replica\" line is not valid for backend (ignored)\n", - fname, lineno, cargv[i] + 7 )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: suffix \"%s\" in \"replica\"" + " line is not valid for backend(ignored)\n", + fname, lineno, cargv[i] + 7 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: suffix \"%s\" in \"replica\" line is not valid for backend (ignored)\n", @@ -1777,9 +1800,10 @@ read_config( const char *fname ) case 2: #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: unable to normalize suffix in \"replica\" line (ignored)\n", - fname, lineno )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: unable to normalize suffix" + " in \"replica\" line (ignored)\n", + fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: unable to normalize suffix in \"replica\" line (ignored)\n", @@ -1787,6 +1811,33 @@ read_config( const char *fname ) #endif break; } + + } else if ( strncasecmp( cargv[i], "attr", 4 ) == 0 ) { + int exclude = 0; + char *arg = cargv[i] + 4; + + if ( arg[0] == '!' ) { + arg++; + exclude = 1; + } + + if ( arg[0] != '=' ) { + continue; + } + + if ( add_replica_attrs( be, nr, arg + 1, exclude ) ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, + "%s: line %d: attribute \"%s\" in " + "\"replica\" line is unknown\n", + fname, lineno, arg + 1 ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: attribute \"%s\" in \"replica\" line is unknown\n", + fname, lineno, arg + 1 ); +#endif + return( 1 ); + } } } } @@ -1796,9 +1847,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "updatedn" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing dn in \"updatedn \"" - " line.\n", fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing dn in \"updatedn \"" + " line.\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing dn in \"updatedn \" line\n", @@ -1809,32 +1860,31 @@ read_config( const char *fname ) } if ( be == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: updatedn line must appear inside " - "a database definition (ignored)\n", - fname, lineno )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: updatedn line must appear inside " + "a database definition\n", + fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, -"%s: line %d: updatedn line must appear inside a database definition (ignored)\n", +"%s: line %d: updatedn line must appear inside a database definition\n", fname, lineno, 0 ); #endif + return 1; } 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, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: updatedn DN is invalid.\n", - fname, lineno )); + fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: updatedn DN is invalid\n", @@ -1842,17 +1892,14 @@ read_config( const char *fname ) #endif return 1; } - - be->be_update_ndn = *ndn; - free( ndn ); } } else if ( strcasecmp( cargv[0], "updateref" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, "%s: line %d: " + LDAP_LOG( CONFIG, CRIT, "%s: line %d: " "missing url in \"updateref \" line.\n", - fname, lineno )); + fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "missing url in \"updateref \" line\n", @@ -1863,9 +1910,9 @@ read_config( const char *fname ) } if ( be == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, "%s: line %d: updateref" + LDAP_LOG( CONFIG, INFO, "%s: line %d: updateref" " line must appear inside a database definition\n", - fname, lineno )); + fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: updateref" " line must appear inside a database definition\n", @@ -1875,9 +1922,9 @@ read_config( const char *fname ) } else if ( !be->be_update_ndn.bv_len ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, "%s: line %d: " + LDAP_LOG( CONFIG, INFO, "%s: line %d: " "updateref line must come after updatedn.\n", - fname, lineno )); + fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "updateref line must after updatedn.\n", @@ -1888,9 +1935,9 @@ read_config( const char *fname ) if( validate_global_referral( cargv[1] ) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, "%s: line %d: " + LDAP_LOG( CONFIG, CRIT, "%s: line %d: " "invalid URL (%s) in \"updateref\" line.\n", - fname, lineno, cargv[1] )); + fname, lineno, cargv[1] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "invalid URL (%s) in \"updateref\" line.\n", @@ -1899,17 +1946,18 @@ read_config( const char *fname ) return 1; } - vals[0]->bv_val = cargv[1]; - vals[0]->bv_len = strlen( vals[0]->bv_val ); - value_add( &be->be_update_refs, vals ); + vals[0].bv_val = cargv[1]; + vals[0].bv_len = strlen( vals[0].bv_val ); + if( value_add( &be->be_update_refs, vals ) ) + return LDAP_OTHER; /* replication log file to which changes are appended */ } else if ( strcasecmp( cargv[0], "replogfile" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing filename in \"replogfile \"" - " line.\n", fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing filename in \"replogfile \"" + " line.\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing filename in \"replogfile \" line\n", @@ -1925,15 +1973,15 @@ read_config( const char *fname ) } /* file from which to read additional rootdse attrs */ - } else if ( strcasecmp( cargv[0], "rootdse" ) == 0) { + } else if ( strcasecmp( cargv[0], "rootDSE" ) == 0) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, "%s: line %d: " - "missing filename in \"rootDSEfile \" line.\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, "%s: line %d: " + "missing filename in \"rootDSE \" line.\n", + fname, lineno , 0 ); #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; @@ -1941,12 +1989,12 @@ 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", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, "%s: line %d: " + "could not read \"rootDSE \" line.\n", + fname, lineno , 0 ); #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; @@ -1956,9 +2004,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "lastmod" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: missing on|off in \"lastmod \"" - " line.\n", fname, lineno )); + " line.\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing on|off in \"lastmod \" line\n", @@ -1968,25 +2016,43 @@ 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 = 1; + } } else { - if ( be ) - be->be_lastmod = OFF; - else - global_lastmod = OFF; + if ( be ) { + be->be_flags |= SLAP_BFLAG_NOLASTMOD; + } else { + lastmod = 0; + } } +#ifdef SIGHUP + /* turn on/off gentle SIGHUP handling */ + } else if ( strcasecmp( cargv[0], "gentlehup" ) == 0 ) { + if ( cargc < 2 ) { + Debug( LDAP_DEBUG_ANY, + "%s: line %d: missing on|off in \"gentlehup \" line\n", + fname, lineno, 0 ); + return( 1 ); + } + if ( strcasecmp( cargv[1], "off" ) == 0 ) { + global_gentlehup = 0; + } else { + global_gentlehup = 1; + } +#endif + /* set idle timeout value */ } else if ( strcasecmp( cargv[0], "idletimeout" ) == 0 ) { int i; if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing timeout value in " - "\"idletimeout \" line.\n", fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing timeout value in " + "\"idletimeout \" line.\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing timeout value in \"idletimeout \" line\n", @@ -2000,10 +2066,9 @@ read_config( const char *fname ) if( i < 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: timeout value (%d) invalid " - "\"idletimeout \" line.\n", - fname, lineno, i )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: timeout value (%d) invalid " + "\"idletimeout \" line.\n", fname, lineno, i ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: timeout value (%d) invalid \"idletimeout \" line\n", @@ -2019,9 +2084,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "include" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing filename in \"include " - "\" line.\n", fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing filename in \"include " + "\" line.\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing filename in \"include \" line\n", @@ -2033,7 +2098,7 @@ read_config( const char *fname ) savefname = ch_strdup( cargv[1] ); savelineno = lineno; - if ( read_config( savefname ) != 0 ) { + if ( read_config( savefname, depth+1 ) != 0 ) { return( 1 ); } @@ -2044,9 +2109,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "srvtab" ) == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: missing filename in \"srvtab " - "\" line.\n", fname, lineno )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: missing filename in \"srvtab " + "\" line.\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing filename in \"srvtab \" line\n", @@ -2061,9 +2126,9 @@ read_config( const char *fname ) } else if (strcasecmp( cargv[0], "moduleload") == 0 ) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: missing filename in \"moduleload " - "\" line.\n", fname, lineno )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: missing filename in \"moduleload " + "\" line.\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing filename in \"moduleload \" line\n", @@ -2074,9 +2139,9 @@ read_config( const char *fname ) } if (module_load(cargv[1], cargc - 2, (cargc > 2) ? cargv + 2 : NULL)) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: failed to load or initialize module %s\n"< - fname, lineno, cargv[1] )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: failed to load or initialize module %s\n", + fname, lineno, cargv[1] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: failed to load or initialize module %s\n", @@ -2088,9 +2153,9 @@ read_config( const char *fname ) } else if (strcasecmp( cargv[0], "modulepath") == 0 ) { if ( cargc != 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: missing path in \"modulepath \"" - " line\n", fname, lineno )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: missing path in \"modulepath \"" + " line\n", fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: missing path in \"modulepath \" line\n", @@ -2101,9 +2166,9 @@ read_config( const char *fname ) } if (module_path( cargv[1] )) { #ifdef NEW_LOGGING - LDAP_LOG(( "cofig", LDAP_LEVEL_CRIT, - "%s: line %d: failed to set module search path to %s.\n", - fname, lineno, cargv[1] )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: failed to set module search path to %s.\n", + fname, lineno, cargv[1] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: failed to set module search path to %s\n", @@ -2158,24 +2223,143 @@ read_config( const char *fname ) if ( rc ) return rc; } else if ( !strcasecmp( cargv[0], "TLSVerifyClient" ) ) { - i = atoi(cargv[1]); - rc = ldap_pvt_tls_set_option( NULL, + if ( isdigit( (unsigned char) cargv[1][0] ) ) { + i = atoi(cargv[1]); + rc = ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &i ); + } else { + rc = ldap_int_tls_config( NULL, + LDAP_OPT_X_TLS_REQUIRE_CERT, + cargv[1] ); + } + if ( rc ) return rc; #endif + } else if ( !strcasecmp( cargv[0], "reverse-lookup" ) ) { +#ifdef SLAPD_RLOOKUPS + if ( cargc < 2 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, + "%s: line %d: reverse-lookup: missing \"on\" or \"off\"\n", + fname, lineno , 0 ); +#else + Debug( LDAP_DEBUG_ANY, +"%s: line %d: reverse-lookup: missing \"on\" or \"off\"\n", + fname, lineno, 0 ); +#endif + return( 1 ); + } + + if ( !strcasecmp( cargv[1], "on" ) ) { + use_reverse_lookup = 1; + } else if ( !strcasecmp( cargv[1], "off" ) ) { + use_reverse_lookup = 0; + } else { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, + "%s: line %d: reverse-lookup: " + "must be \"on\" (default) or \"off\"\n", fname, lineno, 0 ); +#else + Debug( LDAP_DEBUG_ANY, +"%s: line %d: reverse-lookup: must be \"on\" (default) or \"off\"\n", + fname, lineno, 0 ); +#endif + return( 1 ); + } + +#else /* !SLAPD_RLOOKUPS */ +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, + "%s: line %d: reverse lookups " + "are not configured (ignored).\n", fname, lineno , 0 ); +#else + Debug( LDAP_DEBUG_ANY, +"%s: line %d: reverse lookups are not configured (ignored).\n", + fname, lineno, 0 ); +#endif +#endif /* !SLAPD_RLOOKUPS */ + + /* Netscape plugins */ + } else if ( strcasecmp( cargv[0], "plugin" ) == 0 ) { +#if defined( LDAP_SLAPI ) + +#ifdef notdef /* allow global plugins, too */ + /* + * a "plugin" line must be inside a database + * definition, since we implement pre-,post- + * and extended operation plugins + */ + if ( be == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, + "%s: line %d: plugin line must appear " + "inside a database definition.\n", + fname, lineno, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "%s: line %d: plugin " + "line must appear inside a database " + "definition\n", fname, lineno, 0 ); +#endif + return( 1 ); + } +#endif /* notdef */ + + if ( netscape_plugin( be, fname, lineno, cargc, cargv ) + != LDAP_SUCCESS ) { + return( 1 ); + } + +#else /* !defined( LDAP_SLAPI ) */ +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, + "%s: line %d: SLAPI not supported.\n", + fname, lineno, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "%s: line %d: SLAPI " + "not supported.\n", fname, lineno, 0 ); +#endif + return( 1 ); + +#endif /* !defined( LDAP_SLAPI ) */ + + /* Netscape plugins */ + } else if ( strcasecmp( cargv[0], "pluginlog" ) == 0 ) { +#if defined( LDAP_SLAPI ) + if ( cargc < 2 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, + "%s: line %d: missing file name " + "in pluginlog line.\n", + fname, lineno, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: missing file name " + "in pluginlog line.\n", + fname, lineno, 0 ); +#endif + return( 1 ); + } + + if ( slapi_log_file != NULL ) { + ch_free( slapi_log_file ); + } + + slapi_log_file = ch_strdup( cargv[1] ); +#endif /* !defined( LDAP_SLAPI ) */ + /* pass anything else to the current backend info/db config routine */ } else { if ( bi != NULL ) { if ( bi->bi_config == 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: unknown directive \"%s\" inside " - "backend info definition (ignored).\n", - fname, lineno, cargv[0] )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: unknown directive \"%s\" inside " + "backend info definition (ignored).\n", + fname, lineno, cargv[0] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: unknown directive \"%s\" inside backend info definition (ignored)\n", @@ -2192,10 +2376,10 @@ read_config( const char *fname ) } else if ( be != NULL ) { if ( be->be_config == 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: uknown directive \"%s\" inside " - "backend database definition (ignored).\n", - fname, lineno, cargv[0] )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: uknown directive \"%s\" inside " + "backend database definition (ignored).\n", + fname, lineno, cargv[0] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: unknown directive \"%s\" inside backend database definition (ignored)\n", @@ -2211,10 +2395,10 @@ read_config( const char *fname ) } } else { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: unknown directive \"%s\" outside backend " - "info and database definitions (ignored).\n", - fname, lineno, cargv[0] )); + LDAP_LOG( CONFIG, INFO, + "%s: line %d: unknown directive \"%s\" outside backend " + "info and database definitions (ignored).\n", + fname, lineno, cargv[0] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: unknown directive \"%s\" outside backend info and database definitions (ignored)\n", @@ -2226,39 +2410,78 @@ read_config( const char *fname ) free( saveline ); } fclose( fp ); - if ( load_ucdata( NULL ) < 0 ) { - return( 1 ); + + if ( depth == 0 ) ch_free( cargv ); + + if ( !global_schemadn.bv_val ) { + ber_str2bv( SLAPD_SCHEMA_DN, sizeof(SLAPD_SCHEMA_DN)-1, 1, + &global_schemadn ); + dnNormalize2( NULL, &global_schemadn, &global_schemandn ); } + + if ( load_ucdata( NULL ) < 0 ) return 1; return( 0 ); } static int fp_parse_line( - char *line, - int *argcp, - char **argv + int lineno, + char *line ) { char * token; + char * logline; + char logbuf[sizeof("pseudorootpw ***")]; + + cargc = 0; + token = strtok_quote( line, " \t" ); + + logline = line; + + if ( token && ( strcasecmp( token, "rootpw" ) == 0 || + strcasecmp( token, "replica" ) == 0 || /* contains "credentials" */ + strcasecmp( token, "bindpw" ) == 0 || /* used in back-ldap */ + strcasecmp( token, "pseudorootpw" ) == 0 || /* used in back-meta */ + strcasecmp( token, "dbpasswd" ) == 0 ) ) /* used in back-sql */ + { + snprintf( logline = logbuf, sizeof logbuf, "%s ***", token ); + } + + if ( strtok_quote_ptr ) { + *strtok_quote_ptr = ' '; + } - *argcp = 0; - for ( token = strtok_quote( line, " \t" ); token != NULL; - token = strtok_quote( NULL, " \t" ) ) { - if ( *argcp == MAXARGS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "fp_parse_line: too many tokens (%d max).\n", - MAXARGS )); + LDAP_LOG( CONFIG, DETAIL1, "line %d (%s)\n", lineno, logline , 0 ); #else - Debug( LDAP_DEBUG_ANY, "Too many tokens (max %d)\n", - MAXARGS, 0, 0 ); + Debug( LDAP_DEBUG_CONFIG, "line %d (%s)\n", lineno, logline, 0 ); #endif - return( 1 ); + if ( strtok_quote_ptr ) { + *strtok_quote_ptr = '\0'; + } + + for ( ; token != NULL; token = strtok_quote( NULL, " \t" ) ) { + if ( cargc == cargv_size - 1 ) { + char **tmp; + tmp = ch_realloc( cargv, (cargv_size + ARGS_STEP) * + sizeof(*cargv) ); + if ( tmp == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, ERR, "line %d: out of memory\n", lineno, 0,0 ); +#else + Debug( LDAP_DEBUG_ANY, + "line %d: out of memory\n", + lineno, 0, 0 ); +#endif + return -1; + } + cargv = tmp; + cargv_size += ARGS_STEP; } - argv[(*argcp)++] = token; + cargv[cargc++] = token; } - argv[*argcp] = NULL; + cargv[cargc] = NULL; return 0; } @@ -2269,6 +2492,7 @@ strtok_quote( char *line, char *sep ) char *tmp; static char *next; + strtok_quote_ptr = NULL; if ( line != NULL ) { next = line; } @@ -2303,6 +2527,7 @@ strtok_quote( char *line, char *sep ) default: if ( ! inquote ) { if ( strchr( sep, *next ) != NULL ) { + strtok_quote_ptr = next; *next++ = '\0'; return( tmp ); } @@ -2317,18 +2542,18 @@ strtok_quote( char *line, char *sep ) static char buf[BUFSIZ]; static char *line; -static int lmax, lcur; - -#define CATLINE( buf ) { \ - int len; \ - len = strlen( buf ); \ - while ( lcur + len + 1 > lmax ) { \ - lmax += BUFSIZ; \ - line = (char *) ch_realloc( line, lmax ); \ - } \ - strcpy( line + lcur, buf ); \ - lcur += len; \ -} +static size_t lmax, lcur; + +#define CATLINE( buf ) \ + do { \ + size_t len = strlen( buf ); \ + while ( lcur + len + 1 > lmax ) { \ + lmax += BUFSIZ; \ + line = (char *) ch_realloc( line, lmax ); \ + } \ + strcpy( line + lcur, buf ); \ + lcur += len; \ + } while( 0 ) static char * fp_getline( FILE *fp, int *lineno ) @@ -2351,12 +2576,22 @@ fp_getline( FILE *fp, int *lineno ) if( p > buf && p[-1] == '\r' ) --p; *p = '\0'; } - if ( ! isspace( (unsigned char) buf[0] ) ) { - return( line ); - } + + /* trim off trailing \ and append the next line */ + if ( line[ 0 ] != '\0' + && (p = line + strlen( line ) - 1)[ 0 ] == '\\' + && p[ -1 ] != '\\' ) { + p[ 0 ] = '\0'; + lcur--; - /* change leading whitespace to a space */ - buf[0] = ' '; + } else { + if ( ! isspace( (unsigned char) buf[0] ) ) { + return( line ); + } + + /* change leading whitespace to a space */ + buf[0] = ' '; + } CATLINE( buf ); (*lineno)++; @@ -2386,8 +2621,8 @@ load_ucdata( char *path ) err = ucdata_load( path ? path : SLAPD_DEFAULT_UCDATA, UCDATA_ALL ); if ( err ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "load_ucdata: Error %d loading ucdata.\n", err )); + LDAP_LOG( CONFIG, CRIT, + "load_ucdata: Error %d loading ucdata.\n", err, 0,0 ); #else Debug( LDAP_DEBUG_ANY, "error loading ucdata (error %d)\n", err, 0, 0 ); @@ -2403,10 +2638,14 @@ void config_destroy( ) { ucdata_unload( UCDATA_ALL ); + free( global_schemandn.bv_val ); + free( global_schemadn.bv_val ); free( line ); if ( slapd_args_file ) free ( slapd_args_file ); if ( slapd_pid_file ) free ( slapd_pid_file ); + if ( default_passwd_hash ) + free( default_passwd_hash ); acl_destroy( global_acl, NULL ); }