aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-06-14 19:13:49 +0200
committerintrigeri <intrigeri@boum.org>2010-06-14 19:16:34 +0200
commit6e2a9468cf66b2b58ab4340eb00dda352ee8f613 (patch)
tree6ceead8c509b036b518c79d2aa0d0884bd0cd6ad
parentaeca6912a8f67ecf69ba9b8a436a2a695e5f3acc (diff)
downloadbackupninja-6e2a9468cf66b2b58ab4340eb00dda352ee8f613.tar.gz
backupninja-6e2a9468cf66b2b58ab4340eb00dda352ee8f613.tar.bz2
Fix ssl and tls options description (Closes Roundup bug #2407)
-rw-r--r--ChangeLog3
-rw-r--r--examples/example.ldap11
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e3c8608..5de8552 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 3a962f1..174ed1d 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