From cf8634d7f0634ee5939f2d4ec5319b3537966068 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Sat, 8 Jan 2011 11:28:43 -0500
Subject: [PATCH] Don't show the inquire header when not in interactive mode.

---
 po/libpwmd.pot | 25 +++++++++++++++----------
 src/pwmc.c     |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/po/libpwmd.pot b/po/libpwmd.pot
index cfb0da7c..448bd421 100644
--- a/po/libpwmd.pot
+++ b/po/libpwmd.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bjk@luxsci.net\n"
-"POT-Creation-Date: 2010-12-31 17:37-0500\n"
+"POT-Creation-Date: 2011-01-02 16:38-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -142,8 +142,8 @@ msgid ""
 "   --user <username>\n"
 "       SSH username (default is the invoking user)\n"
 "\n"
-"   --use-agent\n"
-"       use the SSH agent for authentication\n"
+"   --no-ssh-agent\n"
+"       disable SSH agent (enabled when SSH_AGENT_PID is set)\n"
 "\n"
 "   --identity, -i <filename>\n"
 "       SSH identity file (if not using the SSH agent)\n"
@@ -249,9 +249,10 @@ msgid ""
 "\n"
 "A url string (specified with --url) may be in the form of:\n"
 "    file://[path/to/socket]\n"
-"    ssh[46]://[username@]hostname[:port],identity[,known_hosts]\n"
+"    ssh[46]://[username@]hostname[:port],identity[,known_hosts] --no-ssh-"
+"agent\n"
 "    or\n"
-"    ssh[46]://[username@]hostname[:port][,,known_hosts] --use-agent\n"
+"    ssh[46]://[username@]hostname[:port][,,known_hosts]\n"
 msgstr ""
 
 #: src/pwmc.c:254
@@ -332,24 +333,28 @@ msgstr ""
 msgid "(c)ancel/(f)orget password/(s)ave/(Q)uit/(S)ave and quit/(h)elp?: "
 msgstr ""
 
-#: src/pwmc.c:762
+#: src/pwmc.c:761
+msgid "No filename was specified on the command line. Aborting.\n"
+msgstr ""
+
+#: src/pwmc.c:767
 msgid "Saving changes ...\n"
 msgstr ""
 
-#: src/pwmc.c:1295
+#: src/pwmc.c:1303
 msgid "Connecting ...\n"
 msgstr ""
 
-#: src/pwmc.c:1374
+#: src/pwmc.c:1382
 msgid "Connected.\n"
 msgstr ""
 
-#: src/pwmc.c:1544
+#: src/pwmc.c:1552
 #, c-format
 msgid "Opening data file \"%s\" ...\n"
 msgstr ""
 
-#: src/pwmc.c:1709
+#: src/pwmc.c:1717
 msgid "Connection closed.\n"
 msgstr ""
 
diff --git a/src/pwmc.c b/src/pwmc.c
index 32d5b4a6..973be744 100644
--- a/src/pwmc.c
+++ b/src/pwmc.c
@@ -249,7 +249,7 @@ static gpg_error_t inquire_cb(void *user, const char *cmd, gpg_error_t rc,
     if (rc)
 	return rc;
 
-    if (!in_keyfile) {
+    if (!in_keyfile && interactive) {
 	fprintf(stderr, N_(
 "------------------------------------------------------------------------------\n"
 "Press CTRL-D to end. Press twice on a non-empty line. Pressing ENTER after\n"
-- 
2.11.4.GIT