summaryrefslogtreecommitdiff
path: root/src/share/mh/add_hostname
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-08 23:55:28 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-08 23:55:28 -0500
commit9cc92238a9a9b21d37b983932d5a6a012cf80aba (patch)
tree7948c5f846a9509f8f43d62bab34c111fcac32d6 /src/share/mh/add_hostname
parent632c3943f9849824e92e217e3c4f8cf8e6ada148 (diff)
Some rearragement/cleanup in the monkeysphere-host:
- define exported variable to hold host key fingerprint (HOST_FINGERPRINT) - broke out some common commands into simpler functions - rename the 'extend_key' function to be 'set_expire', since function is more generically offered now.
Diffstat (limited to 'src/share/mh/add_hostname')
-rw-r--r--src/share/mh/add_hostname16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname
index 267f109..46326bb 100644
--- a/src/share/mh/add_hostname
+++ b/src/share/mh/add_hostname
@@ -27,18 +27,9 @@ fi
userID="ssh://${1}"
-fingerprint=$(fingerprint_host_key)
-
-# match to only ultimately trusted user IDs
-tmpuidMatch="u:$(echo $userID | gpg_escape)"
-
-# find the index of the requsted user ID
-# NOTE: this is based on circumstantial evidence that the order of
-# this output is the appropriate index
-if line=$(gpg_host --list-keys --with-colons --fixed-list-mode "0x${fingerprint}!" \
- | egrep '^(uid|uat):' | cut -f2,10 -d: | grep -n -x -F "$tmpuidMatch") ; then
+# test that the desired user ID does not already exist
+find_host_userid > /dev/null && \
failure "Host userID '$userID' already exists."
-fi
echo "The following user ID will be added to the host key:"
echo " $userID"
@@ -58,8 +49,7 @@ EOF
)
# execute edit-key script
-if echo "$adduidCommand" | \
- gpg_host --quiet --command-fd 0 --edit-key "0x${fingerprint}!" ; then
+if echo "$adduidCommand" | gpg_host_edit ; then
show_key