X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=d8c2a035c29a6bb399728bd0fda20ac293202869;hb=2f770f8af7bd0c633000319f1cb53f1a95bfe921;hp=da85ee01ab3ef3ef0a4c969b009ffa951e84391f;hpb=2bffe6fe7dd34b654ff2dc45685bf6148347b8ff;p=openldap diff --git a/servers/slapd/config.c b/servers/slapd/config.c index da85ee01ab..d8c2a035c2 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-2007 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -191,17 +191,50 @@ 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", @@ -275,7 +308,7 @@ int config_set_vals(ConfigTable *Conf, ConfigArgs *c) { return(0); } if(arg_type & ARG_OFFSET) { - if (c->be) + if (c->be && c->table == Cft_Database) ptr = c->be->be_private; else if (c->bi) ptr = c->bi->bi_private; @@ -366,7 +399,7 @@ config_get_vals(ConfigTable *cf, ConfigArgs *c) if ( rc ) return rc; } else { if ( cf->arg_type & ARG_OFFSET ) { - if ( c->be ) + if (c->be && c->table == Cft_Database) ptr = c->be->be_private; else if ( c->bi ) ptr = c->bi->bi_private; @@ -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; @@ -715,6 +750,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) ct = config_find_keyword( cft, c ); if ( ct ) { + c->table = Cft_Global; rc = config_add_vals( ct, c ); if ( !rc ) continue; @@ -735,6 +771,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) if ( c->bi->bi_cf_ocs ) { ct = config_find_keyword( c->bi->bi_cf_ocs->co_table, c ); if ( ct ) { + c->table = c->bi->bi_cf_ocs->co_type; rc = config_add_vals( ct, c ); } } @@ -763,6 +800,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) if ( c->be->be_cf_ocs ) { ct = config_find_keyword( c->be->be_cf_ocs->co_table, c ); if ( ct ) { + c->table = c->be->be_cf_ocs->co_type; rc = config_add_vals( ct, c ); } } @@ -821,6 +859,10 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft) rc = 0; done: + if ( cf ) { + cf->be = c->be; + cf->bi = c->bi; + } ch_free(c->tline); fclose(fp); ch_free(c->argv); @@ -992,15 +1034,22 @@ static slap_verbmasks methkey[] = { }; static slap_cf_aux_table bindkey[] = { - { 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 }, + { BER_BVC("uri="), offsetof(slap_bindconf, sb_uri), 'b', 1, NULL }, + { BER_BVC("starttls="), offsetof(slap_bindconf, sb_tls), 'i', 0, tlskey }, + { BER_BVC("bindmethod="), offsetof(slap_bindconf, sb_method), 'i', 0, methkey }, + { BER_BVC("binddn="), offsetof(slap_bindconf, sb_binddn), 'b', 1, dnNormalize }, { BER_BVC("credentials="), offsetof(slap_bindconf, sb_cred), 'b', 1, NULL }, { BER_BVC("saslmech="), offsetof(slap_bindconf, sb_saslmech), 'b', 0, NULL }, { BER_BVC("secprops="), offsetof(slap_bindconf, sb_secprops), 's', 0, NULL }, { BER_BVC("realm="), offsetof(slap_bindconf, sb_realm), 'b', 0, NULL }, +#ifndef SLAP_AUTHZ_SYNTAX { BER_BVC("authcID="), offsetof(slap_bindconf, sb_authcId), 'b', 0, NULL }, { BER_BVC("authzID="), offsetof(slap_bindconf, sb_authzId), 'b', 1, NULL }, +#else /* SLAP_AUTHZ_SYNTAX */ + { BER_BVC("authcID="), offsetof(slap_bindconf, sb_authcId), 'b', 0, authzNormalize }, + { BER_BVC("authzID="), offsetof(slap_bindconf, sb_authzId), 'b', 1, authzNormalize }, +#endif /* SLAP_AUTHZ_SYNTAX */ + { BER_BVNULL, 0, 0, 0, NULL } }; @@ -1012,9 +1061,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; @@ -1026,38 +1077,57 @@ slap_cf_aux_table_parse( const char *word, void *dst, slap_cf_aux_table *tab0, L case 'b': bptr = (struct berval *)((char *)dst + tab->off); - ber_str2bv( val, 0, 1, bptr ); - break; + if ( tab->aux != NULL ) { + struct berval dn; + slap_mr_normalize_func *normalize = (slap_mr_normalize_func *)tab->aux; - case 'd': - assert( tab->aux != NULL ); - iptr = (int *)((char *)dst + tab->off); + ber_str2bv( val, 0, 0, &dn ); + rc = normalize( 0, NULL, NULL, &dn, bptr, NULL ); - rc = 1; - for ( j = 0; !BER_BVISNULL( &tab->aux[j].word ); j++ ) { - if ( !strcasecmp( val, tab->aux[j].word.bv_val ) ) { - *iptr = tab->aux[j].mask; - rc = 0; - } + } else { + ber_str2bv( val, 0, 1, bptr ); + rc = 0; } break; case 'i': iptr = (int *)((char *)dst + tab->off); - *iptr = strtol( val, &next, 0 ); - if ( next == val || next[ 0 ] != '\0' ) { + if ( tab->aux != NULL ) { + slap_verbmasks *aux = (slap_verbmasks *)tab->aux; + + assert( aux != NULL ); + rc = 1; + for ( j = 0; !BER_BVISNULL( &aux[j].word ); j++ ) { + if ( !strcasecmp( val, aux[j].word.bv_val ) ) { + *iptr = aux[j].mask; + rc = 0; + break; + } + } + + } else { + 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; } @@ -1076,7 +1146,7 @@ slap_cf_aux_table_parse( const char *word, void *dst, slap_cf_aux_table *tab0, L int slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0 ) { - char buf[BUFSIZ], *ptr; + char buf[AC_LINE_MAX], *ptr; slap_cf_aux_table *tab; struct berval tmp; @@ -1085,6 +1155,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); @@ -1093,6 +1165,7 @@ slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0 case 'b': bptr = (struct berval *)((char *)src + tab->off); cptr = &bptr->bv_val; + case 's': if ( *cptr ) { *ptr++ = ' '; @@ -1103,33 +1176,51 @@ slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0 } break; - case 'd': - assert( tab->aux != NULL ); + case 'i': iptr = (int *)((char *)src + tab->off); - - for ( i = 0; !BER_BVISNULL( &tab->aux[i].word ); i++ ) { - if ( *iptr == tab->aux[i].mask ) { - *ptr++ = ' '; - ptr = lutil_strcopy( ptr, tab->key.bv_val ); - ptr = lutil_strcopy( ptr, tab->aux[i].word.bv_val ); - break; + + if ( tab->aux != NULL ) { + slap_verbmasks *aux = (slap_verbmasks *)tab->aux; + + for ( i = 0; !BER_BVISNULL( &aux[i].word ); i++ ) { + if ( *iptr == aux[i].mask ) { + *ptr++ = ' '; + ptr = lutil_strcopy( ptr, tab->key.bv_val ); + ptr = lutil_strcopy( ptr, aux[i].word.bv_val ); + break; + } } + + } else { + *ptr++ = ' '; + ptr = lutil_strcopy( ptr, tab->key.bv_val ); + ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ), "%d", *iptr ); } break; - case 'i': - iptr = (int *)((char *)src + tab->off); + case 'u': + uptr = (unsigned *)((char *)src + tab->off); *ptr++ = ' '; ptr = lutil_strcopy( ptr, tab->key.bv_val ); - ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ), "%d", *iptr ); + ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ), "%u", *uptr ); break; - case 'u': - uptr = (unsigned *)((char *)src + tab->off); + case 'I': + lptr = (long *)((char *)src + tab->off); *ptr++ = ' '; ptr = lutil_strcopy( ptr, tab->key.bv_val ); - ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ), "%u", *uptr ); + 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; @@ -1151,6 +1242,10 @@ bindconf_unparse( slap_bindconf *bc, struct berval *bv ) } 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 ); @@ -1240,7 +1335,7 @@ strtok_quote( char *line, char *sep, char **quote_ptr ) return( tmp ); } -static char buf[BUFSIZ]; +static char buf[AC_LINE_MAX]; static char *line; static size_t lmax, lcur; @@ -1248,7 +1343,7 @@ static size_t lmax, lcur; do { \ size_t len = strlen( buf ); \ while ( lcur + len + 1 > lmax ) { \ - lmax += BUFSIZ; \ + lmax += AC_LINE_MAX; \ line = (char *) ch_realloc( line, lmax ); \ } \ strcpy( line + lcur, buf ); \ @@ -1430,11 +1525,15 @@ 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; ct = config_find_keyword( be->be_cf_ocs->co_table, &c ); - if ( ct ) + if ( ct ) { + c.table = be->be_cf_ocs->co_type; rc = config_add_vals( ct, &c ); + } return rc; }