From: Kurt Zeilenga Date: Fri, 22 Jun 2001 19:54:31 +0000 (+0000) Subject: Backout "directory" option X-Git-Tag: OPENLDAP_REL_ENG_2_0_12~55 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b22fd398c1a107ee6ed2be98f973823f1fb34a52;p=thirdparty%2Fopenldap.git Backout "directory" option --- diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index f00f54f955..f0b49b65a6 100644 --- 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 -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 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 dec1d720a6..370a603003 100644 --- 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 ab0a644469..35573cedbe 100644 --- 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 f2a8f88712..92dcd7092c 100644 --- 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 d3d51739dd..bcf879e6ef 100644 --- 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 c1f4eb01c9..1ccaee60fd 100644 --- 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 26127a0990..6aa50af436 100644 --- 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 bc3c818aed..e27efa78af 100644 --- 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 85def7588f..4215303d8c 100644 --- 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