X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=46abf6fce659dcc09f7017ac97e2a9c814a85105;hb=2b5cd0f910f28a601bcecfe68cdfc1ffd9b1362c;hp=463a1b119310e53d803f40ed7a65c78776ad373c;hpb=59b27e8cae2cd79f99e62cd89aea6dcaf678bf08;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index 463a1b1..46abf6f 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -6,8 +6,9 @@
 # Jameson Rollins <jrollins@fifthhorseman.net>
 # Jamie McClelland <jm@mayfirst.org>
 # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+# Micah Anderson <micah@riseup.net>
 #
-# They are Copyright 2008, and are all released under the GPL, version 3
+# They are Copyright 2008-2009, and are all released under the GPL, version 3
 # or later.
 
 ########################################################################
@@ -47,6 +48,7 @@ subcommands:
  gen-subkey (g) [KEYID]              generate an authentication subkey
    --length (-l) BITS                  key length in bits (2048)
    --expire (-e) EXPIRE                date to expire
+ ssh-proxycommand                    ssh proxycommand
  subkey-to-ssh-agent (s)             store authentication subkey in ssh-agent
  version (v)                         show version number
  help (h,?)                          this help
@@ -424,6 +426,10 @@ case $COMMAND in
 	gen_subkey "$@"
 	;;
 
+    'ssh-proxycommand'|'p')
+	ssh-proxycommand "$@"
+	;;
+
     'subkey-to-ssh-agent'|'s')
 	subkey_to_ssh_agent "$@"
 	;;