Merge commit 'dkg/master'

diff --git a/debian/monkeysphere.dirs b/debian/monkeysphere.dirs
index bc8abcf0f51ee7d3dcd1ae7a9b70f464b62c78b1..6e9089952ab4095b9bc12d9163cc9aeeacf7299e 100644 (file)
--- a/debian/monkeysphere.dirs
+++ b/debian/monkeysphere.dirs
@@ -2,4 +2,3 @@ usr/share/monkeysphere
 var/cache/monkeysphere
 var/cache/monkeysphere/authorized_keys
 etc/monkeysphere
-etc/monkeysphere/authorized_user_ids

diff --git a/doc/george/changelog b/doc/george/changelog
index 6dc3a296d8a1ebc0310644c3a28ddd70125286ec..c157cece509409d639acded1880535d103c13262 100644 (file)
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -7,6 +7,11 @@
 *  changes to this system                                                   *
 ******************************************************************************
 
+2008-06-20 - dkg
+       * touched /etc/environment to get rid of some spurious auth.log
+       entries.
+       * turned up sshd's LogLevel from INFO to DEBUG
+       
 2008-06-19 - dkg
        * installed rsync (for maintaining a public apt repo)
        

diff --git a/src/seckey2sshagent b/src/seckey2sshagent
index 0e8d69526a360fa7710d753d3d93d8928e7b1175..d8e9b79ac2e86da91cf156de986a8434135e7b37 100755 (executable)
--- a/src/seckey2sshagent
+++ b/src/seckey2sshagent
@@ -1,5 +1,20 @@
 #!/bin/sh
 
+# seckey2sshagent: this is a hack of a script to cope with the fact
+# that openpgp2ssh currently cannot support encrypted secret keys.
+
+# the basic operating principal is: 
+
+# export the secret key in encrypted format to a new keyring
+
+# remove the passphrase in that keyring
+
+# use that keyring with openpgp2ssh
+
+# Authors: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
+#          Jameson Rollins <jrollins@fifthhorseman.net>
+
+
 cleanup() {
     echo -n "removing temp gpg home... "
     rm -rf $FOO