X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=8e8558c053b72ea06e576859d2f3cc1757409e48;hb=46cb141185d5a04c43d3707baff0df0b8358f50b;hp=cbc9f21ec6ea39b916b3cf453864f6e239a63903;hpb=28aca605c7b475a4fc09854ba6a596bcd731d60f;p=openldap diff --git a/servers/slapd/config.c b/servers/slapd/config.c index cbc9f21ec6..8e8558c053 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,13 +481,14 @@ 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; } } code = slap_str2ad( at->at_names[0], &ct[i].ad, &err ); - if ( freeit ) { + if ( freeit || code ) { ldap_attributetype_free( at ); } else { ldap_memfree( at ); @@ -489,10 +523,14 @@ init_config_ocs( ConfigOCs *ocs ) { if ( code && code != SLAP_SCHERR_CLASS_DUP ) { fprintf( stderr, "init_config_ocs: objectclass \"%s\": %s, %s\n", ocs[i].co_def, scherr2str(code), err ); + ldap_objectclass_free(oc); return code; } ocs[i].co_oc = oc_find(oc->oc_names[0]); - ldap_memfree(oc); + if ( code ) + ldap_objectclass_free(oc); + else + ldap_memfree(oc); } return 0; } @@ -594,6 +632,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; @@ -657,6 +696,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) Debug(LDAP_DEBUG_ANY, "could not stat config file \"%s\": %s (%d)\n", fname, strerror(errno), errno); + ch_free( c ); return(1); } @@ -665,6 +705,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) Debug(LDAP_DEBUG_ANY, "regular file expected, got \"%s\"\n", fname, 0, 0 ); + ch_free( c ); return(1); } @@ -674,6 +715,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) Debug(LDAP_DEBUG_ANY, "could not open config file \"%s\": %s (%d)\n", fname, strerror(errno), errno); + ch_free( c ); return(1); } @@ -700,15 +742,10 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) } if ( c->argc < 1 ) { - Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: bad config line" - SLAPD_CONF_UNKNOWN_IGNORED ".\n", + Debug( LDAP_DEBUG_ANY, "%s: bad config line.\n", c->log, 0, 0); -#ifdef SLAPD_CONF_UNKNOWN_BAILOUT rc = 1; goto done; -#else /* ! SLAPD_CONF_UNKNOWN_BAILOUT */ - continue; -#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */ } c->op = SLAP_CONFIG_ADD; @@ -745,20 +782,16 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) if ( rc ) { switch(rc) { case SLAP_CONF_UNKNOWN: - Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " - "unknown directive <%s> inside backend info definition" - SLAPD_CONF_UNKNOWN_IGNORED ".\n", + Debug( LDAP_DEBUG_ANY, "%s: unknown directive " + "<%s> inside backend info definition.\n", c->log, *c->argv, 0); -#ifndef SLAPD_CONF_UNKNOWN_BAILOUT - continue; -#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */ default: rc = 1; goto done; } } - } 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,34 +803,39 @@ 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); -#ifndef SLAPD_CONF_UNKNOWN_BAILOUT - continue; -#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */ - default: - rc = 1; - goto done; - } + 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( LDAP_DEBUG_ANY, "%s: unknown directive " + "<%s> inside backend database definition.\n", + c->log, *c->argv, 0); + + default: + rc = 1; + goto done; } } else if ( frontendDB->be_config ) { - rc = (*frontendDB->be_config)(frontendDB, c->fname, (int)c->lineno, c->argc, c->argv); + rc = (*frontendDB->be_config)( frontendDB, + c->fname, (int)c->lineno, c->argc, c->argv); if ( rc ) { switch(rc) { case SLAP_CONF_UNKNOWN: - Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " - "unknown directive <%s> inside global database definition" - SLAPD_CONF_UNKNOWN_IGNORED ".\n", + Debug( LDAP_DEBUG_ANY, "%s: unknown directive " + "<%s> inside global database definition.\n", c->log, *c->argv, 0); -#ifndef SLAPD_CONF_UNKNOWN_BAILOUT - continue; -#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */ + default: rc = 1; goto done; @@ -805,16 +843,11 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) } } else { - Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: " - "unknown directive <%s> outside backend info and database definitions" - SLAPD_CONF_UNKNOWN_IGNORED ".\n", + Debug( LDAP_DEBUG_ANY, "%s: unknown directive " + "<%s> outside backend info and database definitions.\n", c->log, *c->argv, 0); -#ifdef SLAPD_CONF_UNKNOWN_BAILOUT rc = 1; goto done; -#else /* ! SLAPD_CONF_UNKNOWN_BAILOUT */ - continue; -#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */ } } @@ -833,9 +866,9 @@ done: int verb_to_mask(const char *word, slap_verbmasks *v) { int i; - for(i = 0; !BER_BVISNULL(&v[i].word); i++) - if(!strcasecmp(word, v[i].word.bv_val)) - break; + for(i = 0; !BER_BVISNULL(&v[i].word); i++) { + if(!strcasecmp(word, v[i].word.bv_val)) break; + } return(i); } @@ -879,8 +912,7 @@ slap_verbmasks_init( slap_verbmasks **vp, slap_verbmasks *v ) assert( *vp == NULL ); - for ( i = 0; !BER_BVISNULL( &v[ i ].word ); i++ ) - ; + for ( i = 0; !BER_BVISNULL( &v[ i ].word ); i++ ) /* EMPTY */; *vp = ch_calloc( i + 1, sizeof( slap_verbmasks ) ); @@ -1013,9 +1045,11 @@ slap_cf_aux_table_parse( const char *word, void *dst, slap_cf_aux_table *tab0, L for (tab = tab0; !BER_BVISNULL(&tab->key); tab++ ) { if ( !strncasecmp( word, tab->key.bv_val, tab->key.bv_len )) { - char **cptr, *next; + char **cptr; int *iptr, j; unsigned *uptr; + long *lptr; + unsigned long *ulptr; struct berval *bptr; const char *val = word + tab->key.bv_len; @@ -1046,19 +1080,25 @@ slap_cf_aux_table_parse( const char *word, void *dst, slap_cf_aux_table *tab0, L case 'i': iptr = (int *)((char *)dst + tab->off); - *iptr = strtol( val, &next, 0 ); - if ( next == val || next[ 0 ] != '\0' ) { - rc = 1; - } + rc = lutil_atoix( iptr, val, 0 ); break; case 'u': uptr = (unsigned *)((char *)dst + tab->off); - *uptr = strtoul( val, &next, 0 ); - if ( next == val || next[ 0 ] != '\0' ) { - rc = 1; - } + 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; } @@ -1086,6 +1126,8 @@ slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0 char **cptr; int *iptr, i; unsigned *uptr; + long *lptr; + unsigned long *ulptr; struct berval *bptr; cptr = (char **)((char *)src + tab->off); @@ -1131,6 +1173,23 @@ slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0 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; @@ -1435,6 +1494,8 @@ int config_generic_wrapper( Backend *be, const char *fname, int lineno, c.argc = argc; c.argv = argv; c.valx = -1; + c.line = line; + c.op = SLAP_CONFIG_ADD; snprintf( c.log, sizeof( c.log ), "%s: line %d", fname, lineno ); rc = SLAP_CONF_UNKNOWN;