Merge commit 'jrollins/master'

diff --git a/debian/monkeysphere.manpages b/debian/monkeysphere.manpages
index 6e2cb923d49c774f85a2fd845ed51df81a1b7407..a8f6c1626b37b012ffa0c0de95374c60407d10da 100644 (file)
--- a/debian/monkeysphere.manpages
+++ b/debian/monkeysphere.manpages
@@ -1,3 +1,4 @@
 man/man1/monkeysphere.1
 man/man1/openpgp2ssh.1
+man/man1/monkeysphere-ssh-proxycommand.1
 man/man8/monkeysphere-server.8

diff --git a/man/man1/monkeysphere-ssh-proxycommand.1 b/man/man1/monkeysphere-ssh-proxycommand.1
new file mode 100644 (file)
index 0000000..41a95aa
--- /dev/null
+++ b/man/man1/monkeysphere-ssh-proxycommand.1
@@ -0,0 +1,25 @@
+.TH MONKEYSPHERE-SSH-PROXYCOMMAND "1" "June 2008" "monkeysphere 0.1" "User Commands"
+.SH NAME
+monkeysphere-ssh-proxycommand \- MonkeySphere ssh ProxyCommand script
+.PD
+.SH SYNOPSIS
+.B ssh -o ProxyCommand="monkeysphere-ssh-proxycommand %h %p" ...
+.PD
+.SH DESCRIPTION
+.PP
+MonkeySphere is a system to leverage the OpenPGP Web of Trust for ssh
+authentication and encryption.  OpenPGP keys are tracked via GnuPG,
+and added to the ssh authorized_keys and known_hosts files to be used
+for authentication and encryption of ssh connection.
+
+\fBmonkeysphere-ssh-proxy\fP is an ssh proxy command that can be used
+to trigger a monkeysphere update of the known_hosts file for the hosts
+that are being connected to.
+.PD
+.SH AUTHOR
+Written by Jameson Rollins <jrollins@fifthhorseman.net>
+.PD
+.SH SEE ALSO
+.BR monkeypshere (1),
+.BR ssh (1),
+.BR gpg (1)

diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 410a5d7d4745d6e20f2f91086ce5a5ed66867e16..636adcb455ef6a92df9870ed5e5829f916ab1258 100644 (file)
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -1,8 +1,10 @@
 .TH MONKEYSPHERE "1" "June 2008" "monkeysphere 0.1" "User Commands"
 .SH NAME
 monkeysphere \- MonkeySphere client user interface
+.PD
 .SH SYNOPSIS
 .B monkeysphere \fIcommand\fP [\fIargs\fP]
+.PD
 .SH DESCRIPTION
 .PP
 MonkeySphere is a system to leverage the OpenPGP Web of Trust for ssh
@@ -102,6 +104,7 @@ Host keys cache directory.
 .PD
 .SH AUTHOR
 Written by Jameson Rollins <jrollins@fifthhorseman.net>
+.PD
 .SH SEE ALSO
 .BR ssh (1),
 .BR gpg (1),

diff --git a/src/monkeysphere b/src/monkeysphere
index 5d865c96a3a7a747aa7054213500149baaec3ca4..6e71765d8e65ebb8d97a5e83fc2cb3beed396239 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -132,6 +132,11 @@ msAuthorizedKeys="$MS_HOME"/authorized_keys
 # make sure gpg home exists with proper permissions
 mkdir -p -m 0700 "$GNUPGHOME"
 
+# make sure the user monkeysphere home directory exists
+mkdir -p -m 0700 "$MS_HOME"
+mkdir -p "$hostKeysCacheDir"
+mkdir -p "$userKeysCacheDir"
+
 case $COMMAND in
     'update-known_hosts'|'update-known-hosts'|'k')
        MODE='known_hosts'