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

---
 libsylph/pop.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'libsylph/pop.c')

diff --git a/libsylph/pop.c b/libsylph/pop.c
index a387f5e..96f347e 100644
--- a/libsylph/pop.c
+++ b/libsylph/pop.c
@@ -438,14 +438,10 @@ Session *pop3_session_new(PrefsAccount *account)
 	session->error_msg = NULL;
 
 	session->user = g_strdup(account->userid);
-	if (master_password_active()) {
-		session->pass = account->passwd ? decrypt_with_master_password(
-			account->passwd) : account->tmp_pass ? g_strdup(
-				account->tmp_pass) : NULL;
-	} else {
-		session->pass = account->passwd ? g_strdup(account->passwd) :
-			account->tmp_pass ? g_strdup(account->tmp_pass) : NULL;
-	}
+	/* TODO:  check format */
+	session->pass = account->passwd ? decrypt_with_master_password(
+		account->passwd) : account->tmp_pass ? g_strdup(
+			account->tmp_pass) : NULL;
 
 	SESSION(session)->server = g_strdup(account->recv_server);
 
-- 
cgit v1.3