diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-07-24 16:11:39 -0400 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-07-24 16:11:39 -0400 |
| commit | 65dfc0ba7f918b0a2787c1cc918e70fe3f247438 (patch) | |
| tree | 0df651ea4170b9224e1b61e787ff7c189117bea0 /src/monkeysphere | |
| parent | e3fe7faea819ac499ff851539f9af86959741c3a (diff) | |
Revert "proposed fix for #1147 by checking for known_hosts file"
This reverts commit 189781e00c89227612942ff7dc30eaa756cb78ae.
This is reverted because we're going with dkg's better solution.
Diffstat (limited to 'src/monkeysphere')
| -rwxr-xr-x | src/monkeysphere | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/monkeysphere b/src/monkeysphere index 94279f4..341b9fd 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -194,18 +194,7 @@ if [ -z "$KEYSERVER" ] ; then fi fi PROMPT=${MONKEYSPHERE_PROMPT:=$PROMPT} -# check the known_hosts file -if [ "$MONKEYSPHERE_KNOWN_HOSTS" ] ; then - if [ -f "$MONKEYSPHERE_KNOWN_HOSTS" ] ; then - KNOWN_HOSTS="$MONKEYSPHERE_KNOWN_HOSTS" - else - failure "specified monkeysphere known_hosts file '$MONKEYSPHERE_KNOWN_HOSTS' does not exist." - fi -fi -[ -d $(dirname "$KNOWN_HOSTS") ] \ - || mkdir -m 0700 $(dirname "$KNOWN_HOSTS") -[ -f "$KNOWN_HOSTS" ] \ - || touch "$KNOWN_HOSTS" +KNOWN_HOSTS=${MONKEYSPHERE_KNOWN_HOSTS:=$KNOWN_HOSTS} HASH_KNOWN_HOSTS=${MONKEYSPHERE_HASH_KNOWN_HOSTS:=$HASH_KNOWN_HOSTS} AUTHORIZED_KEYS=${MONKEYSPHERE_AUTHORIZED_KEYS:=$AUTHORIZED_KEYS} |