From c94746703a3e0b59372b3bbf9355112c6a85d2dc Mon Sep 17 00:00:00 2001
From: Simeon Simeonov
Date: Wed, 14 Mar 2018 12:18:31 +0100
Subject: Implement master password encrypted string tags

---
 src/send_message.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/send_message.c')

diff --git a/src/send_message.c b/src/send_message.c
index d5fc6e8..c0a7f59 100644
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -649,17 +649,14 @@ static gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp)
 
 		if (ac_prefs->smtp_userid) {
 			smtp_session->user = g_strdup(ac_prefs->smtp_userid);
-			if (ac_prefs->smtp_passwd)
-				if (master_password_active()) {
-					smtp_session->pass = decrypt_with_master_password(
-						ac_prefs->smtp_passwd);
-				} else {
-					smtp_session->pass = g_strdup(ac_prefs->smtp_passwd);
-				}
-			else if (ac_prefs->tmp_smtp_pass)
+			if (ac_prefs->smtp_passwd) {
+				/* TODO:  check if the format is correct */
+				smtp_session->pass = decrypt_with_master_password(
+					ac_prefs->smtp_passwd);
+			} else if (ac_prefs->tmp_smtp_pass) {
 				smtp_session->pass =
 					g_strdup(ac_prefs->tmp_smtp_pass);
-			else {
+			} else {
 				smtp_session->pass =
 					input_query_password
 						(ac_prefs->smtp_server,
-- 
cgit v1.3