projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplifying find_host_user_id function.
[monkeysphere.git]
/
src
/
share
/
mh
/
add_hostname
diff --git
a/src/share/mh/add_hostname
b/src/share/mh/add_hostname
index 36f174de9049f433b13e068aa12d11a22a036be8..136b6788ffbc9b700f1ea4110060c05a3f3684e1 100644
(file)
--- a/
src/share/mh/add_hostname
+++ b/
src/share/mh/add_hostname
@@
-28,13
+28,12
@@
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
- read -p "The following user ID will be added to the host key:
- $userID
-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
if [ "${OK/y/Y}" != 'Y' ] ; then
failure "User ID not added."
fi
@@
-42,16
+41,10
@@
else
log debug "adding user ID without prompting."
fi
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
# 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
update_gpg_pub_file