From a48beed9ee19c903a1c6193885072506b2f33eed Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 20 Dec 2005 18:31:34 +0000 Subject: [PATCH] ITS#4257: fix mode parsing (again) --- CHANGES | 5 +++-- servers/slapd/config.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index f5c4e89848..68831701e9 100644 --- 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 5e57b2703c..a6f462388d 100644 --- 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] ); -- 2.39.5