Backout backend "directory" config option

diff --git a/servers/slapd/back-ldbm/back-ldbm.h b/servers/slapd/back-ldbm/back-ldbm.h
index 04ef6c4637fe090c72bbc5d9778bd181b4fb9220..b1b374b1a76299a00a31962d40c763540e58a616 100644 (file)
--- a/servers/slapd/back-ldbm/back-ldbm.h
+++ b/servers/slapd/back-ldbm/back-ldbm.h
@@ -119,10 +119,6 @@ struct ldbminfo {
        ldap_pvt_thread_cond_t          li_dbcache_cv;
 };
 
-struct ldbm_backend_info {
-       char    *lbi_directory;
-};
-
 LDAP_END_DECL
 
 #include "proto-back-ldbm.h"

diff --git a/servers/slapd/back-ldbm/config.c b/servers/slapd/back-ldbm/config.c
index 60c6f4609df15b27f4eb88c58e40791a447e10cd..35b6d907b37c7bd05f5c0abd91e5f5fd21066dc3 100644 (file)
--- a/servers/slapd/back-ldbm/config.c
+++ b/servers/slapd/back-ldbm/config.c
@@ -15,49 +15,6 @@
 #include "slap.h"
 #include "back-ldbm.h"
 
-
-int
-ldbm_back_config(
-    BackendInfo        *bi,
-    const char *fname,
-    int                lineno,
-    int                argc,
-    char       **argv
-)
-{
-       int rc;
-       struct ldbm_backend_info *lbi =
-               (struct ldbm_backend_info *) bi->bi_private;
-
-       if ( lbi == NULL ) {
-               fprintf( stderr, "%s: line %d: ldbm backend info is null!\n",
-                   fname, lineno );
-               return 1;
-       }
-
-       /* directory where database files live */
-       if ( strcasecmp( argv[0], "directory" ) == 0 ) {
-               if ( argc < 2 ) {
-                       fprintf( stderr,
-               "%s: line %d: missing dir in \"directory <dir>\" line\n",
-                           fname, lineno );
-                       return( 1 );
-               }
-               if ( lbi->lbi_directory ) {
-                       free( lbi->lbi_directory );
-               }
-               lbi->lbi_directory = ch_strdup( argv[1] );
-
-       /* anything else */
-       } else {
-               fprintf( stderr,
-"%s: line %d: unknown directive \"%s\" in ldbm backend definition (ignored)\n",
-                   fname, lineno, argv[0] );
-       }
-
-       return 0;
-}
-
 int
 ldbm_back_db_config(
     Backend    *be,

diff --git a/servers/slapd/back-ldbm/external.h b/servers/slapd/back-ldbm/external.h
index 7bb6ec4a6060128e4d090f63e62e5acd3fae8640..2bdac2f06930879149431f0f117a88aa9b576d11 100644 (file)
--- a/servers/slapd/back-ldbm/external.h
+++ b/servers/slapd/back-ldbm/external.h
@@ -13,9 +13,6 @@ extern int    ldbm_back_initialize LDAP_P(( BackendInfo *bi ));
 extern int     ldbm_back_open LDAP_P(( BackendInfo *bi ));
 extern int     ldbm_back_close LDAP_P(( BackendInfo *bi ));
 extern int     ldbm_back_destroy LDAP_P(( BackendInfo *bi ));
-extern int     ldbm_back_config LDAP_P(( BackendInfo *bi,
-       const char *fname, int lineno,
-       int argc, char **argv ));
 
 extern int     ldbm_back_db_init LDAP_P(( BackendDB *bd ));
 extern int     ldbm_back_db_open LDAP_P(( BackendDB *bd ));

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index 10a849a7e37c46deb6039b7f6887616f9439245e..43fa087664db8d9581086a34bef0b02d44a4e8ca 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -43,7 +43,7 @@ ldbm_back_initialize(
        bi->bi_controls = controls;
 
        bi->bi_open = ldbm_back_open;
-       bi->bi_config = ldbm_back_config;
+       bi->bi_config = NULL;
        bi->bi_close = ldbm_back_close;
        bi->bi_destroy = ldbm_back_destroy;
 
@@ -85,14 +85,6 @@ ldbm_back_initialize(
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
 
-       {
-               struct ldbm_backend_info *lbi = malloc(
-                       sizeof( struct ldbm_backend_info ) );
-
-               bi->bi_private = lbi;
-               lbi->lbi_directory = NULL;
-       }
-
        return 0;
 }
 
@@ -115,7 +107,7 @@ ldbm_back_open(
                = (struct ldbm_backend_info *) bi->bi_private;
 
        /* initialize the underlying database system */
-       rc = ldbm_initialize( lbi->lbi_directory );
+       rc = ldbm_initialize( NULL );
        return rc;
 }
 

diff --git a/servers/slapd/back-ldbm/proto-back-ldbm.h b/servers/slapd/back-ldbm/proto-back-ldbm.h
index 280edd5383e246c76d7dce0e077bc310ae2a8571..6ac74e95f9d5105b0e621ca6bea2081677769a69 100644 (file)
--- a/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -202,7 +202,7 @@ extern int ldbm_back_exop_passwd LDAP_P(( BackendDB *bd,
 int ldbm_modify_internal LDAP_P((Backend *be,
        Connection *conn, Operation *op,
        const char *dn, Modifications *mods, Entry *e,
-       const char ** ));
+       const char **text, char *textbuf, size_t textlen ));
 
 /*
  * nextid.c