more moving to subfunctions, and rename of show-key

diff --git a/src/subcommands/mh/add-hostname b/src/subcommands/mh/add-hostname
index 7726a298384d2ff6842ac0945391ef050e428bb6..591f52ee4a90d987e2a590df134c0cfb22bd4b45 100755 (executable)
--- 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 9f260873362031dd638f48cbe2259f311caaef9b..df57457f0b73e83329d7678d4609966879dc3fe3 100755 (executable)
--- 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 d60e982c38a047852b3c4b51620f888674a838c7..d8ab9df51b8c726c5da6b54ad487292f906300c7 100755 (executable)
--- 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 0a773a31a6de9b1f41562a6b4493b56c419e9ad4..01f6ee075ab58924f11dadf59ed9f6f80d7c391a 100755 (executable)
--- 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