unifdef -DSLAPD_CONF_UNKNOWN_BAILOUT -DSLAPD_CONF_UNKNOWN_IGNORED=""

[openldap] / servers / slapd / back-ldbm / config.c

diff --git a/servers/slapd/back-ldbm/config.c b/servers/slapd/back-ldbm/config.c
index cf92272b746968176abe36ce181b8c3cef23de54..dc8ea7cab5bf31535d8da7c1c283a0d054a0d714 100644 (file)
--- a/servers/slapd/back-ldbm/config.c
+++ b/servers/slapd/back-ldbm/config.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,6 +23,7 @@
 
 #include "slap.h"
 #include "back-ldbm.h"
+#include "lutil.h"
 
 int
 ldbm_back_db_config(
@@ -62,7 +63,12 @@ ldbm_back_db_config(
                            fname, lineno );
                        return( 1 );
                }
-               li->li_mode = strtol( argv[1], NULL, 0 );
+               if ( lutil_atoix( &li->li_mode, argv[1], 0 ) != 0 ) {
+                       fprintf( stderr,
+                       "%s: line %d: unable to parse mode=\"%s\" in \"mode <mode>\" line\n",
+                           fname, lineno, argv[1] );
+                       return( 1 );
+               }
 
        /* attribute to index */
        } else if ( strcasecmp( argv[0], "index" ) == 0 ) {
@@ -72,9 +78,10 @@ ldbm_back_db_config(
                            fname, lineno );
                        return( 1 );
                } else if ( argc > 3 ) {
-                       fprintf( stderr,
-"%s: line %d: extra junk after \"index <attr> [pres,eq,approx,sub]\" line (ignored)\n",
+                       fprintf( stderr, "%s: line %d: extra junk "
+                               "after \"index <attr> [pres,eq,approx,sub]\" line.\n",
                            fname, lineno );
+                       return( 1 );
                }
                rc = attr_index_config( li, fname, lineno, argc - 1, &argv[1] );
 
@@ -88,7 +95,12 @@ ldbm_back_db_config(
                            fname, lineno );
                        return( 1 );
                }
-               li->li_cache.c_maxsize = atoi( argv[1] );
+               if ( lutil_atoi( &li->li_cache.c_maxsize, argv[1] ) != 0 ) {
+                       fprintf( stderr,
+               "%s: line %d: unable to parse cachesize \"%s\"\n",
+                           fname, lineno, argv[1] );
+                       return( 1 );
+               }
 
        /* size of each dbcache in bytes */
        } else if ( strcasecmp( argv[0], "dbcachesize" ) == 0 ) {
@@ -98,7 +110,12 @@ ldbm_back_db_config(
                            fname, lineno );
                        return( 1 );
                }
-               li->li_dbcachesize = atoi( argv[1] );
+               if ( lutil_atoi( &li->li_dbcachesize, argv[1] ) ) {
+                       fprintf( stderr,
+               "%s: line %d: unable to parse dbcachesize \"%s\"\n",
+                           fname, lineno, argv[1] );
+                       return( 1 );
+               }
 
        /* no locking (not safe) */
        } else if ( strcasecmp( argv[0], "dbnolocking" ) == 0 ) {
@@ -121,9 +138,7 @@ ldbm_back_db_config(
                        return 1;
                }
 
-               i = atoi( argv[1] );
-
-               if( i < 0 ) {
+               if ( lutil_atoi( &i, argv[1] ) != 0 || i < 0 ) {
                        Debug( LDAP_DEBUG_ANY,
     "%s: line %d: frquency value (%d) invalid \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
                            fname, lineno, i );
@@ -133,8 +148,7 @@ ldbm_back_db_config(
                li->li_dbsyncfreq = i;
 
                if ( argc > 2 ) {
-                       i = atoi( argv[2] );
-                       if ( i < 0 ) {
+                       if ( lutil_atoi( &i, argv[2] ) != 0 || i < 0 ) {
                                Debug( LDAP_DEBUG_ANY,
            "%s: line %d: frquency value (%d) invalid \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
                                    fname, lineno, i );
@@ -144,8 +158,7 @@ ldbm_back_db_config(
                }
 
                if ( argc > 3 ) {
-                       i = atoi( argv[3] );
-                       if ( i <= 0 ) {
+                       if ( lutil_atoi( &i, argv[3] ) != 0 || i <= 0 ) {
                                Debug( LDAP_DEBUG_ANY,
            "%s: line %d: frquency value (%d) invalid \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
                                    fname, lineno, i );