summaryrefslogtreecommitdiff
path: root/src/share/mh
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-18 20:38:23 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-18 20:38:23 -0500
commit88b19565bced6d9ec9b035d1f9fe51ce6567923b (patch)
tree042534e65458a9d0dcdbd7b7d1b75f6fd7af9a95 /src/share/mh
parenteff43adce6a763d622fcc254e7cdc210d4573103 (diff)
add no-tty, quiet, and no-greeting to gpg wrapper invocations to supress as much gpg output as possible. then cleanup gpg invocations.
Diffstat (limited to 'src/share/mh')
-rw-r--r--src/share/mh/add_revoker4
-rw-r--r--src/share/mh/import_key2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index b4113df..dfce4e1 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -57,10 +57,10 @@ else
# download the key from the keyserver as the monkeysphere user
su_monkeysphere_user \
- "GNUPGHOME=$TMPLOC gpg --keyserver $KEYSERVER --recv-key 0x${keyID}!"
+ "GNUPGHOME=$TMPLOC gpg --quiet --keyserver $KEYSERVER --recv-key 0x${keyID}!"
# export the new key to the host keyring
- su_monkeysphere_user "GNUPGHOME=$TMPLOC gpg --export 0x${keyID}!" \
+ su_monkeysphere_user "GNUPGHOME=$TMPLOC gpg --quiet --export 0x${keyID}!" \
| gpg_host --import
fi
diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 557bb7f..266bf05 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -46,7 +46,7 @@ chmod 700 "${GNUPGHOME_HOST}"
log verbose "importing ssh key..."
# translate ssh key to a private key
PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \
- | gpg_host --import 2>&1 | log debug
+ | gpg_host --import
# load the new host fpr into the fpr variable. this is so we can
# create the gpg pub key file. we have to do this from the secret key