[evolution-data-server] Bug #593953 - LDAP - first unset SSL mode, then try to change it



commit 57dc11ea978c28d2f03d866ca8ea84a39f6704f0
Author: Milan Crha <mcrha redhat com>
Date:   Tue Oct 20 19:59:55 2009 +0200

    Bug #593953 - LDAP - first unset SSL mode, then try to change it

 addressbook/backends/ldap/e-book-backend-ldap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 61c4cc0..cb4c2d4 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -5055,6 +5055,8 @@ e_book_backend_ldap_load_source (EBookBackend             *backend,
 	if (str)
 		limit = atoi (str);
 
+	bl->priv->use_tls = E_BOOK_BACKEND_LDAP_TLS_NO;
+
 	str = e_source_get_property (source, "ssl");
 	if (str) {
 		if (!strcmp (str, "always"))
@@ -5064,8 +5066,6 @@ e_book_backend_ldap_load_source (EBookBackend             *backend,
 		else if (strcmp (str, "never"))
 			g_warning ("Unhandled value for 'ssl', not using it.");
 	}
-	else
-		bl->priv->use_tls = E_BOOK_BACKEND_LDAP_TLS_NO;
 
 	str = e_source_get_property (source, "timeout");
 	if (str)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]