Allow TLS connections to LDAP on Windows.

The comment no longer applies, TLS seems to work fine for LDAP
connections on Windows. Closes bug #2827 - Feature request: Add
TLS/SSL support for LDAP server access

diff --git a/src/editldap.c b/src/editldap.c
index f9ebb5b09382da21465f5426e3984d709b43c832..47d702ea81762e2719dc6a5664d6dc8d65cc1c88 100644 (file)
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -480,9 +480,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
                "If connection fails, be sure to check the correct "
                "configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)." ));
 
                "If connection fails, be sure to check the correct "
                "configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)." ));
 

-#ifdef G_OS_UNIX /* Win32's ldap_start_tls_s() does not work, for some reason. */

        gtk_box_pack_start (GTK_BOX (hbox_spin), enable_tls_checkbtn, TRUE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (hbox_spin), enable_tls_checkbtn, TRUE, FALSE, 0);

-#endif

        gtk_box_pack_start (GTK_BOX (hbox_spin), enable_ssl_checkbtn, TRUE, FALSE, 0);
 #endif
 
        gtk_box_pack_start (GTK_BOX (hbox_spin), enable_ssl_checkbtn, TRUE, FALSE, 0);
 #endif