X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fadd_hostname;h=136b6788ffbc9b700f1ea4110060c05a3f3684e1;hb=80f608dfb8cd0a59609f3c98834e44f0c78fffb0;hp=ec741ee5a114f8eb99cfc3e99f15d6a202c91a18;hpb=ab955c8153674a61b20671dad7e83cd9c4eb7043;p=monkeysphere.git

diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname
index ec741ee..136b678 100644
--- a/src/share/mh/add_hostname
+++ b/src/share/mh/add_hostname
@@ -28,15 +28,12 @@ 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
-    cat <<EOF
-The following user ID will be added to the host key:
-  $userID
-EOF
-    read -p "Are you sure you would like to add this user ID? (Y/n) " OK; OK=${OK:=Y}
+    printf "The following user ID will be added to the host key:\n  %s\nAre you sure you would like to add this user ID? (Y/n) " "$userID" >&2
+    read OK; OK=${OK:=Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then
 	failure "User ID not added."
     fi
@@ -44,18 +41,10 @@ else
     log debug "adding user ID without prompting."
 fi
 
-# edit-key script command to add user ID
-adduidCommand=$(cat <<EOF
-adduid
-$userID
-
-
-save
-EOF
-)
-
 # execute edit-key script
-if echo "$adduidCommand" | gpg_host_edit ; then
+if <"$GNUPGHOME_HOST/secring.gpg" "$SYSSHAREDIR/keytrans" adduserid \
+    "$HOST_FINGERPRINT" "$userID" | gpg_host --import ; then
+    gpg_host --check-trustdb
 
     update_gpg_pub_file