X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fadd_hostname;h=c1b32a9cccc3bd7aadbd696c64c2da0ea0ce3749;hb=b5913c4e5fe08f332317221ad05e60ec4d51b39d;hp=46326bb998e0544f2f5ff901940b48afbc4d87b5;hpb=9cc92238a9a9b21d37b983932d5a6a012cf80aba;p=monkeysphere.git

diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname
index 46326bb..c1b32a9 100644
--- a/src/share/mh/add_hostname
+++ b/src/share/mh/add_hostname
@@ -28,28 +28,27 @@ 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."
 
-echo "The following user ID will be added to the host key:"
-echo "  $userID"
-read -p "Are you sure you would like to add this user ID? (y/N) " OK; OK=${OK:=N}
-if [ ${OK/y/Y} != 'Y' ] ; then
-    failure "User ID not added."
+if [ "$PROMPT" = "true" ] ; then
+    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
+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 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
 
     show_key