X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fadd_hostname;h=c1b32a9cccc3bd7aadbd696c64c2da0ea0ce3749;hb=e8c2a77f53d65fed90af9fc9c62380fa9c81f858;hp=9df5eec2952adb305886fa0fa042a805075b8fac;hpb=fcdbba726ead3e13856c05881ea768bb74a078ff;p=monkeysphere.git diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname index 9df5eec..c1b32a9 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" && \ failure "Host userID '$userID' already exists." if [ "$PROMPT" = "true" ] ; then @@ -42,7 +42,9 @@ else fi # execute edit-key script -if <"$GNUPGHOME_HOST/secring.gpg" "$SYSSHAREDIR/keytrans" adduserid \ +if PEM2OPENPGP_USAGE_FLAGS=authenticate \ + <"$GNUPGHOME_HOST/secring.gpg" \ + "$SYSSHAREDIR/keytrans" adduserid \ "$HOST_FINGERPRINT" "$userID" | gpg_host --import ; then gpg_host --check-trustdb