From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 31 Jan 2009 23:33:07 +0000 (-0500)
Subject: more moving to subfunctions, and rename of show-key
X-Git-Tag: monkeysphere_0.23~158^2~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=c7abef25b0cb36c04d12619659b7f0ad1b410c9a;p=monkeysphere.git

more moving to subfunctions, and rename of show-key
---

diff --git a/src/subcommands/mh/add-hostname b/src/subcommands/mh/add-hostname
index 7726a29..591f52e 100755
--- a/src/subcommands/mh/add-hostname
+++ b/src/subcommands/mh/add-hostname
@@ -60,9 +60,6 @@ EOF
 if echo "$adduidCommand" | \
     gpg_host --quiet --command-fd 0 --edit-key "0x${fingerprint}!" ; then
 
-    # update the trustdb for the authentication keyring
-    gpg_authentication "--check-trustdb"
-
     show_key
 
     echo
diff --git a/src/subcommands/mh/gen-key b/src/subcommands/mh/gen-key
index 9f26087..df57457 100755
--- a/src/subcommands/mh/gen-key
+++ b/src/subcommands/mh/gen-key
@@ -10,6 +10,8 @@
 # They are Copyright 2008, and are all released under the GPL, version 3
 # or later.
 
+gen_key() {
+
 local keyType="RSA"
 local keyLength="2048"
 local keyUsage="auth"
@@ -102,3 +104,5 @@ log info "SSH host public key in OpenPGP form: ${SYSDATADIR}/ssh_host_rsa_key.pu
 
 # show info about new key
 show_key
+
+}
diff --git a/src/subcommands/mh/import-key b/src/subcommands/mh/import-key
index d60e982..d8ab9df 100755
--- a/src/subcommands/mh/import-key
+++ b/src/subcommands/mh/import-key
@@ -10,6 +10,8 @@
 # They are Copyright 2008, and are all released under the GPL, version 3
 # or later.
 
+import_key() {
+
 local hostName=$(hostname -f)
 local keyFile="/etc/ssh/ssh_host_rsa_key"
 local keyExpire
@@ -83,3 +85,5 @@ log info "SSH host public key in OpenPGP form: ${SYSDATADIR}/ssh_host_rsa_key.pu
 
 # show info about new key
 show_key
+
+}
diff --git a/src/subcommands/mh/revoke-hostname b/src/subcommands/mh/revoke-hostname
index 0a773a3..01f6ee0 100755
--- a/src/subcommands/mh/revoke-hostname
+++ b/src/subcommands/mh/revoke-hostname
@@ -78,9 +78,6 @@ EOF
 if echo "$revuidCommand" | \
     gpg_host --quiet --command-fd 0 --edit-key "0x${fingerprint}!" ; then
 
-    # update the trustdb for the authentication keyring
-    gpg_authentication "--check-trustdb"
-
     show_key
 
     echo