[Commits] [SCM] claws branch, master, updated. 3.15.0-201-g9df59ba

[ticho at claws-mail.org]

The branch, master has been updated
       via  9df59ba02584ad43521cac0bcf434ee6fadb5a6e (commit)
      from  5805ff8180e298a04a4c99ab57374cf87e273c11 (commit)

Summary of changes:
 src/addressbook.c |    4 +++-
 src/compose.c     |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 9df59ba02584ad43521cac0bcf434ee6fadb5a6e
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Dec 14 23:24:20 2017 +0100

    Add proper ifdefs around master_passphrase() calls.

diff --git a/src/addressbook.c b/src/addressbook.c
index fef1ee1..a1544d9 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -4731,14 +4731,16 @@ static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
 		ldap_ctl = ldap_server->control;
 		if (ldap_ctl != NULL &&
 				ldap_ctl->bindDN != NULL && strlen(ldap_ctl->bindDN) > 0) {
+#ifndef PASSWORD_CRYPTO_OLD
 			/* LDAP server is password-protected. */
 			if (master_passphrase() == NULL) {
 				/* User did not enter master passphrase, do not start a search. */
 				return;
 			}
+#endif /* PASSWORD_CRYPTO_OLD */
 		}
 	}
-#endif
+#endif /* USE_LDAP */
 
 	searchTerm =
 		gtk_editable_get_chars( GTK_EDITABLE(addrbook.entry), 0, -1 );
diff --git a/src/compose.c b/src/compose.c
index 1938aad..3841d82 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -7246,6 +7246,7 @@ static void compose_create_header_entry(Compose *compose)
 			 NULL);
 
 #ifdef USE_LDAP
+#ifndef PASSWORD_CRYPTO_OLD
 	GSList *pwd_servers = addrindex_get_password_protected_ldap_servers();
 	if (pwd_servers != NULL && master_passphrase() == NULL) {
 		gboolean enable = FALSE;
@@ -7258,7 +7259,8 @@ static void compose_create_header_entry(Compose *compose)
 		g_slist_foreach(pwd_servers, _ldap_srv_func, &enable);
 		compose->passworded_ldap_servers = pwd_servers;
 	}
-#endif
+#endif /* PASSWORD_CRYPTO_OLD */
+#endif /* USE_LDAP */
 
 	address_completion_register_entry(GTK_ENTRY(entry), TRUE);
 

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


hooks/post-receive
-- 
Claws Mail