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 3c8475024e5621e81739513579404b4ef4e2c1ca..dc8ea7cab5bf31535d8da7c1c283a0d054a0d714 100644 (file)
--- a/servers/slapd/back-ldbm/config.c
+++ b/servers/slapd/back-ldbm/config.c
@@ -1,8 +1,17 @@
 /* config.c - ldbm backend configuration file routine */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -14,6 +23,7 @@
 
 #include "slap.h"
 #include "back-ldbm.h"
+#include "lutil.h"
 
 int
 ldbm_back_db_config(
@@ -53,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 ) {
@@ -63,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] );
 
@@ -79,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 ) {
@@ -89,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 ) {
@@ -106,67 +132,36 @@ ldbm_back_db_config(
 #ifndef NO_THREADS
                int i;
                if ( argc < 2 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG (( "config", LDAP_LEVEL_ERR, "ldbm_back_db_config: %s: "
-                               "line %d: missing frequency value in \"dbsync <frequency> "
-                               "[<wait-times> [wait-interval]]\" line\n", fname, lineno ));
-#else  
                        Debug( LDAP_DEBUG_ANY,
     "%s: line %d: missing frquency value in \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
                            fname, lineno, 0 );
-#endif
                        return 1;
                }
 
-               i = atoi( argv[1] );
-
-               if( i < 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG (( "config", LDAP_LEVEL_ERR, "ldbm_back_db_config: %s: "
-                               "line %d: frequency value (%d) invalid \"dbsync "
-                               "<frequency> [<wait-times> [wait-interval]]\" line\n", 
-                               fname, lineno, i ));
-#else  
+               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 );
-#endif
                        return 1;
                }
 
                li->li_dbsyncfreq = i;
 
                if ( argc > 2 ) {
-                       i = atoi( argv[2] );
-                       if ( i < 0 ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG (( "config",LDAP_LEVEL_ERR, "ldbm_back_db_config: %s: "
-                                       "line %d: frequency value (%d) invalid \"dbsync "
-                                       "<frequency> [<wait-times> [wait-interval]]\" line\n", 
-                                       fname, lineno, i ));
-#else  
+                       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 );
-#endif
                                return 1;
                        }
                        li ->li_dbsyncwaitn = i;
                }
 
                if ( argc > 3 ) {
-                       i = atoi( argv[3] );
-                       if ( i <= 0 ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG (( "config",LDAP_LEVEL_ERR, "ldbm_back_db_config: %s: "
-                                       "line %d: frequency value (%d) invalid \"dbsync "
-                                       "<frequency> [<wait-times> [wait-interval]]\" line\n", 
-                                       fname, lineno, i ));
-#else  
+                       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 );
-#endif
                                return 1;
                        }
                        li ->li_dbsyncwaitinterval = i;
@@ -176,22 +171,15 @@ ldbm_back_db_config(
                li->li_dbwritesync = 0;
 
 #else
-#ifdef NEW_LOGGING
-               LDAP_LOG (( "config",LDAP_LEVEL_ERR, "ldbm_back_db_config: "\"dbsync\""
-                       " policies not supported in non-threaded environments\n" ));
-#else  
                Debug( LDAP_DEBUG_ANY,
     "\"dbsync\" policies not supported in non-threaded environments\n", 0, 0, 0);
-#endif
                return 1;
 #endif
 
 
        /* anything else */
        } else {
-               fprintf( stderr,
-"%s: line %d: unknown directive \"%s\" in ldbm database definition (ignored)\n",
-                   fname, lineno, argv[0] );
+               return SLAP_CONF_UNKNOWN;
        }
 
        return 0;