X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=cbfc9482ca0ad0b4017b9da8197eba52b976bc05;hb=b0b3eff457f0e431c4fd094d3d9cfeb6383df91d;hp=286531681413c5b69ba5a3756f1fe10b90dfa8ef;hpb=709ce4fa6c0a8aea66c4b6e15bf42aa3352ad2e2;p=openldap diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 2865316814..cbfc9482ca 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -1,8 +1,27 @@ /* config.c - configuration file handling routines */ /* $OpenLDAP$ */ -/* - * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2003 The OpenLDAP Foundation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* Portions Copyright (c) 1995 Regents of the University of Michigan. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that this notice is preserved and that due credit is given + * to the University of Michigan at Ann Arbor. The name of the University + * may not be used to endorse or promote products derived from this + * software without specific prior written permission. This software + * is provided ``as is'' without express or implied warranty. */ #include "portable.h" @@ -11,14 +30,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 +52,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,61 +65,75 @@ slap_mask_t global_disallows = 0; slap_mask_t global_requires = 0; slap_ssf_set_t global_ssf_set; char *replogfile; +int global_gentlehup = 0; int global_idletimeout = 0; char *global_host = NULL; char *global_realm = NULL; char *ldap_srvtab = ""; 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; -#ifdef SLAPD_RLOOKUPS -int use_reverse_lookup = 1; -#else /* !SLAPD_RLOOKUPS */ int use_reverse_lookup = 0; -#endif /* !SLAPD_RLOOKUPS */ + +#ifdef LDAP_SLAPI +int slapi_plugins_used = 0; +#endif static char *fp_getline(FILE *fp, int *lineno); static void fp_getline_init(int *lineno); -static int fp_parse_line(int lineno, 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); +static int add_syncrepl LDAP_P(( Backend *, char **, int )); +static int parse_syncrepl_line LDAP_P(( char **, int, syncinfo_t *)); + 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]; - + char *replicahost; + LDAPURLDesc *ludp; static int lastmod = 1; static BackendInfo *bi = NULL; static BackendDB *be = 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", @@ -104,8 +143,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 @@ -122,15 +161,14 @@ read_config( const char *fname ) /* fp_parse_line is destructive, we save a copy */ saveline = ch_strdup( line ); - if ( fp_parse_line( lineno, 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", @@ -143,9 +181,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", @@ -157,9 +195,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", @@ -173,9 +211,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", @@ -187,9 +225,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", @@ -204,9 +242,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", @@ -221,9 +258,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", @@ -237,10 +274,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", @@ -257,9 +293,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 \" line\n", - fname, lineno )); + LDAP_LOG( CONFIG, 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", @@ -273,10 +309,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 " @@ -294,9 +330,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", @@ -310,10 +346,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 " @@ -326,13 +362,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, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: missing dn in \"defaultSearchBase \" line\n", @@ -343,10 +453,10 @@ read_config( const char *fname ) } else if ( cargc > 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, + LDAP_LOG( CONFIG, INFO, "%s: line %d: extra cruft after in " "\"defaultSearchBase %s\" line (ignored)\n", - fname, lineno, cargv[1] )); + fname, lineno, cargv[1] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "extra cruft after in \"defaultSearchBase %s\", " @@ -357,10 +467,10 @@ read_config( const char *fname ) if ( bi != NULL || be != NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: defaultSearchBase line must appear " "prior to any backend or database definitions\n", - fname, lineno )); + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "defaultSearchBaase line must appear prior to " @@ -373,10 +483,10 @@ read_config( const char *fname ) if ( default_search_nbase.bv_len ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, "%s: line %d: " + LDAP_LOG( CONFIG, INFO, "%s: line %d: " "default search base \"%s\" already defined " "(discarding old)\n", fname, lineno, - default_search_base.bv_val )); + default_search_base.bv_val ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "default search base \"%s\" already defined " @@ -398,13 +508,13 @@ read_config( const char *fname ) rc = dnPrettyNormal( NULL, &dn, &default_search_base, - &default_search_nbase ); + &default_search_nbase, NULL ); if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: defaultSearchBase DN is invalid.\n", - fname, lineno )); + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: defaultSearchBase DN is invalid\n", @@ -419,9 +529,9 @@ read_config( const char *fname ) 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", @@ -435,9 +545,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", @@ -456,9 +566,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", @@ -474,10 +584,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", @@ -489,14 +599,20 @@ read_config( const char *fname ) slapd_args_file = ch_strdup( cargv[1] ); + } else if ( strcasecmp( cargv[0], "replica-pidfile" ) == 0 ) { + /* ignore */ ; + + } else if ( strcasecmp( cargv[0], "replica-argsfile" ) == 0 ) { + /* ignore */ ; + /* default password hash */ } 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", @@ -507,9 +623,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", @@ -522,9 +638,9 @@ read_config( const char *fname ) if ( lutil_passwd_scheme( cargv[1] ) == 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: password scheme \"%s\" not available\n", - fname, lineno, cargv[1] )); + fname, lineno, cargv[1] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: password scheme \"%s\" not available\n", @@ -539,10 +655,10 @@ 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 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", @@ -554,141 +670,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, NULL ); } else { - global_realm = ch_strdup( cargv[1] ); + rc = dnPrettyNormal( NULL, &dn, &global_schemadn, + &global_schemandn, NULL ); } - - } 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 )); -#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 )); + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: schemadn DN is invalid.\n", + fname, lineno , 0 ); #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", @@ -702,11 +731,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", @@ -724,9 +752,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", @@ -745,27 +773,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; } } @@ -776,9 +832,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", @@ -797,27 +853,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; } } @@ -825,9 +909,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", @@ -844,31 +928,49 @@ 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: " + LDAP_LOG( CONFIG, INFO, "%s: line %d: " "subordinate keyword must appear inside a database " - "definition (ignored).\n", fname, lineno )); + "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: subordinate keyword " + "must appear inside a database definition.\n", fname, lineno, 0 ); #endif + return 1; + } else { be->be_flags |= SLAP_BFLAG_GLUE_SUBORDINATE; num_subordinates++; } + /* add an overlay to this backend */ + } else if ( strcasecmp( cargv[0], "overlay" ) == 0 ) { + if ( be == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, "%s: line %d: " + "overlay keyword must appear inside a database " + "definition.\n", fname, lineno, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "%s: line %d: overlay keyword " + "must appear inside a database definition.\n", + fname, lineno, 0 ); +#endif + return 1; + + } else if ( overlay_config( be, cargv[1] )) { + return 1; + } + /* set database suffix */ } else if ( strcasecmp( cargv[0], "suffix" ) == 0 ) { Backend *tmp_be; - struct berval dn; - struct berval *pdn = NULL; - struct berval *ndn = NULL; + struct berval dn, pdn, ndn; if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: missing dn in \"suffix \" line.\n", - fname, lineno )); + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "missing dn in \"suffix \" line\n", @@ -879,9 +981,9 @@ read_config( const char *fname ) } else if ( cargc > 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, + LDAP_LOG( CONFIG, INFO, "%s: line %d: extra cruft after in \"suffix %s\"" - " line (ignored).\n", fname, lineno, cargv[1] )); + " line (ignored).\n", fname, lineno, cargv[1] ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: extra cruft " "after in \"suffix %s\" line (ignored)\n", @@ -891,9 +993,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: suffix line must appear inside a database " - "definition.\n", fname, lineno )); + "definition.\n", fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: suffix line " "must appear inside a database definition\n", @@ -905,13 +1007,13 @@ read_config( const char *fname ) /* "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: \"" - SLAPD_MONITOR_DN "\" is reserved for monitoring slapd\n", - fname, lineno )); + LDAP_LOG( CONFIG, CRIT, "%s: line %d: \"" + "%s\" is reserved for monitoring slapd\n", + fname, lineno, SLAPD_MONITOR_DN ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: \"" - SLAPD_MONITOR_DN "\" is reserved for monitoring slapd\n", - fname, lineno, 0 ); + "%s\" is reserved for monitoring slapd\n", + fname, lineno, SLAPD_MONITOR_DN ); #endif return( 1 ); #endif /* SLAPD_MONITOR_DN */ @@ -921,15 +1023,13 @@ read_config( const char *fname ) dn.bv_val = cargv[1]; dn.bv_len = strlen( cargv[1] ); - pdn = ch_malloc( sizeof( struct berval )); - ndn = ch_malloc( sizeof( struct berval )); - rc = dnPrettyNormal( NULL, &dn, pdn, ndn ); + rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn, NULL ); if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "%s: line %d: suffix DN is invalid.\n", - fname, lineno )); + fname, lineno, 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: suffix DN is invalid\n", @@ -938,41 +1038,41 @@ read_config( const char *fname ) return( 1 ); } - tmp_be = select_backend( ndn, 0, 0 ); + tmp_be = select_backend( &ndn, 0, 0 ); if ( tmp_be == be ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, + LDAP_LOG( CONFIG, INFO, "%s: line %d: suffix already served by this backend " - "(ignored)\n", fname, lineno )); + "(ignored)\n", fname, lineno, 0 ); #else 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 ); + free( pdn.bv_val ); + free( ndn.bv_val ); } else if ( tmp_be != NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, + 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 )); + tmp_be->be_suffix[0].bv_val ); #else 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 ); + fname, lineno, tmp_be->be_suffix[0].bv_val ); #endif - ber_bvfree( pdn ); - ber_bvfree( ndn ); + free( pdn.bv_val ); + free( ndn.bv_val ); return( 1 ); - } else if( pdn->bv_len == 0 && default_search_nbase.bv_len ) { + } else if( pdn.bv_len == 0 && default_search_nbase.bv_len ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, + 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 )); + fname, lineno, default_search_base.bv_val ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "suffix DN empty and default " @@ -981,156 +1081,17 @@ read_config( const char *fname ) #endif } - 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 )); -#else - Debug( LDAP_DEBUG_ANY, - "%s: line %d: missing alias and 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: 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 ); -#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 ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%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 ); - } - - 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\"\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\"\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)); - - 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\"\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\"\n", - fname, lineno, tmp_be->be_suffix[0]->bv_val ); -#endif - ber_bvfree( palias ); - ber_bvfree( paliased ); - return -1; - } - - ber_bvecadd( &be->be_suffixAlias, palias ); - ber_bvecadd( &be->be_suffixAlias, paliased ); + 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", @@ -1141,25 +1102,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 { @@ -1171,9 +1134,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", @@ -1182,16 +1145,18 @@ 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; @@ -1203,13 +1168,13 @@ read_config( const char *fname ) rc = dnPrettyNormal( NULL, &dn, &be->be_rootdn, - &be->be_rootndn ); + &be->be_rootndn, NULL ); 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", @@ -1223,29 +1188,48 @@ read_config( const char *fname ) } 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 ); } @@ -1254,9 +1238,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", @@ -1288,9 +1272,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", @@ -1301,9 +1285,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", @@ -1325,16 +1309,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 ); @@ -1351,9 +1337,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", @@ -1364,9 +1350,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", @@ -1396,10 +1382,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", @@ -1420,9 +1406,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", @@ -1452,10 +1438,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", @@ -1478,9 +1464,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", @@ -1545,12 +1531,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", @@ -1564,9 +1556,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", @@ -1578,9 +1570,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", @@ -1591,16 +1583,17 @@ read_config( const char *fname ) vals[0].bv_val = cargv[1]; vals[0].bv_len = strlen( vals[0].bv_val ); - value_add( &default_referral, vals ); + 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", @@ -1610,7 +1603,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 */ @@ -1618,9 +1611,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", @@ -1639,40 +1632,69 @@ 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 - } + } else if ( strcasecmp( cargv[0], "ditcontentrule" ) == 0 ) { + char * p; + p = strchr(saveline,'(' /*')'*/); + rc = parse_cr( fname, lineno, p, cargv ); + if( rc ) return rc; + /* 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", @@ -1681,14 +1703,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", @@ -1699,9 +1727,9 @@ read_config( const char *fname ) } 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 )); + 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", @@ -1720,9 +1748,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", @@ -1738,16 +1766,36 @@ read_config( const char *fname ) ldap_syslog += atoi( cargv[1] ); } + /* list of sync replication information in this backend (slave only) */ + } else if ( strcasecmp( cargv[0], "syncrepl" ) == 0 ) { + + if ( be == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, + "%s: line %d: syncrepl line must appear inside " + "a database definition.\n", fname, lineno, 0); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: syncrepl line must appear inside " + "a database definition.\n", fname, lineno, 0); +#endif + return 1; + } else { + if ( add_syncrepl( be, cargv, cargc )) { + return 1; + } + } + /* list of replicas of the data in this backend (master only) */ } 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", + "%s: line %d: missing host or uri in \"replica \" line\n", fname, lineno, 0 ); #endif @@ -1755,14 +1803,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; @@ -1773,32 +1822,79 @@ read_config( const char *fname ) nr = add_replica_info( be, cargv[i] + 5 ); break; + } else if (strncasecmp( cargv[i], "uri=", 4 ) + == 0 ) { + if ( ldap_url_parse( cargv[ i ] + 4, &ludp ) + != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, + "%s: line %d: replica line contains invalid " + "uri definition.\n", fname, lineno, 0); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: replica line contains invalid " + "uri definition.\n", fname, lineno, 0); +#endif + return 1; + } + if (ludp->lud_host == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, INFO, + "%s: line %d: replica line contains invalid " + "uri definition - missing hostname.\n", + fname, lineno, 0); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: replica line contains invalid " + "uri definition - missing hostname.\n", fname, lineno, 0); +#endif + return 1; + } + replicahost = ch_malloc( strlen( cargv[ i ] ) ); + if ( replicahost == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, ERR, + "out of memory in read_config\n", 0, 0,0 ); +#else + Debug( LDAP_DEBUG_ANY, + "out of memory in read_config\n", 0, 0, 0 ); +#endif + ldap_free_urldesc( ludp ); + exit( EXIT_FAILURE ); + } + sprintf(replicahost, "%s:%d", + ludp->lud_host, ludp->lud_port); + nr = add_replica_info( be, replicahost ); + ldap_free_urldesc( ludp ); + ch_free(replicahost); + break; } } 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 or uri 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 or uri 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 ) { @@ -1806,9 +1902,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", @@ -1818,9 +1915,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", @@ -1844,9 +1942,10 @@ read_config( const char *fname ) if ( add_replica_attrs( be, nr, arg + 1, exclude ) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: attribute \"%s\" in \"replica\" line is unknown\n", - fname, lineno, arg + 1 )); + 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", @@ -1859,13 +1958,13 @@ read_config( const char *fname ) } } - /* dn of master entity allowed to write to replica */ + /* dn of slave entity allowed to write to replica */ } 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", @@ -1876,15 +1975,16 @@ 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; @@ -1894,12 +1994,12 @@ read_config( const char *fname ) dn.bv_val = cargv[1]; dn.bv_len = strlen( cargv[1] ); - rc = dnNormalize2( NULL, &dn, &be->be_update_ndn ); + rc = dnNormalize( 0, NULL, NULL, &dn, &be->be_update_ndn, NULL ); 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", @@ -1912,9 +2012,9 @@ read_config( const char *fname ) } 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", @@ -1925,9 +2025,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", @@ -1937,9 +2037,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", @@ -1950,9 +2050,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", @@ -1963,15 +2063,16 @@ read_config( const char *fname ) vals[0].bv_val = cargv[1]; vals[0].bv_len = strlen( vals[0].bv_val ); - value_add( &be->be_update_refs, vals ); + 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", @@ -1990,9 +2091,9 @@ read_config( const char *fname ) } else if ( strcasecmp( cargv[0], "rootDSE" ) == 0) { if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, "%s: line %d: " + LDAP_LOG( CONFIG, CRIT, "%s: line %d: " "missing filename in \"rootDSE \" line.\n", - fname, lineno )); + fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "missing filename in \"rootDSE \" line.\n", @@ -2003,9 +2104,9 @@ read_config( const char *fname ) if( read_root_dse_file( cargv[1] ) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, "%s: line %d: " + LDAP_LOG( CONFIG, CRIT, "%s: line %d: " "could not read \"rootDSE \" line.\n", - fname, lineno )); + fname, lineno , 0 ); #else Debug( LDAP_DEBUG_ANY, "%s: line %d: " "could not read \"rootDSE \" line\n", @@ -2018,9 +2119,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", @@ -2043,14 +2144,30 @@ read_config( const char *fname ) } } +#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", @@ -2064,10 +2181,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", @@ -2083,9 +2199,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", @@ -2097,7 +2213,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 ); } @@ -2108,9 +2224,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", @@ -2125,9 +2241,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", @@ -2138,9 +2254,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", @@ -2152,9 +2268,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", @@ -2165,9 +2281,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", @@ -2242,10 +2358,9 @@ read_config( const char *fname ) #ifdef SLAPD_RLOOKUPS if ( cargc < 2 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: reverse-lookup: " - "missing \"on\" or \"off\"\n", - fname, lineno )); + 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", @@ -2260,11 +2375,9 @@ read_config( const char *fname ) use_reverse_lookup = 0; } else { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: reverse-lookup: " - "must be \"on\" (default) " - "or \"off\"\n", - fname, lineno )); + 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", @@ -2275,10 +2388,9 @@ read_config( const char *fname ) #else /* !SLAPD_RLOOKUPS */ #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_INFO, - "%s: line %d: reverse lookups " - "are not configured (ignored).\n", - fname, lineno )); + 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", @@ -2286,15 +2398,84 @@ read_config( const char *fname ) #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 " + "insid 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 ); + } + slapi_plugins_used++; + +#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", @@ -2311,10 +2492,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", @@ -2330,10 +2511,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", @@ -2346,6 +2527,14 @@ read_config( const char *fname ) } fclose( fp ); + if ( depth == 0 ) ch_free( cargv ); + + if ( !global_schemadn.bv_val ) { + ber_str2bv( SLAPD_SCHEMA_DN, sizeof(SLAPD_SCHEMA_DN)-1, 1, + &global_schemadn ); + dnNormalize( 0, NULL, NULL, &global_schemadn, &global_schemandn, NULL ); + } + if ( load_ucdata( NULL ) < 0 ) return 1; return( 0 ); } @@ -2353,41 +2542,62 @@ read_config( const char *fname ) static int fp_parse_line( int lineno, - char *line, - int *argcp, - char **argv + char *line ) { char * token; char * logline; + char logbuf[sizeof("pseudorootpw ***")]; - *argcp = 0; + cargc = 0; token = strtok_quote( line, " \t" ); - logline = (!token || strcasecmp(token, "rootpw") ? line : "rootpw *"); + 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 = ' '; + } + #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_DETAIL1, - "line %d (%s)\n", lineno, logline )); + LDAP_LOG( CONFIG, DETAIL1, "line %d (%s)\n", lineno, logline , 0 ); #else Debug( LDAP_DEBUG_CONFIG, "line %d (%s)\n", lineno, logline, 0 ); #endif + if ( strtok_quote_ptr ) { + *strtok_quote_ptr = '\0'; + } + for ( ; token != NULL; token = strtok_quote( NULL, " \t" ) ) { - if ( *argcp == MAXARGS ) { + 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", LDAP_LEVEL_CRIT, - "fp_parse_line: too many tokens (%d max).\n", - MAXARGS )); + LDAP_LOG( CONFIG, ERR, "line %d: out of memory\n", lineno, 0,0 ); #else - Debug( LDAP_DEBUG_ANY, "Too many tokens (max %d)\n", - MAXARGS, 0, 0 ); + Debug( LDAP_DEBUG_ANY, + "line %d: out of memory\n", + lineno, 0, 0 ); #endif - - return( 1 ); + return -1; + } + cargv = tmp; + cargv_size += ARGS_STEP; } - argv[(*argcp)++] = token; + cargv[cargc++] = token; } - argv[*argcp] = NULL; + cargv[cargc] = NULL; return 0; } @@ -2398,6 +2608,7 @@ strtok_quote( char *line, char *sep ) char *tmp; static char *next; + strtok_quote_ptr = NULL; if ( line != NULL ) { next = line; } @@ -2432,6 +2643,7 @@ strtok_quote( char *line, char *sep ) default: if ( ! inquote ) { if ( strchr( sep, *next ) != NULL ) { + strtok_quote_ptr = next; *next++ = '\0'; return( tmp ); } @@ -2446,18 +2658,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 ) @@ -2525,8 +2737,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 ); @@ -2542,10 +2754,475 @@ 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 ); } + +static int +add_syncrepl( + Backend *be, + char **cargv, + int cargc +) +{ + syncinfo_t *si; + syncinfo_t *si_entry; + int rc = 0; + int duplicated_replica_id = 0; + + si = (syncinfo_t *) ch_calloc( 1, sizeof( syncinfo_t ) ); + + if ( si == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, ERR, "out of memory in add_syncrepl\n", 0, 0,0 ); +#else + Debug( LDAP_DEBUG_ANY, "out of memory in add_syncrepl\n", 0, 0, 0 ); +#endif + return 1; + } + + si->si_tls = SYNCINFO_TLS_OFF; + if ( be->be_rootndn.bv_val ) { + ber_dupbv( &si->si_updatedn, &be->be_rootndn ); + } + si->si_bindmethod = LDAP_AUTH_SIMPLE; + si->si_schemachecking = 0; + ber_str2bv( "(objectclass=*)", sizeof("(objectclass=*)")-1, 0, + &si->si_filterstr ); + si->si_base.bv_val = NULL; + si->si_scope = LDAP_SCOPE_SUBTREE; + si->si_attrsonly = 0; + si->si_attrs = (char **) ch_calloc( 1, sizeof( char * )); + si->si_attrs[0] = NULL; + si->si_type = LDAP_SYNC_REFRESH_ONLY; + si->si_interval = 86400; + si->si_syncCookie.ctxcsn = NULL; + si->si_syncCookie.octet_str = NULL; + si->si_syncCookie.sid = -1; + si->si_manageDSAit = 0; + si->si_tlimit = -1; + si->si_slimit = -1; + si->si_syncUUID_ndn.bv_val = NULL; + si->si_syncUUID_ndn.bv_len = 0; + + si->si_presentlist = NULL; + LDAP_LIST_INIT( &si->si_nonpresentlist ); + + rc = parse_syncrepl_line( cargv, cargc, si ); + + LDAP_STAILQ_FOREACH( si_entry, &be->be_syncinfo, si_next ) { + if ( si->si_rid == si_entry->si_rid ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, ERR, + "add_syncrepl: duplicaetd replica id\n", 0, 0,0 ); +#else + Debug( LDAP_DEBUG_ANY, + "add_syncrepl: duplicated replica id\n",0, 0, 0 ); +#endif + duplicated_replica_id = 1; + break; + } + } + + if ( rc < 0 || duplicated_replica_id ) { + syncinfo_t *si_entry; + /* Something bad happened - back out */ +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, ERR, "failed to add syncinfo\n", 0, 0,0 ); +#else + Debug( LDAP_DEBUG_ANY, "failed to add syncinfo\n", 0, 0, 0 ); +#endif + + /* If error, remove all syncinfo */ + LDAP_STAILQ_FOREACH( si_entry, &be->be_syncinfo, si_next ) { + if ( si_entry->si_updatedn.bv_val ) { + ch_free( si->si_updatedn.bv_val ); + } + if ( si_entry->si_filterstr.bv_val ) { + ch_free( si->si_filterstr.bv_val ); + } + if ( si_entry->si_attrs ) { + int i = 0; + while ( si_entry->si_attrs[i] != NULL ) { + ch_free( si_entry->si_attrs[i] ); + i++; + } + ch_free( si_entry->si_attrs ); + } + } + + while ( !LDAP_STAILQ_EMPTY( &be->be_syncinfo )) { + si_entry = LDAP_STAILQ_FIRST( &be->be_syncinfo ); + LDAP_STAILQ_REMOVE_HEAD( &be->be_syncinfo, si_next ); + ch_free( si_entry ); + } + LDAP_STAILQ_INIT( &be->be_syncinfo ); + return 1; + } else { +#ifdef NEW_LOGGING + LDAP_LOG ( CONFIG, RESULTS, + "add_syncrepl: Config: ** successfully added syncrepl \"%s\"\n", + si->si_provideruri == NULL ? "(null)" : si->si_provideruri, 0, 0 ); +#else + Debug( LDAP_DEBUG_CONFIG, + "Config: ** successfully added syncrepl \"%s\"\n", + si->si_provideruri == NULL ? "(null)" : si->si_provideruri, 0, 0 ); +#endif + if ( !si->si_schemachecking ) { + be->be_flags |= SLAP_BFLAG_NO_SCHEMA_CHECK; + } + si->si_be = be; + LDAP_STAILQ_INSERT_TAIL( &be->be_syncinfo, si, si_next ); + return 0; + } +} + +#define IDSTR "rid" +#define PROVIDERSTR "provider" +#define SUFFIXSTR "suffix" +#define UPDATEDNSTR "updatedn" +#define BINDMETHSTR "bindmethod" +#define SIMPLESTR "simple" +#define SASLSTR "sasl" +#define BINDDNSTR "binddn" +#define CREDSTR "credentials" +#define OLDAUTHCSTR "bindprincipal" +#define AUTHCSTR "authcID" +#define AUTHZSTR "authzID" +#define SRVTABSTR "srvtab" +#define SASLMECHSTR "saslmech" +#define REALMSTR "realm" +#define SECPROPSSTR "secprops" +#define STARTTLSSTR "starttls" +#define CRITICALSTR "critical" + +#define SCHEMASTR "schemachecking" +#define FILTERSTR "filter" +#define SEARCHBASESTR "searchbase" +#define SCOPESTR "scope" +#define ATTRSSTR "attrs" +#define ATTRSONLYSTR "attrsonly" +#define TYPESTR "type" +#define INTERVALSTR "interval" +#define LASTMODSTR "lastmod" +#define LMREQSTR "req" +#define LMGENSTR "gen" +#define LMNOSTR "no" +#define MANAGEDSAITSTR "manageDSAit" +#define SLIMITSTR "sizelimit" +#define TLIMITSTR "timelimit" + +#define GOT_ID 0x0001 +#define GOT_PROVIDER 0x0002 +#define GOT_METHOD 0x0004 +#define GOT_ALL 0x0007 + +static int +parse_syncrepl_line( + char **cargv, + int cargc, + syncinfo_t *si +) +{ + int gots = 0; + int i, j; + char *hp, *val; + int nr_attr = 0; + + for ( i = 1; i < cargc; i++ ) { + if ( !strncasecmp( cargv[ i ], IDSTR, sizeof( IDSTR ) - 1 )) { + int tmp; + /* '\0' string terminator accounts for '=' */ + val = cargv[ i ] + sizeof( IDSTR ); + tmp= atoi( val ); + if ( tmp >= 1000 || tmp < 0 ) { + fprintf( stderr, "Error: parse_syncrepl_line: " + "syncrepl id %d is out of range [0..999]\n", tmp ); + return -1; + } + si->si_rid = tmp; + gots |= GOT_ID; + } else if ( !strncasecmp( cargv[ i ], PROVIDERSTR, + sizeof( PROVIDERSTR ) - 1 )) { + val = cargv[ i ] + sizeof( PROVIDERSTR ); + si->si_provideruri = ch_strdup( val ); + si->si_provideruri_bv = (BerVarray) + ch_calloc( 2, sizeof( struct berval )); + ber_str2bv( si->si_provideruri, strlen( si->si_provideruri ), + 0, &si->si_provideruri_bv[0] ); + si->si_provideruri_bv[1].bv_len = 0; + si->si_provideruri_bv[1].bv_val = NULL; + gots |= GOT_PROVIDER; + } else if ( !strncasecmp( cargv[ i ], STARTTLSSTR, + sizeof(STARTTLSSTR) - 1 ) ) + { + val = cargv[ i ] + sizeof( STARTTLSSTR ); + if( !strcasecmp( val, CRITICALSTR ) ) { + si->si_tls = SYNCINFO_TLS_CRITICAL; + } else { + si->si_tls = SYNCINFO_TLS_ON; + } + } else if ( !strncasecmp( cargv[ i ], + UPDATEDNSTR, sizeof( UPDATEDNSTR ) - 1 ) ) + { + struct berval updatedn = {0, NULL}; + val = cargv[ i ] + sizeof( UPDATEDNSTR ); + ber_str2bv( val, 0, 0, &updatedn ); + ch_free( si->si_updatedn.bv_val ); + dnNormalize( 0, NULL, NULL, &updatedn, &si->si_updatedn, NULL ); + } else if ( !strncasecmp( cargv[ i ], BINDMETHSTR, + sizeof( BINDMETHSTR ) - 1 ) ) + { + val = cargv[ i ] + sizeof( BINDMETHSTR ); + if ( !strcasecmp( val, SIMPLESTR )) { + si->si_bindmethod = LDAP_AUTH_SIMPLE; + gots |= GOT_METHOD; + } else if ( !strcasecmp( val, SASLSTR )) { +#ifdef HAVE_CYRUS_SASL + si->si_bindmethod = LDAP_AUTH_SASL; + gots |= GOT_METHOD; +#else /* HAVE_CYRUS_SASL */ + fprintf( stderr, "Error: parse_syncrepl_line: " + "not compiled with SASL support\n" ); + return 1; +#endif /* HAVE_CYRUS_SASL */ + } else { + si->si_bindmethod = -1; + } + } else if ( !strncasecmp( cargv[ i ], + BINDDNSTR, sizeof( BINDDNSTR ) - 1 ) ) { + val = cargv[ i ] + sizeof( BINDDNSTR ); + si->si_binddn = ch_strdup( val ); + } else if ( !strncasecmp( cargv[ i ], + CREDSTR, sizeof( CREDSTR ) - 1 ) ) { + val = cargv[ i ] + sizeof( CREDSTR ); + si->si_passwd = ch_strdup( val ); + } else if ( !strncasecmp( cargv[ i ], + SASLMECHSTR, sizeof( SASLMECHSTR ) - 1 ) ) { + val = cargv[ i ] + sizeof( SASLMECHSTR ); + si->si_saslmech = ch_strdup( val ); + } else if ( !strncasecmp( cargv[ i ], + SECPROPSSTR, sizeof( SECPROPSSTR ) - 1 ) ) { + val = cargv[ i ] + sizeof( SECPROPSSTR ); + si->si_secprops = ch_strdup( val ); + } else if ( !strncasecmp( cargv[ i ], + REALMSTR, sizeof( REALMSTR ) - 1 ) ) { + val = cargv[ i ] + sizeof( REALMSTR ); + si->si_realm = ch_strdup( val ); + } else if ( !strncasecmp( cargv[ i ], + AUTHCSTR, sizeof( AUTHCSTR ) - 1 ) ) { + val = cargv[ i ] + sizeof( AUTHCSTR ); + si->si_authcId = ch_strdup( val ); + } else if ( !strncasecmp( cargv[ i ], + OLDAUTHCSTR, sizeof( OLDAUTHCSTR ) - 1 ) ) { + /* Old authcID is provided for some backwards compatibility */ + val = cargv[ i ] + sizeof( OLDAUTHCSTR ); + si->si_authcId = ch_strdup( val ); + } else if ( !strncasecmp( cargv[ i ], + AUTHZSTR, sizeof( AUTHZSTR ) - 1 ) ) { + val = cargv[ i ] + sizeof( AUTHZSTR ); + si->si_authzId = ch_strdup( val ); + } else if ( !strncasecmp( cargv[ i ], + SCHEMASTR, sizeof( SCHEMASTR ) - 1 ) ) + { + val = cargv[ i ] + sizeof( SCHEMASTR ); + if ( !strncasecmp( val, "on", sizeof( "on" ) - 1 )) { + si->si_schemachecking = 1; + } else if ( !strncasecmp( val, "off", sizeof( "off" ) - 1 ) ) { + si->si_schemachecking = 0; + } else { + si->si_schemachecking = 1; + } + } else if ( !strncasecmp( cargv[ i ], + FILTERSTR, sizeof( FILTERSTR ) - 1 ) ) + { + val = cargv[ i ] + sizeof( FILTERSTR ); + ber_str2bv( val, 0, 1, &si->si_filterstr ); + } else if ( !strncasecmp( cargv[ i ], + SEARCHBASESTR, sizeof( SEARCHBASESTR ) - 1 ) ) + { + struct berval bv; + val = cargv[ i ] + sizeof( SEARCHBASESTR ); + if ( si->si_base.bv_val ) { + ch_free( si->si_base.bv_val ); + } + ber_str2bv( val, 0, 0, &bv ); + if ( dnNormalize( 0, NULL, NULL, &bv, &si->si_base, NULL )) { + fprintf( stderr, "Invalid base DN \"%s\"\n", val ); + return 1; + } + } else if ( !strncasecmp( cargv[ i ], + SCOPESTR, sizeof( SCOPESTR ) - 1 ) ) + { + val = cargv[ i ] + sizeof( SCOPESTR ); + if ( !strncasecmp( val, "base", sizeof( "base" ) - 1 )) { + si->si_scope = LDAP_SCOPE_BASE; + } else if ( !strncasecmp( val, "one", sizeof( "one" ) - 1 )) { + si->si_scope = LDAP_SCOPE_ONELEVEL; + } else if ( !strncasecmp( val, "sub", sizeof( "sub" ) - 1 )) { + si->si_scope = LDAP_SCOPE_SUBTREE; + } else { + fprintf( stderr, "Error: parse_syncrepl_line: " + "unknown scope \"%s\"\n", val); + return 1; + } + } else if ( !strncasecmp( cargv[ i ], + ATTRSONLYSTR, sizeof( ATTRSONLYSTR ) - 1 ) ) + { + si->si_attrsonly = 1; + } else if ( !strncasecmp( cargv[ i ], + ATTRSSTR, sizeof( ATTRSSTR ) - 1 ) ) + { + val = cargv[ i ] + sizeof( ATTRSSTR ); + str2clist( &si->si_attrs, val, "," ); + } else if ( !strncasecmp( cargv[ i ], + TYPESTR, sizeof( TYPESTR ) - 1 ) ) + { + val = cargv[ i ] + sizeof( TYPESTR ); + if ( !strncasecmp( val, "refreshOnly", sizeof("refreshOnly")-1 )) { + si->si_type = LDAP_SYNC_REFRESH_ONLY; + } else if ( !strncasecmp( val, "refreshAndPersist", + sizeof("refreshAndPersist")-1 )) + { + si->si_type = LDAP_SYNC_REFRESH_AND_PERSIST; + si->si_interval = 60; + } else { + fprintf( stderr, "Error: parse_syncrepl_line: " + "unknown sync type \"%s\"\n", val); + return 1; + } + } else if ( !strncasecmp( cargv[ i ], + INTERVALSTR, sizeof( INTERVALSTR ) - 1 ) ) + { + val = cargv[ i ] + sizeof( INTERVALSTR ); + if ( si->si_type == LDAP_SYNC_REFRESH_AND_PERSIST ) { + si->si_interval = 0; + } else { + char *hstr; + char *mstr; + char *dstr; + char *sstr; + int dd, hh, mm, ss; + dstr = val; + hstr = strchr( dstr, ':' ); + if ( hstr == NULL ) { + fprintf( stderr, "Error: parse_syncrepl_line: " + "invalid interval \"%s\"\n", val ); + return 1; + } + *hstr++ = '\0'; + mstr = strchr( hstr, ':' ); + if ( mstr == NULL ) { + fprintf( stderr, "Error: parse_syncrepl_line: " + "invalid interval \"%s\"\n", val ); + return 1; + } + *mstr++ = '\0'; + sstr = strchr( mstr, ':' ); + if ( sstr == NULL ) { + fprintf( stderr, "Error: parse_syncrepl_line: " + "invalid interval \"%s\"\n", val ); + return 1; + } + *sstr++ = '\0'; + + dd = atoi( dstr ); + hh = atoi( hstr ); + mm = atoi( mstr ); + ss = atoi( sstr ); + if (( hh > 24 ) || ( hh < 0 ) || + ( mm > 60 ) || ( mm < 0 ) || + ( ss > 60 ) || ( ss < 0 ) || ( dd < 0 )) { + fprintf( stderr, "Error: parse_syncrepl_line: " + "invalid interval \"%s\"\n", val ); + return 1; + } + si->si_interval = (( dd * 24 + hh ) * 60 + mm ) * 60 + ss; + } + if ( si->si_interval < 0 ) { + fprintf( stderr, "Error: parse_syncrepl_line: " + "invalid interval \"%ld\"\n", + (long) si->si_interval); + return 1; + } + } else if ( !strncasecmp( cargv[ i ], + MANAGEDSAITSTR, sizeof( MANAGEDSAITSTR ) - 1 ) ) + { + val = cargv[ i ] + sizeof( MANAGEDSAITSTR ); + si->si_manageDSAit = atoi( val ); + } else if ( !strncasecmp( cargv[ i ], + SLIMITSTR, sizeof( SLIMITSTR ) - 1 ) ) + { + val = cargv[ i ] + sizeof( SLIMITSTR ); + si->si_slimit = atoi( val ); + } else if ( !strncasecmp( cargv[ i ], + TLIMITSTR, sizeof( TLIMITSTR ) - 1 ) ) + { + val = cargv[ i ] + sizeof( TLIMITSTR ); + si->si_tlimit = atoi( val ); + } else { + fprintf( stderr, "Error: parse_syncrepl_line: " + "unknown keyword \"%s\"\n", cargv[ i ] ); + } + } + + if ( gots != GOT_ALL ) { + fprintf( stderr, + "Error: Malformed \"syncrepl\" line in slapd config file" ); + return -1; + } + + return 0; +} + +char ** +str2clist( char ***out, char *in, const char *brkstr ) +{ + char *str; + char *s; + char *lasts; + int i, j; + const char *text; + char **new; + + /* find last element in list */ + for (i = 0; *out && *out[i]; i++); + + /* protect the input string from strtok */ + str = ch_strdup( in ); + + if ( *str == '\0' ) { + free( str ); + return( *out ); + } + + /* Count words in string */ + j=1; + for ( s = str; *s; s++ ) { + if ( strchr( brkstr, *s ) != NULL ) { + j++; + } + } + + *out = ch_realloc( *out, ( i + j + 1 ) * sizeof( char * ) ); + new = *out + i; + for ( s = ldap_pvt_strtok( str, brkstr, &lasts ); + s != NULL; + s = ldap_pvt_strtok( NULL, brkstr, &lasts ) ) + { + *new = ch_strdup( s ); + new++; + } + + *new = NULL; + free( str ); + return( *out ); +}