unifdef -DBDB_SUBENTRIES -DLDBM_SUBENTRIES

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

diff --git a/servers/slapd/back-ldbm/config.c b/servers/slapd/back-ldbm/config.c
index daad7e9b7ef49c69485a60023e72597a686c9b0f..5309f2e0c39adf623fd1ef0e2b8eaf5c509dd739 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-1999 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-2005 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,7 +23,7 @@
 
 #include "slap.h"
 #include "back-ldbm.h"
-
+#include "lutil.h"
 
 int
 ldbm_back_db_config(
@@ -25,6 +34,7 @@ ldbm_back_db_config(
     char       **argv
 )
 {
+       int rc;
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
 
        if ( li == NULL ) {
@@ -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 ) {
@@ -64,10 +79,15 @@ ldbm_back_db_config(
                        return( 1 );
                } else if ( argc > 3 ) {
                        fprintf( stderr,
-"%s: line %d: extra junk after \"index <attr> [pres,eq,approx,sub]\" line (ignored)\n",
+"%s: line %d: extra junk after \"index <attr> [pres,eq,approx,sub]\" line" SLAPD_CONF_UNKNOWN_IGNORED ".\n",
                            fname, lineno );
+#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
+                       return( 1 );
+#endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
                }
-               attr_index_config( li, fname, lineno, argc - 1, &argv[1], 0 );
+               rc = attr_index_config( li, fname, lineno, argc - 1, &argv[1] );
+
+               if( rc != LDAP_SUCCESS ) return 1;
 
        /* size of the cache in entries */
        } else if ( strcasecmp( argv[0], "cachesize" ) == 0 ) {
@@ -77,7 +97,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 ) {
@@ -87,7 +112,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 ) {
@@ -99,11 +129,59 @@ ldbm_back_db_config(
        {
                li->li_dbwritesync = 0;
 
+       /* run sync thread */
+       } else if ( strcasecmp( argv[0], "dbsync" ) == 0 ) {
+#ifndef NO_THREADS
+               int i;
+               if ( argc < 2 ) {
+                       Debug( LDAP_DEBUG_ANY,
+    "%s: line %d: missing frquency value in \"dbsync <frequency> [<wait-times> [wait-interval]]\" line\n",
+                           fname, lineno, 0 );
+                       return 1;
+               }
+
+               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 );
+                       return 1;
+               }
+
+               li->li_dbsyncfreq = i;
+
+               if ( argc > 2 ) {
+                       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 );
+                               return 1;
+                       }
+                       li ->li_dbsyncwaitn = i;
+               }
+
+               if ( argc > 3 ) {
+                       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 );
+                               return 1;
+                       }
+                       li ->li_dbsyncwaitinterval = i;
+               }
+
+               /* turn off writesync when sync policy is in place */
+               li->li_dbwritesync = 0;
+
+#else
+               Debug( LDAP_DEBUG_ANY,
+    "\"dbsync\" policies not supported in non-threaded environments\n", 0, 0, 0);
+               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;