From 74044dad8e8617ce1b24f07493acbcc38e53b807 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 28 Sep 2005 00:25:23 +0000 Subject: [PATCH] sync with HEAD --- doc/man/man1/ldapwhoami.1 | 4 ++-- doc/man/man5/slapd.conf.5 | 19 +++++++++++++++++++ doc/man/man5/slapo-valsort.5 | 30 +++++++++++++++++------------- doc/man/man8/slapacl.8 | 14 ++++++++++++++ doc/man/man8/slapadd.8 | 15 +++++++++++++++ doc/man/man8/slapindex.8 | 14 ++++++++++++++ doc/man/man8/slaptest.8 | 3 +-- 7 files changed, 82 insertions(+), 17 deletions(-) diff --git a/doc/man/man1/ldapwhoami.1 b/doc/man/man1/ldapwhoami.1 index eb0f2f2f4c..0dfff33c83 100644 --- a/doc/man/man1/ldapwhoami.1 +++ b/doc/man/man1/ldapwhoami.1 @@ -29,7 +29,7 @@ ldapwhoami \- LDAP who am i? tool [\c .BI \-p \ ldapport\fR] [\c -.BR \-O \ security-properties ] +.BI \-O \ security-properties\fR] [\c .BR \-I ] [\c @@ -65,7 +65,7 @@ Run in verbose mode, with many diagnostics written to standard output. .TP .BI \-d \ debuglevel Set the LDAP debugging level to \fIdebuglevel\fP. -.B ldapcompare +.B ldapwhoami must be compiled with LDAP_DEBUG defined for this option to have any effect. .TP .B \-x diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index 27e0be29be..924b00a431 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -2,6 +2,7 @@ .\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .\" $OpenLDAP$ +.SH NAME slapd.conf \- configuration file for slapd, the stand-alone LDAP daemon .SH SYNOPSIS ETCDIR/slapd.conf @@ -1421,6 +1422,24 @@ same indices (assuming they support indexing), even for attributes that only exist in some of these databases. In general, all of the glued databases should be configured as similarly as possible, since the intent is to provide the appearance of a single directory. + +Note that the \fIsubordinate\fP functionality is implemented internally +by the \fIglue\fP overlay and as such its behavior will interact with other +overlays in use. By default, the glue overlay is automatically configured as +the last overlay on the superior backend. Its position on the backend +can be explicitly configured by setting an \fBoverlay glue\fP directive +at the desired position. This explicit configuration is necessary e.g. +when using the \fIsyncprov\fP overlay, which needs to follow \fIglue\fP +in order to work over all of the glued databases. E.g. +.RS +.nf + database bdb + suffix dc=example,dc=com + ... + overlay glue + overlay syncprov +.fi +.RE .HP .hy 0 .B syncrepl rid= diff --git a/doc/man/man5/slapo-valsort.5 b/doc/man/man5/slapo-valsort.5 index 3cd439ad16..7891856a1d 100644 --- a/doc/man/man5/slapo-valsort.5 +++ b/doc/man/man5/slapo-valsort.5 @@ -16,15 +16,14 @@ numeric or alphanumeric sort methods. Additionally, a "weighted" sort can be specified, which uses a numeric weight prepended to the attribute values. The weighted sort is always performed in ascending order, but may be combined with the other methods for values that all have equal weights. The weight -is specified by prepending an integer weight -.B {} +is specified by prepending an integer weight {<\fIweight\fP>} in front of each value of the attribute for which weighted sorting is desired. This weighting factor is stripped off and never returned in search results. .SH CONFIGURATION These -.B slapd.conf +.I slapd.conf options apply to the Value Sorting overlay. They should appear after the .B overlay @@ -32,13 +31,13 @@ directive and before any subsequent .B database directive. .TP -.B valsort-attr ( | weighted []) +valsort-attr <\fIattribute\fP> <\fIbaseDN\fP> (<\fIsort-method\fP> | weighted [<\fIsort-method\fP>]) Configure a sorting method for the specified -.B attribute +.I attribute in the subtree rooted at -.BR baseDN . +.IR baseDN . The -.B sort-method +.I sort-method may be one of .BR alpha-ascend , .BR alpha-descend , @@ -47,10 +46,15 @@ or .BR numeric-descend . If the special .B weighted -method is specified, a secondary sort-method may also be specified. It is an -error to specify an alphanumeric sort-method for an attribute with Integer -or NumericString syntax, and it is an error to specify a numeric sort for -an attribute with a syntax other than Integer or NumericString. +method is specified, a secondary +.I sort-method +may also be specified. It is an +error to specify an alphanumeric +.I sort-method +for an attribute with Integer +or NumericString syntax, and it is an error to specify a numeric +.I sort-method +for an attribute with a syntax other than Integer or NumericString. .SH EXAMPLES .LP .nf @@ -63,8 +67,8 @@ an attribute with a syntax other than Integer or NumericString. .SH FILES .TP -ETCDIR/slapd.conf -default slapd configuration file +\fIETCDIR/slapd.conf\fP +default \fBslapd\fP configuration file .SH SEE ALSO .BR slapd.conf (5). .SH ACKNOWLEDGEMENTS diff --git a/doc/man/man8/slapacl.8 b/doc/man/man8/slapacl.8 index fc369a3b98..4c392391e6 100644 --- a/doc/man/man8/slapacl.8 +++ b/doc/man/man8/slapacl.8 @@ -8,6 +8,7 @@ slapacl \- Check access to a list of attributes. .B [\-v] .B [\-d level] .B [\-f slapd.conf] +.B [\-F confdir] .B [\-D authcDN | \-U authcID] .B \-b DN .B [\-u] @@ -46,6 +47,19 @@ specify an alternative .BR slapd.conf (5) file. .TP +.BI \-F " confdir" +specify a config directory. +If both +.B -f +and +.B -F +are specified, the config file will be read and converted to +config directory format and written to the specified directory. +If neither option is specified, an attempt to read the +default config directory wll be made before trying to use the default +config file. If a valid config directory exists then the +default config file is ignored. +.TP .BI \-D " authcDN" specify a DN to be used as identity through the test session when selecting appropriate diff --git a/doc/man/man8/slapadd.8 b/doc/man/man8/slapadd.8 index 818f77cbe9..6235288905 100644 --- a/doc/man/man8/slapadd.8 +++ b/doc/man/man8/slapadd.8 @@ -15,6 +15,7 @@ slapadd \- Add entries to a SLAPD database .B [\-b suffix] .B [\-n dbnum] .B [\-f slapd.conf] +.B [\-F confdir] .B [\-l ldif-file] .SH DESCRIPTION .LP @@ -85,6 +86,20 @@ specify an alternative .BR slapd.conf (5) file. .TP +.BI \-F " confdir" +specify a config directory. +If both +.B -f +and +.B -F +are specified, the config file will be read and converted to +config directory format and written to the specified directory. +If neither option is specified, an attempt to read the +default config directory wll be made before trying to use the default +config file. If a valid config directory exists then the +default config file is ignored. If dryrun mode is also specified, +no conversion will occur. +.TP .BI \-l " ldif-file" Read LDIF from the specified file instead of standard input. .SH LIMITATIONS diff --git a/doc/man/man8/slapindex.8 b/doc/man/man8/slapindex.8 index f99d09d3fb..57a0391efa 100644 --- a/doc/man/man8/slapindex.8 +++ b/doc/man/man8/slapindex.8 @@ -13,6 +13,7 @@ slapindex \- SLAPD index to LDIF utility .B [\-b suffix] .B [\-n dbnum] .B [\-f slapd.conf] +.B [\-F confdir] .B .LP .SH DESCRIPTION @@ -63,6 +64,19 @@ option. specify an alternative .BR slapd.conf (5) file. +.TP +.BI \-F " confdir" +specify a config directory. +If both +.B -f +and +.B -F +are specified, the config file will be read and converted to +config directory format and written to the specified directory. +If neither option is specified, an attempt to read the +default config directory wll be made before trying to use the default +config file. If a valid config directory exists then the +default config file is ignored. .SH LIMITATIONS Your .BR slapd (8) diff --git a/doc/man/man8/slaptest.8 b/doc/man/man8/slaptest.8 index cdedb9479c..ccdfa43b94 100644 --- a/doc/man/man8/slaptest.8 +++ b/doc/man/man8/slaptest.8 @@ -45,8 +45,7 @@ If neither option is specified, slaptest will attempt to read the default config directory before trying to use the default config file. If a valid config directory exists then the default config file is ignored. If dryrun mode is also specified, -no conversion will occur. All of the slap tools that -use the config options observe this same behavior. +no conversion will occur. .TP .B \-u enable dryrun mode (i.e. don't fail if databases cannot be opened, -- 2.39.5