ensure proper usage flags on new hostname selfsigs

[monkeysphere.git] / src / share / mh / add_hostname

diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname
index 9465d9635ac0bab68034c9ac29ef9356d7f80fd3..c1b32a9cccc3bd7aadbd696c64c2da0ea0ce3749 100644 (file)
--- a/src/share/mh/add_hostname
+++ b/src/share/mh/add_hostname
@@ -28,7 +28,7 @@ fi
 userID="ssh://${1}"
 
 # test that the desired user ID does not already exist
-find_host_userid > /dev/null && \
+find_host_userid "$userID" && \
     failure "Host userID '$userID' already exists."
 
 if [ "$PROMPT" = "true" ] ; then
@@ -41,16 +41,12 @@ else
     log debug "adding user ID without prompting."
 fi
 
-# edit-key script command to add user ID
-adduidCommand="adduid
-$userID
-
-
-save"
-# end script
-
 # execute edit-key script
-if echo "$adduidCommand" | gpg_host_edit ; then
+if PEM2OPENPGP_USAGE_FLAGS=authenticate \
+    <"$GNUPGHOME_HOST/secring.gpg" \
+    "$SYSSHAREDIR/keytrans" adduserid \
+    "$HOST_FINGERPRINT" "$userID" | gpg_host --import ; then
+    gpg_host --check-trustdb
 
     update_gpg_pub_file