diff options
| author | Martin Hedenfal <martinh@cvs.openbsd.org> | 2010-07-06 18:59:28 +0000 |
|---|---|---|
| committer | Martin Hedenfal <martinh@cvs.openbsd.org> | 2010-07-06 18:59:28 +0000 |
| commit | 24d3e23fa483281a542fa2a1d02280c5e1ec93f8 (patch) | |
| tree | b51292e4db9fb0d75eb6c770234cafa6e6162781 | |
| parent | ae641433c579651b835ba8996cf65089dfa3dcbb (diff) | |
Clarify differences between the 'include' and 'schema' keyword. And stress
the 'secure' keyword. Looks fine to jmc@, gilles@
| -rw-r--r-- | usr.sbin/ldapd/ldapd.conf.5 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/usr.sbin/ldapd/ldapd.conf.5 b/usr.sbin/ldapd/ldapd.conf.5 index 2a595e6aa4c..6af3d2f8cf9 100644 --- a/usr.sbin/ldapd/ldapd.conf.5 +++ b/usr.sbin/ldapd/ldapd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ldapd.conf.5,v 1.6 2010/06/30 20:36:57 martinh Exp $ +.\" $OpenBSD: ldapd.conf.5,v 1.7 2010/07/06 18:59:27 martinh Exp $ .\" .\" Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se> .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org> @@ -17,7 +17,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.Dd $Mdocdate: June 30 2010 $ +.Dd $Mdocdate: July 6 2010 $ .Dt LDAPD.CONF 5 .Os .Sh NAME @@ -57,6 +57,13 @@ keyword, for example: include "/etc/ldap/sub.namespace.conf" .Ed .Pp +Additional schema files can be included with the +.Ic schema +keyword, for example: +.Bd -literal -offset indent +schema "/etc/ldap/inetorgperson.schema" +.Ed +.Pp The syntax of .Nm is described below. @@ -98,7 +105,9 @@ is appended to form the certificate path and key path respectively. .Pp Only secured connections accept plain text password authentication. Connections using TLS or unix domain sockets are always considered secured. -The secure keyword can be used to mark an otherwise insecure connection +The +.Ic secure +keyword can be used to mark an otherwise insecure connection secured, e.g. if IPsec is used. .It referral Ar URL Specify a default referral. |