From 8ec15dd39c8d22d7d8c8cc241d3b7297d4412ea7 Mon Sep 17 00:00:00 2001 From: Gavin Henry Date: Wed, 28 Jan 2009 23:02:04 +0000 Subject: [PATCH] (ITS#5828) Some slap* man pages only talk about slapd.conf --- doc/man/man8/slapacl.8 | 6 ++++-- doc/man/man8/slapauth.8 | 8 +++++--- doc/man/man8/slapdn.8 | 2 +- doc/man/man8/slappasswd.8 | 7 +++++-- doc/man/man8/slaptest.8 | 6 ++++-- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/doc/man/man8/slapacl.8 b/doc/man/man8/slapacl.8 index 4aff6baf21..350e0042e6 100644 --- a/doc/man/man8/slapacl.8 +++ b/doc/man/man8/slapacl.8 @@ -24,8 +24,10 @@ according to ACLs, as specified in .BR slapd.access (5). It opens the .BR slapd.conf (5) -configuration file, reads in the -.B access +configuration file or the +.BR slapd-config (5) +backend, reads in the +.B access/olcAccess directives, and then parses the .B attr list given on the command-line; if none is given, access to the diff --git a/doc/man/man8/slapauth.8 b/doc/man/man8/slapauth.8 index d4112af601..e7a8b82ffb 100644 --- a/doc/man/man8/slapauth.8 +++ b/doc/man/man8/slapauth.8 @@ -24,10 +24,12 @@ for authentication and authorization purposes, as specified in .BR slapd.conf (5). It opens the .BR slapd.conf (5) -configuration file, reads in the -.B authz-policy +configuration file or the +.BR slapd-config (5) +backend, reads in the +.B authz-policy/olcAuthzPolicy and -.B authz-regexp +.B authz-regexp/olcAuthzRegexp directives, and then parses the .B ID list given on the command-line. diff --git a/doc/man/man8/slapdn.8 b/doc/man/man8/slapdn.8 index 5ee0d2a126..c9b14d7212 100644 --- a/doc/man/man8/slapdn.8 +++ b/doc/man/man8/slapdn.8 @@ -23,7 +23,7 @@ and that loaded via .BR slapd.conf (5). It opens the .BR slapd.conf (5) -configuration file, reads in the schema definitions, and then +configuration file or the slapd-config (5) backend, reads in the schema definitions, and then parses the .B DN list given on the command-line. diff --git a/doc/man/man8/slappasswd.8 b/doc/man/man8/slappasswd.8 index 3ee6706f05..36b468fa14 100644 --- a/doc/man/man8/slappasswd.8 +++ b/doc/man/man8/slappasswd.8 @@ -19,11 +19,14 @@ slappasswd \- OpenLDAP password utility .B Slappasswd is used to generate an userPassword value suitable for use with -.BR ldapmodify (1) -or +.BR ldapmodify (1), .BR slapd.conf (5) .I rootpw +configuration directive or the +.BR slapd-config (5) +.I olcRootPW configuration directive. +. .SH OPTIONS .TP .B \-v diff --git a/doc/man/man8/slaptest.8 b/doc/man/man8/slaptest.8 index 8059f8f8e9..3f43c5595f 100644 --- a/doc/man/man8/slaptest.8 +++ b/doc/man/man8/slaptest.8 @@ -21,8 +21,10 @@ is used to check the conformance of the configuration file. It opens the .BR slapd.conf (5) -configuration file, and parses it according to the general -and the backend-specific rules, checking its sanity. +configuration file or the +.BR slapd-config (5) +backend, and parses it according to the general and the backend-specific +rules, checking its sanity. .LP .SH OPTIONS .TP -- 2.39.5