From 5eab2f06d17f8a178c6fe61a7bf9fcba349e7680 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sun, 27 Jul 2008 11:57:59 -0700 Subject: [PATCH] Tweak how empty authorized_user_ids and known_hosts files are handled. --- src/common | 10 ++++++++++ src/monkeysphere | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/common b/src/common index b57b721..1e8f23c 100644 --- a/src/common +++ b/src/common @@ -563,6 +563,11 @@ process_known_hosts() { hosts=$(meat "$KNOWN_HOSTS" | cut -d ' ' -f 1 | grep -v '^|.*$' | tr , ' ' | tr '\n' ' ') + if [ -z "$hosts" ] ; then + log "no hosts to process." + return + fi + # take all the hosts from the known_hosts file (first # field), grep out all the hashed hosts (lines starting # with '|')... @@ -697,6 +702,11 @@ process_authorized_user_ids() { log "processing authorized_user_ids file..." + if ! meat "$authorizedUserIDs" ; then + log "no user IDs to process." + return + fi + nline=0 # extract user IDs from authorized_user_ids file diff --git a/src/monkeysphere b/src/monkeysphere index 5e8b184..3f127e6 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -216,8 +216,8 @@ case $COMMAND in # otherwise, if no hosts are specified, process every host # in the user's known_hosts file else - if [ ! -s "$KNOWN_HOSTS" ] ; then - failure "known_hosts file '$KNOWN_HOSTS' is empty or does not exist." + if [ ! -e "$KNOWN_HOSTS" ] ; then + failure "known_hosts file '$KNOWN_HOSTS' does not exist." fi process_known_hosts @@ -229,8 +229,8 @@ case $COMMAND in MODE='authorized_keys' # fail if the authorized_user_ids file is empty - if [ ! -s "$AUTHORIZED_USER_IDS" ] ; then - failure "authorized_user_ids file '$AUTHORIZED_USER_IDS' is empty or does not exist." + if [ ! -e "$AUTHORIZED_USER_IDS" ] ; then + failure "authorized_user_ids file '$AUTHORIZED_USER_IDS' does not exist." fi if ! check_key_file_permissions "$USER" "$AUTHORIZED_USER_IDS" ; then -- 2.25.1