From 1b94aad4162c4c413233206518878eec0e531aeb Mon Sep 17 00:00:00 2001 From: Iris Morelle Date: Mon, 16 Apr 2018 23:58:45 -0300 Subject: [PATCH] campaignd: Remove last remaining trace of the master_password functionality (cherry-picked from commit 6d5f5d4299f41f54c979d2a5b785b4b26b9d2be2) --- src/campaign_server/campaign_server.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/campaign_server/campaign_server.cpp b/src/campaign_server/campaign_server.cpp index 80cbffaed3fa..5f305c26556b 100644 --- a/src/campaign_server/campaign_server.cpp +++ b/src/campaign_server/campaign_server.cpp @@ -949,10 +949,7 @@ void server::handle_delete(const server::request& req) return; } - if(!authenticate(campaign, pass) - && (campaigns()["master_password"].empty() - || campaigns()["master_password"] != pass)) - { + if(!authenticate(campaign, pass)) { send_error("The passphrase is incorrect.", req.sock); return; }