From: Jameson Rollins Date: Mon, 18 Jan 2010 18:12:00 +0000 (-0500) Subject: remove reference to HOST_KEY_FPR_FILE X-Git-Tag: monkeysphere_0.28~25 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=97e51c1dcf3f4a582cb9ff8a83d56eda8b22b292;p=monkeysphere.git remove reference to HOST_KEY_FPR_FILE except in update_gpg_pub_file, which dkg is going to modify to just hold the host keys and not any other keys (like revoker keys). this file alone can then be used to get host key info for non-priviledged users. --- diff --git a/src/monkeysphere-host b/src/monkeysphere-host index da37618..a580ef2 100755 --- a/src/monkeysphere-host +++ b/src/monkeysphere-host @@ -35,8 +35,6 @@ MHDATADIR="${SYSDATADIR}/host" # host pub key files HOST_KEY_FILE="${SYSDATADIR}/host_keys.pub.gpg" -# host pub key fingerprints file -HOST_KEY_FPR_FILE="${SYSDATADIR}/host_keys.fprs" # UTC date in ISO 8601 format if needed DATE=$(date -u '+%FT%T') @@ -101,7 +99,7 @@ update_gpg_pub_file() { } host_fingerprints() { - local fprs=($(cat "$HOST_KEY_FPR_FILE" 2>/dev/null)) + local fprs=($(<"$HOST_KEY_FILE" "$SYSSHAREDIR/keytrans" listfprs)) log debug "host key fingerprints:" printf '%s\n' "${fprs[@]}" | log debug @@ -116,7 +114,7 @@ check_service_name() { # fail if host key not present check_no_keys() { - [ -s "$HOST_KEY_FILE" ] || [ -s "$HOST_KEY_FPR_FILE" ] \ + [ -s "$HOST_KEY_FILE" ] \ || failure "You don't appear to have a Monkeysphere host key on this server. Please run 'monkeysphere-host import-key' import a key." }