Add OpenLDAP RCSid to *.[ch] in clients, libraries, and servers.

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

diff --git a/servers/slapd/back-ldbm/config.c b/servers/slapd/back-ldbm/config.c
index 541410ee4dc388b9b4bef92760fa27c9fc69a178..ef06a4fcc729e66300479246e1f5d41227fa3ed5 100644 (file)
--- a/servers/slapd/back-ldbm/config.c
+++ b/servers/slapd/back-ldbm/config.c
@@ -1,4 +1,9 @@
 /* config.c - ldbm backend configuration file routine */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -10,10 +15,11 @@
 #include "slap.h"
 #include "back-ldbm.h"
 
-void
-ldbm_back_config(
+
+int
+ldbm_back_db_config(
     Backend    *be,
-    char       *fname,
+    const char *fname,
     int                lineno,
     int                argc,
     char       **argv
@@ -22,9 +28,9 @@ ldbm_back_config(
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
 
        if ( li == NULL ) {
-               fprintf( stderr, "%s: line %d: ldbm backend info is null!\n",
+               fprintf( stderr, "%s: line %d: ldbm database info is null!\n",
                    fname, lineno );
-               exit( 1 );
+               return( 1 );
        }
 
        /* directory where database files live */
@@ -33,23 +39,19 @@ ldbm_back_config(
                        fprintf( stderr,
                "%s: line %d: missing dir in \"directory <dir>\" line\n",
                            fname, lineno );
-                       exit( 1 );
+                       return( 1 );
                }
+               if ( li->li_directory )
+                       free( li->li_directory );
                li->li_directory = ch_strdup( argv[1] );
 
-               li->li_nextid_file =
-                       ch_malloc( strlen(li->li_directory) + sizeof("/NEXTID") );
-
-               strcpy(li->li_nextid_file, li->li_directory);
-               strcat(li->li_nextid_file, "/NEXTID");
-
        /* mode with which to create new database files */
        } else if ( strcasecmp( argv[0], "mode" ) == 0 ) {
                if ( argc < 2 ) {
                        fprintf( stderr,
                        "%s: line %d: missing mode in \"mode <mode>\" line\n",
                            fname, lineno );
-                       exit( 1 );
+                       return( 1 );
                }
                li->li_mode = strtol( argv[1], NULL, 0 );
 
@@ -59,7 +61,7 @@ ldbm_back_config(
                        fprintf( stderr,
 "%s: line %d: missing attr in \"index <attr> [pres,eq,approx,sub]\" line\n",
                            fname, lineno );
-                       exit( 1 );
+                       return( 1 );
                } else if ( argc > 3 ) {
                        fprintf( stderr,
 "%s: line %d: extra junk after \"index <attr> [pres,eq,approx,sub]\" line (ignored)\n",
@@ -73,7 +75,7 @@ ldbm_back_config(
                        fprintf( stderr,
                "%s: line %d: missing size in \"cachesize <size>\" line\n",
                            fname, lineno );
-                       exit( 1 );
+                       return( 1 );
                }
                li->li_cache.c_maxsize = atoi( argv[1] );
 
@@ -83,7 +85,7 @@ ldbm_back_config(
                        fprintf( stderr,
                "%s: line %d: missing size in \"dbcachesize <size>\" line\n",
                            fname, lineno );
-                       exit( 1 );
+                       return( 1 );
                }
                li->li_dbcachesize = atoi( argv[1] );
 
@@ -97,4 +99,6 @@ ldbm_back_config(
 "%s: line %d: unknown directive \"%s\" in ldbm database definition (ignored)\n",
                    fname, lineno, argv[0] );
        }
+
+       return 0;
 }