X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=649be367e77b29839880bb4c93d0854fae406546;hb=7ce9e7b7c637a69fa1fdd78cfdfbf2581bb8217e;hp=26d20f5ee0260a8ff43bca07aebcb7cfb6326aaf;hpb=757c34ee4bc36b2b3dd808af8cd26b55d7b963a4;p=openldap diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 26d20f5ee0..649be367e7 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2005 The OpenLDAP Foundation. + * Copyright 1998-2006 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -191,33 +191,66 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) { int j; iarg = 0; larg = 0; barg = 0; switch(arg_type & ARGS_NUMERIC) { - case ARG_INT: iarg = strtol(c->argv[1], NULL, 0); break; - case ARG_LONG: larg = strtol(c->argv[1], NULL, 0); break; - case ARG_BER_LEN_T: barg = (ber_len_t)atol(c->argv[1]); break; + case ARG_INT: + if ( lutil_atoix( &iarg, c->argv[1], 0 ) != 0 ) { + snprintf( c->msg, sizeof( c->msg ), + "<%s> unable to parse \"%s\" as int", + c->argv[0], c->argv[1] ); + Debug(LDAP_DEBUG_CONFIG, "%s: %s\n", + c->log, c->msg, 0); + return(ARG_BAD_CONF); + } + break; + case ARG_LONG: + if ( lutil_atolx( &larg, c->argv[1], 0 ) != 0 ) { + snprintf( c->msg, sizeof( c->msg ), + "<%s> unable to parse \"%s\" as long", + c->argv[0], c->argv[1] ); + Debug(LDAP_DEBUG_CONFIG, "%s: %s\n", + c->log, c->msg, 0); + return(ARG_BAD_CONF); + } + break; + case ARG_BER_LEN_T: { + unsigned long l; + if ( lutil_atoulx( &l, c->argv[1], 0 ) != 0 ) { + snprintf( c->msg, sizeof( c->msg ), + "<%s> unable to parse \"%s\" as ber_len_t", + c->argv[0], c->argv[1] ); + Debug(LDAP_DEBUG_CONFIG, "%s: %s\n", + c->log, c->msg, 0); + return(ARG_BAD_CONF); + } + barg = (ber_len_t)l; + } break; case ARG_ON_OFF: - if(c->argc == 1) { + if (c->argc == 1) { iarg = 1; - } else if(!strcasecmp(c->argv[1], "on") || - !strcasecmp(c->argv[1], "true")) { + } else if ( !strcasecmp(c->argv[1], "on") || + !strcasecmp(c->argv[1], "true") || + !strcasecmp(c->argv[1], "yes") ) + { iarg = 1; - } else if(!strcasecmp(c->argv[1], "off") || - !strcasecmp(c->argv[1], "false")) { + } else if ( !strcasecmp(c->argv[1], "off") || + !strcasecmp(c->argv[1], "false") || + !strcasecmp(c->argv[1], "no") ) + { iarg = 0; } else { - snprintf( c->msg, sizeof( c->msg ), "<%s> invalid value, ignored", + snprintf( c->msg, sizeof( c->msg ), "<%s> invalid value", c->argv[0] ); - Debug(LDAP_DEBUG_CONFIG, "%s: %s\n", + Debug(LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 ); - return(0); + return(ARG_BAD_CONF); } break; } j = (arg_type & ARG_NONZERO) ? 1 : 0; if(iarg < j && larg < j && barg < j ) { larg = larg ? larg : (barg ? barg : iarg); - snprintf( c->msg, sizeof( c->msg ), "<%s> invalid value, ignored", + snprintf( c->msg, sizeof( c->msg ), "<%s> invalid value", c->argv[0] ); - Debug(LDAP_DEBUG_CONFIG, "%s: %s\n", + Debug(LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 ); return(ARG_BAD_CONF); } @@ -448,6 +481,7 @@ init_config_attrs(ConfigTable *ct) { freeit = 1; } else { + ldap_attributetype_free( at ); fprintf( stderr, "init_config_attrs: AttributeType \"%s\": %s, %s\n", ct[i].attribute, scherr2str(code), err ); return code; @@ -594,6 +628,7 @@ config_parse_vals(ConfigTable *ct, ConfigArgs *c, int valx) } rc = config_check_vals( ct, c, 1 ); ch_free( c->tline ); + c->tline = NULL; if ( rc ) rc = LDAP_CONSTRAINT_VIOLATION; @@ -758,7 +793,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) } } - } else if ( c->be ) { + } else if ( c->be && c->be != frontendDB ) { rc = SLAP_CONF_UNKNOWN; if ( c->be->be_cf_ocs ) { ct = config_find_keyword( c->be->be_cf_ocs->co_table, c ); @@ -770,20 +805,29 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) rc = (*c->be->be_config)(c->be, c->fname, c->lineno, c->argc, c->argv); } - if ( rc ) { - switch(rc) { - case SLAP_CONF_UNKNOWN: - Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " - "unknown directive <%s> inside backend database " - "definition" SLAPD_CONF_UNKNOWN_IGNORED ".\n", - c->log, *c->argv, 0); + if ( rc == SLAP_CONF_UNKNOWN && SLAP_ISGLOBALOVERLAY( frontendDB ) ) { + /* global overlays may need + * definitions inside other databases... + */ + rc = (*frontendDB->be_config)(frontendDB, c->fname, (int)c->lineno, c->argc, c->argv); + } + + switch ( rc ) { + case 0: + break; + + case SLAP_CONF_UNKNOWN: + Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " + "unknown directive <%s> inside backend database " + "definition" SLAPD_CONF_UNKNOWN_IGNORED ".\n", + c->log, *c->argv, 0); #ifndef SLAPD_CONF_UNKNOWN_BAILOUT - continue; + break; #endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */ - default: - rc = 1; - goto done; - } + + default: + rc = 1; + goto done; } } else if ( frontendDB->be_config ) { @@ -796,8 +840,9 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) SLAPD_CONF_UNKNOWN_IGNORED ".\n", c->log, *c->argv, 0); #ifndef SLAPD_CONF_UNKNOWN_BAILOUT - continue; + break; #endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */ + default: rc = 1; goto done; @@ -844,7 +889,7 @@ verbs_to_mask(int argc, char *argv[], slap_verbmasks *v, slap_mask_t *m) { int i, j; for(i = 1; i < argc; i++) { j = verb_to_mask(argv[i], v); - if(BER_BVISNULL(&v[j].word)) return(1); + if(BER_BVISNULL(&v[j].word)) return i; while (!v[j].mask) j--; *m |= v[j].mask; } @@ -991,15 +1036,8 @@ static slap_verbmasks methkey[] = { { BER_BVNULL, 0 } }; -typedef struct cf_aux_table { - struct berval key; - int off; - char type; - char quote; - slap_verbmasks *aux; -} cf_aux_table; - -static cf_aux_table bindkey[] = { +static slap_cf_aux_table bindkey[] = { + { BER_BVC("uri="), offsetof(slap_bindconf, sb_uri), 'b', 1, NULL }, { BER_BVC("starttls="), offsetof(slap_bindconf, sb_tls), 'd', 0, tlskey }, { BER_BVC("bindmethod="), offsetof(slap_bindconf, sb_method), 'd', 0, methkey }, { BER_BVC("binddn="), offsetof(slap_bindconf, sb_binddn), 'b', 1, NULL }, @@ -1012,31 +1050,36 @@ static cf_aux_table bindkey[] = { { BER_BVNULL, 0, 0, 0, NULL } }; -int bindconf_parse( const char *word, slap_bindconf *bc ) { +int +slap_cf_aux_table_parse( const char *word, void *dst, slap_cf_aux_table *tab0, LDAP_CONST char *tabmsg ) +{ int rc = 0; - cf_aux_table *tab; + slap_cf_aux_table *tab; - for (tab = bindkey; !BER_BVISNULL(&tab->key); tab++) { + for (tab = tab0; !BER_BVISNULL(&tab->key); tab++ ) { if ( !strncasecmp( word, tab->key.bv_val, tab->key.bv_len )) { char **cptr; int *iptr, j; + unsigned *uptr; + long *lptr; + unsigned long *ulptr; struct berval *bptr; const char *val = word + tab->key.bv_len; switch ( tab->type ) { case 's': - cptr = (char **)((char *)bc + tab->off); + cptr = (char **)((char *)dst + tab->off); *cptr = ch_strdup( val ); break; case 'b': - bptr = (struct berval *)((char *)bc + tab->off); + bptr = (struct berval *)((char *)dst + tab->off); ber_str2bv( val, 0, 1, bptr ); break; case 'd': assert( tab->aux != NULL ); - iptr = (int *)((char *)bc + tab->off); + iptr = (int *)((char *)dst + tab->off); rc = 1; for ( j = 0; !BER_BVISNULL( &tab->aux[j].word ); j++ ) { @@ -1046,11 +1089,35 @@ int bindconf_parse( const char *word, slap_bindconf *bc ) { } } break; + + case 'i': + iptr = (int *)((char *)dst + tab->off); + + rc = lutil_atoix( iptr, val, 0 ); + break; + + case 'u': + uptr = (unsigned *)((char *)dst + tab->off); + + rc = lutil_atoux( uptr, val, 0 ); + break; + + case 'I': + lptr = (long *)((char *)dst + tab->off); + + rc = lutil_atolx( lptr, val, 0 ); + break; + + case 'U': + ulptr = (unsigned long *)((char *)dst + tab->off); + + rc = lutil_atoulx( ulptr, val, 0 ); + break; } if ( rc ) { - Debug( LDAP_DEBUG_ANY, "invalid bind config value %s\n", - word, 0, 0 ); + Debug( LDAP_DEBUG_ANY, "invalid %s value %s\n", + tabmsg, word, 0 ); } return rc; @@ -1060,22 +1127,27 @@ int bindconf_parse( const char *word, slap_bindconf *bc ) { return rc; } -int bindconf_unparse( slap_bindconf *bc, struct berval *bv ) { +int +slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0 ) +{ char buf[BUFSIZ], *ptr; - cf_aux_table *tab; + slap_cf_aux_table *tab; struct berval tmp; ptr = buf; - for (tab = bindkey; !BER_BVISNULL(&tab->key); tab++) { + for (tab = tab0; !BER_BVISNULL(&tab->key); tab++ ) { char **cptr; int *iptr, i; + unsigned *uptr; + long *lptr; + unsigned long *ulptr; struct berval *bptr; - cptr = (char **)((char *)bc + tab->off); + cptr = (char **)((char *)src + tab->off); switch ( tab->type ) { case 'b': - bptr = (struct berval *)((char *)bc + tab->off); + bptr = (struct berval *)((char *)src + tab->off); cptr = &bptr->bv_val; case 's': if ( *cptr ) { @@ -1089,7 +1161,7 @@ int bindconf_unparse( slap_bindconf *bc, struct berval *bv ) { case 'd': assert( tab->aux != NULL ); - iptr = (int *)((char *)bc + tab->off); + iptr = (int *)((char *)src + tab->off); for ( i = 0; !BER_BVISNULL( &tab->aux[i].word ); i++ ) { if ( *iptr == tab->aux[i].mask ) { @@ -1100,6 +1172,37 @@ int bindconf_unparse( slap_bindconf *bc, struct berval *bv ) { } } break; + + case 'i': + iptr = (int *)((char *)src + tab->off); + *ptr++ = ' '; + ptr = lutil_strcopy( ptr, tab->key.bv_val ); + ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ), "%d", *iptr ); + break; + + case 'u': + uptr = (unsigned *)((char *)src + tab->off); + *ptr++ = ' '; + ptr = lutil_strcopy( ptr, tab->key.bv_val ); + ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ), "%u", *uptr ); + break; + + case 'I': + lptr = (long *)((char *)src + tab->off); + *ptr++ = ' '; + ptr = lutil_strcopy( ptr, tab->key.bv_val ); + ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ), "%ld", *lptr ); + break; + + case 'U': + ulptr = (unsigned long *)((char *)src + tab->off); + *ptr++ = ' '; + ptr = lutil_strcopy( ptr, tab->key.bv_val ); + ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ), "%lu", *ulptr ); + break; + + default: + assert( 0 ); } } tmp.bv_val = buf; @@ -1108,7 +1211,23 @@ int bindconf_unparse( slap_bindconf *bc, struct berval *bv ) { return 0; } +int +bindconf_parse( const char *word, slap_bindconf *bc ) +{ + return slap_cf_aux_table_parse( word, bc, bindkey, "bind config" ); +} + +int +bindconf_unparse( slap_bindconf *bc, struct berval *bv ) +{ + return slap_cf_aux_table_unparse( bc, bv, bindkey ); +} + void bindconf_free( slap_bindconf *bc ) { + if ( !BER_BVISNULL( &bc->sb_uri ) ) { + ch_free( bc->sb_uri.bv_val ); + BER_BVZERO( &bc->sb_uri ); + } if ( !BER_BVISNULL( &bc->sb_binddn ) ) { ch_free( bc->sb_binddn.bv_val ); BER_BVZERO( &bc->sb_binddn );