summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--doc/george/changelog7
-rw-r--r--src/common14
3 files changed, 21 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index c81d844..8bfd387 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
monkeysphere (0.7-1) UNRELEASED; urgency=low
+ [ Daniel Kahn Gillmor ]
* Added monkeysphere-server diagnostics subcommand.
- -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net> Thu, 31 Jul 2008 19:27:45 -0400
+ [ Jameson Graef Rollins ]
+ * fix how check for file modification is done.
+
+ -- Jameson Graef Rollins <jrollins@phys.columbia.edu> Sat, 02 Aug 2008 16:41:20 -0700
monkeysphere (0.6-1) experimental; urgency=low
diff --git a/doc/george/changelog b/doc/george/changelog
index 770a265..45834d6 100644
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -19,8 +19,11 @@
* created ~webmaster/ikiwiki.setup
* ikiwiki --setup ikiwiki.setup
* linked post-receive to new post-commit hook in monkeysphere.git
- * changed default keyserver to be pgp.mit.edu (subkeys.pgp.net blows)
-
+ * changed default keyserver to be pgp.mit.edu (subkeys.pgp.net
+ blows)
+ * updated /etc/skel with ssh and monkeysphere stuff
+ * made authorzied_user_ids file for webmaster and ran
+ "monkeysphere-server u webmaster".
2008-06-23 - dkg
* added monkeysphere apt repository to /etc/apt/sources.list
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