X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=doc%2Fman%2Fman5%2Fldap.conf.5;h=8c67bc0ae3f587422473c95c6fd717ac9dfc414e;hb=18afc2446d3e3901b4a0e98843cb24a95b56a4b3;hp=7f5bc64711e426c9bc7d2382f440dc553c1523da;hpb=d14b05159e1acc6b5dcb27437714d12bb546140f;p=openldap

diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
index 7f5bc64711..8c67bc0ae3 100644
--- a/doc/man/man5/ldap.conf.5
+++ b/doc/man/man5/ldap.conf.5
@@ -1,6 +1,6 @@
 .TH LDAP.CONF 5 "RELEASEDATE" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
-.\" Copyright 1998-2013 The OpenLDAP Foundation All Rights Reserved.
+.\" Copyright 1998-2018 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .SH NAME
 ldap.conf, .ldaprc \- LDAP configuration file/environment variables
@@ -85,7 +85,7 @@ For example,
 	# Right - DN syntax needs quoting for Example, Inc:
 	BASE    ou=IT staff,o="Example, Inc",c=US
 	# or:
-	BASE    ou=IT staff,o=Example2C Inc,c=US
+	BASE    ou=IT staff,o=Example\\2C Inc,c=US
 
 	# Wrong - comment on same line as option:
 	DEREF   never           # Never follow aliases
@@ -220,11 +220,9 @@ there are more options you can specify.
 .TP
 .B SASL_MECH <mechanism>
 Specifies the SASL mechanism to use.
-.B This is a user-only option.
 .TP
 .B SASL_REALM <realm>
 Specifies the SASL realm.
-.B This is a user-only option.
 .TP
 .B SASL_AUTHCID <authcid>
 Specifies the authentication identity.
@@ -284,6 +282,9 @@ description).  The default is
 specifies the maximum security layer receive buffer
 size allowed.  0 disables security layers.  The default is 65536.
 .RE
+.TP
+.B SASL_NOCANON <on/true/yes/off/false/no>
+Do not perform reverse DNS lookups to canonicalize SASL host names. The default is off.
 .SH GSSAPI OPTIONS
 If OpenLDAP is built with Generic Security Services Application Programming Interface support,
 there are more options you can specify.
@@ -338,9 +339,9 @@ token name first, followed by a colon:
 .nf
 	TLS_CERT my hardware device:Certificate for Sam Carter
 .fi
-Use certutil -L to list the certificates by name:
+Use certutil \-L to list the certificates by name:
 .nf
-	certutil -d /path/to/certdbdir -L
+	certutil \-d /path/to/certdbdir \-L
 .fi
 .TP
 .B TLS_KEY <filename>
@@ -358,7 +359,7 @@ database.  For example, if TLS_CACERTDIR specifies /home/scarter/.moznss as
 the location of the cert/key database, use modutil to change the password
 to the empty string:
 .nf
-	modutil -dbdir ~/.moznss -changepw 'NSS Certificate DB'
+	modutil \-dbdir ~/.moznss \-changepw 'NSS Certificate DB'
 .fi
 You must have the old password, if any.  Ignore the WARNING about the running
 browser.  Press 'Enter' for the new password.