ITS#4257: fix mode parsing (again)

diff --git a/CHANGES b/CHANGES
index f5c4e898487be08700937807e0d3d989652f0873..68831701e91d4686b9cf89dfa8487e0a988b28e5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,11 @@
 OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.14 Engineering
-       Fixed slapd sc_prev update after free bug (ITS#4237)
-       Fixed slapo-rwm static DN free bug (ITS#4248)
        Fixed slapd assertion control restrictions
        Fixed slapd ACL exact attrval clause needs normalization (ITS#4255)
+       Fixed slapd sc_prev update after free bug (ITS#4237)
+       Fixed slapd-bdb/hdb mode argument parsing (ITS#425h)
+       Fixed slapo-rwm static DN free bug (ITS#4248)
 
 OpenLDAP 2.3.13 Release
        Fixed libldap/liblutil MSG_ACCRIGHTSLEN bug (ITS#4206)

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 5e57b2703c761b02cd543e5edc8da3b6549316e9..a6f462388dac88a2c5ead953d1856a5a94cd8873 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -192,7 +192,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
                iarg = 0; larg = 0; barg = 0;
                switch(arg_type & ARGS_NUMERIC) {
                        case ARG_INT:
-                               if ( lutil_atoi( &iarg, c->argv[1] ) != 0 ) {
+                               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] );
@@ -202,7 +202,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
                                }
                                break;
                        case ARG_LONG:
-                               if ( lutil_atol( &larg, c->argv[1] ) != 0 ) {
+                               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] );
@@ -213,7 +213,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
                                break;
                        case ARG_BER_LEN_T: {
                                unsigned long   l;
-                               if ( lutil_atoul( &l, c->argv[1] ) != 0 ) {
+                               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] );