error message from be_entry_put tool backend function

[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..c9a9b2571e7c38fd451d284c904f49900f06f25a 100644 (file)
--- a/servers/slapd/back-ldbm/config.c
+++ b/servers/slapd/back-ldbm/config.c
@@ -1,7 +1,7 @@
 /* config.c - ldbm backend configuration file routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -15,7 +15,6 @@
 #include "slap.h"
 #include "back-ldbm.h"
 
-
 int
 ldbm_back_db_config(
     Backend    *be,
@@ -25,6 +24,7 @@ ldbm_back_db_config(
     char       **argv
 )
 {
+       int rc;
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
 
        if ( li == NULL ) {
@@ -67,7 +67,9 @@ ldbm_back_db_config(
 "%s: line %d: extra junk after \"index <attr> [pres,eq,approx,sub]\" line (ignored)\n",
                            fname, lineno );
                }
-               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 ) {
@@ -99,6 +101,60 @@ 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;
+               }
+
+               i = atoi( argv[1] );
+
+               if( 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 ) {
+                       i = atoi( argv[2] );
+                       if ( 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 ) {
+                       i = atoi( argv[3] );
+                       if ( 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,