summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-08-15 08:53:08 -0700
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-08-15 08:53:08 -0700
commitcb45bed4fce593770b4378fbb13e68cf3b68137a (patch)
treee331bbdca7fe204b03568fa1e17af291f1ed53ea
parentc7497687d04959d1b9593e89ce860a50fa18f719 (diff)
parent9ce83dcd98305f63c3e3df9bd9ba82291800c43e (diff)
Merge commit 'dkg/master'
-rw-r--r--website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn2
-rw-r--r--website/bugs/monkeysphere-ignores-HashKnownHosts-directive.mdwn9
2 files changed, 10 insertions, 1 deletions
diff --git a/website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn b/website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn
index 7e735d2..51cf57e 100644
--- a/website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn
+++ b/website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn
@@ -134,4 +134,4 @@ it.
Alternately, we could use `--passwd-fd` and `ssh-agent`, along the
lines i proposed [for handling passphrase-locked secret
-keys](handle-passphrase-locked-secret-keys).
+keys](/bugs/handle-passphrase-locked-secret-keys).
diff --git a/website/bugs/monkeysphere-ignores-HashKnownHosts-directive.mdwn b/website/bugs/monkeysphere-ignores-HashKnownHosts-directive.mdwn
index 0f6654c..2dac579 100644
--- a/website/bugs/monkeysphere-ignores-HashKnownHosts-directive.mdwn
+++ b/website/bugs/monkeysphere-ignores-HashKnownHosts-directive.mdwn
@@ -22,3 +22,12 @@ any ssh or sshd config file. This will probably need to be delt with
down the line, but it's not a particular easy task at the moment.
-- Big Jimmy.
+
+---
+
+I've [posted to the `openssh-unix-dev` list to see if there is a
+possibility of openssh making our lives easier
+here](http://marc.info/?l=openssh-unix-dev&m=121804767122918&w=2), but
+i haven't had much of a response yet.
+
+--dkg