#include <ac/string.h>
#include <ac/ctype.h>
+#include <ac/signal.h>
#include <ac/socket.h>
#include <ac/errno.h>
#include "ldap_pvt.h"
#include "slap.h"
-#define MAXARGS 500
+#define ARGS_STEP 512
/*
* defaults for various global variables
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_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;
char *slapd_pid_file = NULL;
char *slapd_args_file = NULL;
+char *strtok_quote_ptr;
+
int nSaslRegexp = 0;
SaslRegexp_t *SaslRegexp = NULL;
-int sasl_external_x509dn_convert;
+
+#ifdef SLAPD_RLOOKUPS
+int use_reverse_lookup = 1;
+#else /* !SLAPD_RLOOKUPS */
+int use_reverse_lookup = 0;
+#endif /* !SLAPD_RLOOKUPS */
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);
{
FILE *fp;
char *line, *savefname, *saveline;
- int cargc, savelineno;
- char *cargv[MAXARGS+1];
+ int savelineno;
int lineno, i;
int rc;
struct berval vals[2];
+ static int lastmod = 1;
static BackendInfo *bi = NULL;
static BackendDB *be = NULL;
vals[1].bv_val = NULL;
+ 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
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 );
}
LDAP_LOG(( "config", LDAP_LEVEL_INFO, "%s: line %d: "
"default search base \"%s\" already defined "
"(discarding old)\n", fname, lineno,
- default_search_base->bv_val ));
+ default_search_base.bv_val ));
#else
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"default search base \"%s\" already defined "
return 1;
- } else {
- default_passwd_hash = ch_strdup( cargv[1] );
}
+ if ( lutil_passwd_scheme( cargv[1] ) == 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "config", LDAP_LEVEL_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 ) {
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;
fname, lineno, 0 );
#endif
} else {
- be->be_glueflags |= SLAP_GLUE_SUBORDINATE;
+ be->be_flags |= SLAP_BFLAG_GLUE_SUBORDINATE;
num_subordinates++;
}
/* set database suffix */
} else if ( strcasecmp( cargv[0], "suffix" ) == 0 ) {
Backend *tmp_be;
- struct berval dn;
- struct berval *pdn = NULL;
- struct berval *ndn = NULL;
+ struct berval dn, pdn, ndn;
if ( cargc < 2 ) {
#ifdef NEW_LOGGING
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 );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
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,
"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,
"%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,
"%s: line %d: suffix DN empty and default search "
#endif
}
- ber_bvecadd( &be->be_suffix, pdn );
- ber_bvecadd( &be->be_nsuffix, ndn );
+ ber_bvarray_add( &be->be_suffix, &pdn );
+ ber_bvarray_add( &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;
+ struct berval alias, palias, nalias;
+ struct berval aliased, paliased, naliased;
if ( cargc < 2 ) {
#ifdef NEW_LOGGING
alias.bv_val = cargv[1];
alias.bv_len = strlen( cargv[1] );
- palias = ch_malloc(sizeof(struct berval));
- rc = dnPrettyNormal( NULL, &alias, palias, &nalias );
+ rc = dnPrettyNormal( NULL, &alias, &palias, &nalias );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
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 ));
+ 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 );
+ fname, lineno, tmp_be->be_suffix[0].bv_val );
#endif
- ber_bvfree( palias );
+ free( palias.bv_val );
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 );
+ 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, 0 );
#endif
- ber_bvfree( palias );
+ free( palias.bv_val );
return( 1 );
}
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 ));
+ 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 );
+ fname, lineno, tmp_be->be_suffix[0].bv_val );
#endif
- ber_bvfree( palias );
- ber_bvfree( paliased );
+ free( palias.bv_val );
+ free( paliased.bv_val );
return -1;
}
- ber_bvecadd( &be->be_suffixAlias, palias );
- ber_bvecadd( &be->be_suffixAlias, paliased );
+ ber_bvarray_add( &be->be_suffixAlias, &palias );
+ ber_bvarray_add( &be->be_suffixAlias, &paliased );
/* set max deref depth */
} else if ( strcasecmp( cargv[0], "maxDerefDepth" ) == 0 ) {
"%s: line %d: old objectclass format not supported.\n",
fname, lineno, 0 );
#endif
-
}
/* specify an attribute type */
return( 1 );
}
if ( strcasecmp( cargv[1], "off" ) == 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
+ "%s: line %d: schema checking disabled! your mileage may vary!\n",
+ fname, lineno ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "%s: line %d: schema checking disabled! your mileage may vary!\n",
+ fname, lineno, 0 );
+#endif
global_schemacheck = 0;
} else {
global_schemacheck = 1;
#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", LDAP_LEVEL_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 );
+ }
}
}
}
}
/* 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: "
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_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 <on|off>\" line\n",
+ fname, lineno, 0 );
+ return( 1 );
+ }
+ if ( strcasecmp( cargv[1], "off" ) == 0 ) {
+ global_gentlehup = 0;
} else {
- if ( be )
- be->be_lastmod = OFF;
- else
- global_lastmod = OFF;
+ global_gentlehup = 1;
}
+#endif
/* set idle timeout value */
} else if ( strcasecmp( cargv[0], "idletimeout" ) == 0 ) {
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"<
+ "%s: line %d: failed to load or initialize module %s\n",
fname, lineno, cargv[1] ));
#else
Debug( LDAP_DEBUG_ANY,
}
if (module_path( cargv[1] )) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "cofig", LDAP_LEVEL_CRIT,
+ LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
"%s: line %d: failed to set module search path to %s.\n",
fname, lineno, cargv[1] ));
#else
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", LDAP_LEVEL_INFO,
+ "%s: line %d: reverse-lookup: "
+ "missing \"on\" or \"off\"\n",
+ fname, lineno ));
+#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", LDAP_LEVEL_INFO,
+ "%s: line %d: reverse-lookup: "
+ "must be \"on\" (default) "
+ "or \"off\"\n",
+ fname, lineno ));
+#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", LDAP_LEVEL_INFO,
+ "%s: line %d: reverse lookups "
+ "are not configured (ignored).\n",
+ fname, lineno ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+"%s: line %d: reverse lookups are not configured (ignored).\n",
+ fname, lineno, 0 );
+#endif
+#endif /* !SLAPD_RLOOKUPS */
+
/* pass anything else to the current backend info/db config routine */
} else {
if ( bi != NULL ) {
static int
fp_parse_line(
- char *line,
- int *argcp,
- char **argv
+ int lineno,
+ char *line
)
{
char * token;
-
- *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 ));
+ 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 */
+ sprintf( logline = 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 ));
+#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 ( 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_ERR,
+ "line %d: out of memory\n",
+ lineno ));
#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;
}
char *tmp;
static char *next;
+ strtok_quote_ptr = NULL;
if ( line != NULL ) {
next = line;
}
default:
if ( ! inquote ) {
if ( strchr( sep, *next ) != NULL ) {
+ strtok_quote_ptr = next;
*next++ = '\0';
return( tmp );
}
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--;
+
+ } else {
+ if ( ! isspace( (unsigned char) buf[0] ) ) {
+ return( line );
+ }
- /* change leading whitespace to a space */
- buf[0] = ' ';
+ /* change leading whitespace to a space */
+ buf[0] = ' ';
+ }
CATLINE( buf );
(*lineno)++;