[Commits] [SCM] claws branch, master, updated. 3.16.0-3-g174c03f

[mones at claws-mail.org]

The branch, master has been updated
       via  174c03f1931636ba6a47415619c18ce5af572d69 (commit)
      from  49352499f77080f456760a90686f1e97dca51283 (commit)

Summary of changes:
 src/ldapserver.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 174c03f1931636ba6a47415619c18ce5af572d69
Author: Ricardo Mones <ricardo at mones.org>
Date:   Mon Dec 18 21:20:25 2017 +0100

    Fix Bug 3936: LDAP StartTLS does not work for addressbooks

diff --git a/src/ldapserver.c b/src/ldapserver.c
index 545e7f4..3872b1a 100644
--- a/src/ldapserver.c
+++ b/src/ldapserver.c
@@ -764,9 +764,10 @@ LDAP *ldapsvr_connect(LdapControl *ctl) {
 	cm_return_val_if_fail(ctl != NULL, NULL);
 
 	ldapsrv_set_options (ctl->timeOut, NULL);
-	uri = g_strdup_printf("ldap%s://%s:%d",
-				(ctl->enableSSL || ctl->enableTLS)?"s":"",
-				ctl->hostName, ctl->port);
+	if (ctl->enableSSL)
+		uri = g_strdup_printf("ldaps://%s:%d", ctl->hostName, ctl->port);
+	else
+		uri = g_strdup_printf("ldap://%s:%d", ctl->hostName, ctl->port);
 #ifdef G_OS_UNIX
 	ldap_initialize(&ld, uri);
 #else

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail