From 71abb6af15fea365d368ee791a87e809345aff1e Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Fri, 31 Dec 2010 12:43:38 -0500
Subject: [PATCH] pwmc: prevent showing the inquire help text when using a
 keyfile.

---
 src/pwmc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pwmc.c b/src/pwmc.c
index 7bcf3621..632ab553 100644
--- a/src/pwmc.c
+++ b/src/pwmc.c
@@ -73,6 +73,7 @@ static int interactive;
 
 #define DEFAULT_PORT	22
 
+static int in_keyfile;
 static int no_pinentry;
 static pwm_t *pwm;
 static char *filename;
@@ -248,7 +249,7 @@ static gpg_error_t inquire_cb(void *user, const char *cmd, gpg_error_t rc,
     if (rc)
 	return rc;
 
-    if (interactive == 1) {
+    if (interactive == 1 && !in_keyfile) {
 	interactive++;
 	fprintf(stderr, N_(
 "------------------------------------------------------------------------------\n"
@@ -1552,7 +1553,9 @@ do_open:
 		goto done;
 	    }
 
+	    in_keyfile = 1;
 	    error = pwmd_open_inquire(pwm, filename, inquire_cb, &inq);
+	    in_keyfile = 0;
 	    pwmd_free(inq.line);
 	    close(inq.fd);
 
-- 
2.11.4.GIT