summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/monkeysphere.dirs1
-rw-r--r--doc/george/changelog5
-rwxr-xr-xsrc/seckey2sshagent15
3 files changed, 20 insertions, 1 deletions
diff --git a/debian/monkeysphere.dirs b/debian/monkeysphere.dirs
index bc8abcf..6e90899 100644
--- 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 6dc3a29..c157cec 100644
--- 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 0e8d695..d8e9b79 100755
--- 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