Merge commit 'jrollins/master'

diff --git a/src/subcommands/ma/add-certifier b/src/subcommands/ma/add-certifier
index 3bd800c25cd6ee8cd4f2c6a0899ead07e738bb60..451506d1cecfbc70670ad9d4a8bf366cceb815d0 100755 (executable)
--- a/src/subcommands/ma/add-certifier
+++ b/src/subcommands/ma/add-certifier
@@ -13,6 +13,8 @@
 # retrieve key from web of trust, import it into the host keyring, and
 # ltsign the key in the host keyring so that it may certify other keys
 
+add_certifier() {
+
 local domain
 local trust
 local depth
@@ -139,3 +141,5 @@ if echo "$ltsignCommand" | \
 else
     failure "Problem adding identify certifier."
 fi
+
+}

diff --git a/src/subcommands/ma/diagnostics b/src/subcommands/ma/diagnostics
index b6003b02a60540f113c85c83aee5f5e8c1a5f734..66aa6b4060403793a37fe541835eba7180034084 100755 (executable)
--- a/src/subcommands/ma/diagnostics
+++ b/src/subcommands/ma/diagnostics
@@ -10,7 +10,10 @@
 # They are Copyright 2008, and are all released under the GPL, version 3
 # or later.
 
-#  * check on the status and validity of the key and public certificates
+# check on the status and validity of the key and public certificates
+
+diagnostics() {
+
 local seckey
 local keysfound
 local curdate
@@ -177,3 +180,5 @@ if [ "$problemsfound" -gt 0 ]; then
 else
     echo "Everything seems to be in order!"
 fi
+
+}

diff --git a/src/subcommands/ma/list-certifiers b/src/subcommands/ma/list-certifiers
index 789d553225789716a72c01308a87eb2c5f112b92..e920888eb60faa0c41f08251ab7cc1fe63b60f26 100755 (executable)
--- a/src/subcommands/ma/list-certifiers
+++ b/src/subcommands/ma/list-certifiers
@@ -12,6 +12,8 @@
 
 # list the host certifiers
 
+list_certifiers() {
+
 local keys
 local key
 
@@ -23,3 +25,5 @@ keys=$(gpg_authentication "--no-options --list-options show-uid-validity --keyri
 for key in $keys ; do
     gpg_authentication "--no-options --list-options show-uid-validity --keyring ${GNUPGHOME_AUTHENTICATION}/pubring.gpg --list-key --fingerprint $key"
 done
+
+}

diff --git a/src/subcommands/ma/remove-certifier b/src/subcommands/ma/remove-certifier
index a4eaf548ad5c872810eeaaccd2359dccd553a203..117bad4d0aaa7ed5265b6a63603608dd86fe8ca1 100755 (executable)
--- a/src/subcommands/ma/remove-certifier
+++ b/src/subcommands/ma/remove-certifier
@@ -12,6 +12,8 @@
 
 # delete a certifiers key from the host keyring
 
+remove_certifier() {
+
 local keyID
 local fingerprint
 
@@ -43,3 +45,4 @@ else
     failure "Problem removing identity certifier."
 fi
 
+}

diff --git a/src/subcommands/ma/update-users b/src/subcommands/ma/update-users
index a26d3fbdd0d5732935787fee50e75dcf2f955e07..086136403638fe492a3f462c7e0f7bd4e728b480 100755 (executable)
--- a/src/subcommands/ma/update-users
+++ b/src/subcommands/ma/update-users
@@ -10,6 +10,8 @@
 # They are Copyright 2008, and are all released under the GPL, version 3
 # or later.
 
+update_users() {
+
 if [ "$1" ] ; then
     # get users from command line
     unames="$@"
@@ -141,4 +143,6 @@ for uname in $unames ; do
 
     # destroy temporary directory
     rm -rf "$TMPLOC"
- done
+done
+
+}

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 8558441a9499b00bcf9750ef56dadeb274cc841c..72b913823761d1d099da1df7c5a9817d6a999fe6 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"
@@ -100,3 +102,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 ac67711742859ad20e898fc2c45248d9fafd35f9..9ba51d24dfb26f99c1d9b600784ba5311ba56ab9 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
@@ -82,3 +84,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