From: Andrej Kacian <ticho@claws-mail.org>
Date: Thu, 14 Dec 2017 22:24:20 +0000 (+0100)
Subject: Add proper ifdefs around master_passphrase() calls.
X-Git-Tag: 3.16.0~3
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=9df59ba02584ad43521cac0bcf434ee6fadb5a6e

Add proper ifdefs around master_passphrase() calls.
---

diff --git a/src/addressbook.c b/src/addressbook.c
index fef1ee1e8..a1544d9eb 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 1938aadbf..3841d828b 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);