ITS#4358

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index da85ee01ab3ef3ef0a4c969b009ffa951e84391f..5146a85c5a4e0a5cfaceb6bd8d46f2b2cc877e7b 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * 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,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",
@@ -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;
@@ -992,6 +1027,7 @@ static slap_verbmasks methkey[] = {
 };
 
 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,9 +1048,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;
 
@@ -1045,19 +1083,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;
                        }
 
@@ -1085,6 +1129,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);
@@ -1130,6 +1176,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;
@@ -1151,6 +1214,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 );
@@ -1430,6 +1497,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;