diff --git a/ChangeLog b/ChangeLog index e3c860849b40acdfee51a97dd612cbe3f2d4dcb3..5de8552320c4595142bd7332ac428ba14d1a9e89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,9 @@ version 0.9.8 -- UNRELEASED doc changes manpage: . Fix typo in manpage (Closes: #583778) + ldap: + . Add ssl option description, fix tls option description (Closes + Roundup bug #2407) version 0.9.7 -- January 27, 2010 backupninja changes diff --git a/examples/example.ldap b/examples/example.ldap index 3a962f1d2d6a43d13bf1f9f0915049431c6c545f..174ed1d405aa37aa14abf65c15f7a48a41e65d3c 100644 --- a/examples/example.ldap +++ b/examples/example.ldap @@ -46,6 +46,11 @@ ## ldaphost (no default): set this to your ldap host if it is not local # ldaphost = -## tls (default yes): if set to 'yes' then TLS connection will be -## attempted to your ldaphost by using the URI base ldaps: otherwise ldap: will be used -# tls = yes +## ssl (default yes): if set to 'yes' then SSL connection will be +## attempted to your ldaphost by using ldaps:// +# ssl = yes + +## tls (default no): if set to 'yes' then TLS connection will be +## attempted to your ldaphost by using TLS extended operations (RFC2246, +## RFC2830) +# tls = no