[evolution-data-server] Fix for bug #624789, use ldapssl_init to initialize SSL connection for sunldap.

[Jeff Cai <jeffcai src gnome org>]

commit d7be2e48617f875740d5cde2b0fd89db7820f1dc
Author: Jeff Cai <jeff cai sun com>
Date:   Mon Aug 16 14:43:07 2010 +0800

    Fix for bug #624789, use ldapssl_init to initialize SSL connection for
    sunldap.

 addressbook/backends/ldap/e-book-backend-ldap.c |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index a0bc23b..ea1f6b4 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -814,10 +814,13 @@ e_book_backend_ldap_connect (EBookBackendLDAP *bl)
 	if (bl->priv->use_tls != E_BOOK_BACKEND_LDAP_TLS_NO) {
 		const gchar *user_data_dir = e_get_user_data_dir ();
 		ldap_flag = ldapssl_client_init (user_data_dir, NULL);
+		blpriv->ldap = ldapssl_init (blpriv->ldap_host, blpriv->ldap_port, 1);
 	}
-#endif
-
+	else
+		blpriv->ldap = ldap_init (blpriv->ldap_host, blpriv->ldap_port);
+#else
 	blpriv->ldap = ldap_init (blpriv->ldap_host, blpriv->ldap_port);
+#endif
 
 	if (NULL != blpriv->ldap) {
 		gint ldap_error;
@@ -848,13 +851,7 @@ e_book_backend_ldap_connect (EBookBackendLDAP *bl)
 
 			if (bl->priv->ldap_port == LDAPS_PORT && bl->priv->use_tls == E_BOOK_BACKEND_LDAP_TLS_ALWAYS) {
 #ifdef SUNLDAP
-				if (ldap_flag >= 0) {
-					ldap_error = ldapssl_install_routines (blpriv->ldap);
-				} else
-					ldap_error = LDAP_NOT_SUPPORTED;
-
 				if (LDAP_SUCCESS == ldap_error) {
-					ldap_error = ldap_set_option (blpriv->ldap, LDAP_OPT_SSL, LDAP_OPT_ON );
 					ldap_set_option(blpriv->ldap, LDAP_OPT_RECONNECT, LDAP_OPT_ON );
 				}
 #else
@@ -870,13 +867,7 @@ e_book_backend_ldap_connect (EBookBackendLDAP *bl)
 			}
 			else if (bl->priv->use_tls) {
 #ifdef SUNLDAP
-				if (ldap_flag >= 0) {
-					ldap_error = ldapssl_install_routines (blpriv->ldap);
-				} else
-					ldap_error = LDAP_NOT_SUPPORTED;
-
 				if (LDAP_SUCCESS == ldap_error) {
-					ldap_error = ldap_set_option (blpriv->ldap, LDAP_OPT_SSL, LDAP_OPT_ON );
 					ldap_set_option(blpriv->ldap, LDAP_OPT_RECONNECT, LDAP_OPT_ON );
 				}
 #else