Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere

2 files changed, 29 insertions, 0 deletions

diff --git a/doc/TODO b/doc/TODO
index a82f031..4f32bb0 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -107,3 +107,18 @@ Update monkeysphere-ssh-proxycommand man page with new keyserver
 
 Update monkeysphere-ssh-proxycommand man page with info about
    no-connect option.
+
+File bug against seahorse about how, when creating new primary keys,
+   it presents option for "RSA (sign only)" but then creates an "esca"
+   key.
+
+File bug against enigmail about lack of ability to create subkeys.
+
+Priviledge separation: monkeysphere user to handle authn keyring and
+   generate authorized_keys file (which would be moved into place by
+   root).  Host keyring would be owned by root.
+
+Check permissions of authorized_user_ids file to be writable only by
+   user and root (same as authorized_keys)
+
+Improve function that sets owner trust for keys in server keychain.
diff --git a/doc/george/changelog b/doc/george/changelog
index c157cec..aefbf7f 100644
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -7,6 +7,20 @@
 *  changes to this system 					             *
 ******************************************************************************
 
+2008-06-22 - dkg
+	* installed screen (mjgoins and i were collaborating)
+	
+2008-06-21 - micah
+	* Restored /etc/init.d/ssh to original package state and changed
+	/etc/default/ssh to have 'unset SSHD_OOM_ADJUST' instead.
+	
+2008-06-20 - micah
+	* Commented out the 'export SSHD_OOM_ADJUST=-17' from the
+	/etc/init.d/ssh initscript, and the 'SSHD_OOM_ADJUST=-17' from
+	/etc/default/ssh in order to make this error go away:
+	"error writing /proc/self/oom_adj: Operation not permitted"
+	(c.f. Debian #487325)
+	  
 2008-06-20 - dkg
 	* touched /etc/environment to get rid of some spurious auth.log
 	entries.