X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fadd_hostname;h=37cfd3cfae5909728d147fe96664849d2539bcd5;hb=82d758a25428509963ddb2a8f7db05c74348c628;hp=9465d9635ac0bab68034c9ac29ef9356d7f80fd3;hpb=a2704823c7770bc8df9377116877fcca78c3ea12;p=monkeysphere.git diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname index 9465d96..37cfd3c 100644 --- 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" > /dev/null && \ failure "Host userID '$userID' already exists." if [ "$PROMPT" = "true" ] ; then @@ -41,16 +41,10 @@ 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 <"$GNUPGHOME_HOST/secring.gpg" "$SYSSHAREDIR/keytrans" adduserid \ + "$HOST_FINGERPRINT" "$userID" | gpg_host --import ; then + gpg_host --check-trustdb update_gpg_pub_file