Backout "directory" option

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index f00f54f9555420916d1d5fda0ad24947d04b4955..f0b49b65a64bd9ec3e1f6960ead8aafa1075c72b 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -55,13 +55,12 @@ double quotes.  If an argument contains a double quote (`"') or a
 backslash character (`\\'), the character should be preceded by a
 backslash character.
 .LP
-The specific configuration options available are discussed below in the
-Global Configuration Options, General Backend Options, General Database
-Options, LDBM Backend-Specific Options, LDBM Database-Specific Options,
-Shell Database-Specific Options, and Password
-Database-Specific Options sections.  Refer to the "OpenLDAP
-Administrator's Guide" for more details on the slapd configuration
-file.
+The specific configuration options available are discussed below
+in the Global Configuration Options, General Backend Options,
+General Database Options, LDBM Database-Specific Options, Shell
+Database-Specific Options, and Password Database-Specific Options
+sections.  Refer to the "OpenLDAP Administrator's Guide" for more
+details on the slapd configuration file.
 .SH GLOBAL CONFIGURATION OPTIONS
 Options described in this section apply to all backends, unless specifically 
 overridden in a backend definition. Arguments that should be replaced by 
@@ -567,21 +566,16 @@ Specify the referral to pass back when
 .BR slapd (8)
 is asked to modify a replicated local database.
 If specified multiple times, each url is provided.
-.SH LDBM BACKEND-SPECIFIC OPTIONS
-Options in this category only apply to the LDBM backend. That is,
-they must follow "backend ldbm" line and come before any subsequent
-"backend" or "database" lines.  The LDBM backend is a high-performance
-database that makes extensive use of indexing and caching to speed
-data access. 
-.TP
-.B directory <directory>
-Specify the directory where shared LDBM files, namely those associated
-with a BerkeleyDB environment, for all LDBM databases are kept.
-The default is unset.
+.\" .SH LDBM BACKEND-SPECIFIC OPTIONS
+.\" Options in this category only apply to the LDBM backend. That is,
+.\" they must follow "backend ldbm" line and come before any subsequent
+.\" "backend" or "database" lines.  The LDBM backend is a high-performance
+.\" database that makes extensive use of indexing and caching to speed
+.\" data access. 
 .SH LDBM DATABASE-SPECIFIC OPTIONS
-Options in this category only apply to the LDBM databases. That is,
-they must follow "database ldbm" line and come before any subsequent
-"backend" or "database" lines.
+Options in this category only apply to the LDBM databases.
+That is, they must follow "database ldbm" line and come before
+any subsequent "backend" or "database" lines.
 .TP
 .B cachesize <integer>
 Specify the size in entries of the in-memory cache maintained 

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index dec1d720a66f1fe069e42850f386cd674ac18106..370a6030036d20d2fc29ef75d88f240bfc39dacd 100644 (file)
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -13,9 +13,6 @@ argsfile    ./test-db/slapd.args
 # ldbm database definitions
 #######################################################################
 
-backend ldbm
-# directory ./test-db
-
 database       ldbm
 
 cachesize      0

diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index ab0a64446995826415e3f40e2877b79567fb3424..35573cedbe94421b2f12e0eaaf532ebb3090c951 100644 (file)
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -13,9 +13,6 @@ argsfile    ./test-db/slapd.args
 # ldbm database definitions
 #######################################################################
 
-backend ldbm
-# directory ./test-db
-
 database ldbm
 
 suffix         "o=University of Michigan, c=US"

diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index f2a8f887124dedccd4f6ca5169ca9fd74267345f..92dcd7092c1d61c4a6b5860671030aeb5035a821 100644 (file)
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@@ -15,9 +15,6 @@ argsfile    ./test-db/slapd.args
 # ldbm database definitions
 #######################################################################
 
-backend ldbm
-# directory ./test-db
-
 database       ldbm
 cachesize      0
 suffix         "o=University of Michigan, c=US"

diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf
index d3d51739dd569542b4980da109cfb994e7965a29..bcf879e6ef770cc3308797def9f6347e62450a30 100644 (file)
--- a/tests/data/slapd-ref-slave.conf
+++ b/tests/data/slapd-ref-slave.conf
@@ -17,9 +17,6 @@ argsfile    ./test-repl/slapd.args
 
 referral       "ldap://localhost:9009/"
 
-backend ldbm
-# directory ./test-repl
-
 database       ldbm
 
 cachesize      0

diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf
index c1f4eb01c9d1c5587aaa1d0a68233882fc36dffa..1ccaee60fdf1312bf728dc8fed4c89c079b97202 100644 (file)
--- a/tests/data/slapd-repl-master.conf
+++ b/tests/data/slapd-repl-master.conf
@@ -15,9 +15,6 @@ argsfile    ./test-db/slapd.args
 # ldbm database definitions
 #######################################################################
 
-backend ldbm
-# directory ./test-db
-
 database       ldbm
 cachesize      0
 suffix         "o=University of Michigan, c=US"

diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index 26127a09905b39d94f1e499ec6b971b2508f456a..6aa50af436d990c26c0ac4353b8a54bd7c051668 100644 (file)
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@@ -16,9 +16,6 @@ argsfile    ./test-repl/slapd.args
 # ldbm database definitions
 #######################################################################
 
-backend ldbm
-# directory ./test-repl
-
 database       ldbm
 cachesize      0
 suffix         "o=University of Michigan, c=US"

diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index bc3c818aed2c27863bed918bcde57721fddafb40..e27efa78af4f64a5bdfdf0f0f72b2671ad0093c5 100644 (file)
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -23,9 +23,6 @@ argsfile    ./test-db/slapd.args
 # ldbm database definitions
 #######################################################################
 
-backend ldbm
-# directory ./test-db
-
 database       ldbm
 suffix         "o=OpenLDAP Project, l=Internet"
 directory      ./test-db

diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index 85def7588f383e091a87fd86062069eccda650a6..4215303d8caae76611e8bbf13624d3019d92bfde 100644 (file)
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -15,9 +15,6 @@ argsfile    ./test-db/slapd.args
 # ldbm database definitions
 #######################################################################
 
-backend ldbm
-# directory ./test-db
-
 database       ldbm
 suffix         "o=University of Michigan, c=US"
 directory      ./test-db