From 6e2a9468cf66b2b58ab4340eb00dda352ee8f613 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Mon, 14 Jun 2010 19:13:49 +0200
Subject: [PATCH] Fix ssl and tls options description (Closes Roundup bug
#2407)
---
ChangeLog | 3 +++
examples/example.ldap | 11 ++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e3c86084..5de85523 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 3a962f1d..174ed1d4 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
--
GitLab