From 4b3f97e4d46905411e31cb86e15337f606fdf30c Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Sat, 2 Mar 2013 20:31:07 -0500
Subject: [PATCH] pwmc: fix prompting with pinentry when no --new-key-file was
 specified.

---
 src/pwmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pwmc.c b/src/pwmc.c
index 51532cd0..c511ae4a 100644
--- a/src/pwmc.c
+++ b/src/pwmc.c
@@ -323,7 +323,7 @@ inquire_cb (void *user, const char *keyword, gpg_error_t rc,
 	    pwmd_setopt (pwm, PWMD_OPTION_NO_PINENTRY, 0);
 	}
     }
-  else if (is_password && !keyfile)
+  else if ((is_password && !keyfile) || (is_newpassword && !new_keyfile))
     {
       char *tmp;
 
-- 
2.11.4.GIT