diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-02-17 23:33:55 -0500 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-02-17 23:33:55 -0500 |
| commit | 278c20f82d2ee0954a04b8daae5cbc2788c0015c (patch) | |
| tree | d38fb83491979a432d7cade2129d0a831ef8c148 /src/share/mh | |
| parent | ad44601e1869bc0bf3ce6ca88a7476379aa3c459 (diff) | |
| parent | c1924de73702d0f999a44bc63df9bee0d432636a (diff) | |
Merge commit 'jrollins/master'
Diffstat (limited to 'src/share/mh')
| -rw-r--r-- | src/share/mh/import_key | 4 | ||||
| -rw-r--r-- | src/share/mh/set_expire | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/share/mh/import_key b/src/share/mh/import_key index d14fc13..557bb7f 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 + | gpg_host --import 2>&1 | log debug # 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 @@ -57,6 +57,8 @@ load_fingerprint_secret # export to gpg public key to file update_gpg_pub_file +log info "host key imported:" + # show info about new key show_key diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire index 14d2501..ae7c13a 100644 --- a/src/share/mh/set_expire +++ b/src/share/mh/set_expire @@ -30,7 +30,7 @@ else log debug "extending without prompting." fi -log info "setting host key expiration to ${extendTo}:" +log info "setting host key expiration to ${extendTo}." log debug "executing host expire script..." gpg_host_edit expire <<EOF |