summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-08-02 16:41:46 -0700
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-08-02 16:41:46 -0700
commitce1111775aa0e23680932508c2b31e8091ff8beb (patch)
treeeab4d053ba040f15162cf5d860c24584cc779df1 /src/common
parent93824de5efefc2810c3c62b27e6e1240440cdd0c (diff)
Fix how file modification check is done, and fix accidental extraneous
output.
Diffstat (limited to 'src/common')
-rw-r--r--src/common14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/common b/src/common
index e281de4..ba7df73 100644
--- a/src/common
+++ b/src/common
@@ -498,6 +498,7 @@ update_known_hosts() {
local nHosts
local nHostsOK
local nHostsBAD
+ local fileCheck
local host
# the number of hosts specified on command line
@@ -512,6 +513,9 @@ update_known_hosts() {
# create a lockfile on known_hosts
lockfile-create "$KNOWN_HOSTS"
+ # note pre update file checksum
+ fileCheck=$(md5sum "$KNOWN_HOSTS")
+
for host ; do
# process the host
process_host_known_hosts "$host"
@@ -533,7 +537,7 @@ update_known_hosts() {
lockfile-remove "$KNOWN_HOSTS"
# note if the known_hosts file was updated
- if [ "$nHostsOK" -gt 0 -o "$nHostsBAD" -gt 0 ] ; then
+ if [ "$(md5sum "$KNOWN_HOSTS")" != "$fileCheck" ] ; then
log "known_hosts file updated."
fi
@@ -634,6 +638,7 @@ update_authorized_keys() {
local nIDs
local nIDsOK
local nIDsBAD
+ local fileCheck
# the number of ids specified on command line
nIDs="$#"
@@ -647,6 +652,9 @@ update_authorized_keys() {
# create a lockfile on authorized_keys
lockfile-create "$AUTHORIZED_KEYS"
+ # note pre update file checksum
+ fileCheck=$(md5sum "$AUTHORIZED_KEYS")
+
for userID ; do
# process the user ID, change return code if key not found for
# user ID
@@ -670,7 +678,7 @@ update_authorized_keys() {
lockfile-remove "$AUTHORIZED_KEYS"
# note if the authorized_keys file was updated
- if [ "$nIDsOK" -gt 0 -o "$nIDsBAD" -gt 0 ] ; then
+ if [ "$(md5sum "$AUTHORIZED_KEYS")" != "$fileCheck" ] ; then
log "authorized_keys file updated."
fi
@@ -700,7 +708,7 @@ process_authorized_user_ids() {
log "processing authorized_user_ids file..."
- if ! meat "$authorizedUserIDs" ; then
+ if ! meat "$authorizedUserIDs" > /dev/null ; then
log "no user IDs to process."
return
fi