Merge commit 'jrollins/master'

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

diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname
index 70bbec3f535acc9149a6c401cc5682d7a88c8d7b..c1b32a9cccc3bd7aadbd696c64c2da0ea0ce3749 100644 (file)
--- a/src/share/mh/add_hostname
+++ b/src/share/mh/add_hostname
@@ -28,32 +28,25 @@ fi
 userID="ssh://${1}"
 
 # test that the desired user ID does not already exist
 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
     failure "Host userID '$userID' already exists."
 
 if [ "$PROMPT" = "true" ] ; then

-    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
+    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
 
        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
 # 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
 
 
     update_gpg_pub_file