From: Timo Sirainen <tss@iki.fi>
Date: Wed, 20 Mar 2013 19:13:20 +0000 (+0200)
Subject: doveadm pw -t: Don't ask for password if -p is also specified.
X-Git-Tag: 2.2.rc3~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6debde4e52a172ecfa48666a41d3f1c44d958bd;p=thirdparty%2Fdovecot%2Fcore.git

doveadm pw -t: Don't ask for password if -p is also specified.
Patch by Paul Wallingford.
---

diff --git a/src/doveadm/doveadm-pw.c b/src/doveadm/doveadm-pw.c
index f4e617d5be..cac4dfed4c 100644
--- a/src/doveadm/doveadm-pw.c
+++ b/src/doveadm/doveadm-pw.c
@@ -78,7 +78,7 @@ static void cmd_pw(int argc, char *argv[])
 	if (rounds > 0)
 		password_set_encryption_rounds(rounds);
 
-	if (test_hash != NULL)
+	if (test_hash != NULL && plaintext == NULL)
 		plaintext = t_askpass("Enter password to verify: ");
 	while (plaintext == NULL) {
 		const char *check;