dovecot-2.2: doveadm pw -t: Don't ask for password if -p is also...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/e511408bd991
changeset: 16079:e511408bd991
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Mar 20 21:13:20 2013 +0200
description:
doveadm pw -t: Don't ask for password if -p is also specified.
Patch by Paul Wallingford.

diffstat:

 src/doveadm/doveadm-pw.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 87a9eec10145 -r e511408bd991 src/doveadm/doveadm-pw.c
--- a/src/doveadm/doveadm-pw.c	Wed Mar 20 18:46:10 2013 +0200
+++ b/src/doveadm/doveadm-pw.c	Wed Mar 20 21:13:20 2013 +0200
@@ -78,7 +78,7 @@
 	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;