added notes about transition to debian/changelog

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index bce0072e16e165c3d19bf1e8da26f73977d98c2e..da5f406165469e942654c5865a99f66ea80cc3d6 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -51,7 +51,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
+ ssh-proxycommand                    monkeysphere ssh ProxyCommand
  subkey-to-ssh-agent (s)             store authentication subkey in ssh-agent
  version (v)                         show version number
  help (h,?)                          this help
@@ -167,12 +167,12 @@ case $COMMAND in
        ;;
 
     'import-subkey'|'i')
-       source "${MSHAREDIR}/import-key"
-       import_key "$@"
+       source "${MSHAREDIR}/import_subkey"
+       import_subkey "$@"
        ;;
 
     'gen-subkey'|'g')
-       source "${MSHAREDIR}/import_key"
+       source "${MSHAREDIR}/gen_subkey"
        gen_subkey "$@"
        ;;
 
@@ -182,6 +182,7 @@ case $COMMAND in
        ;;
 
     'subkey-to-ssh-agent'|'s')
+       source "${MSHAREDIR}/subkey_to_ssh_agent"
        subkey_to_ssh_agent "$@"
        ;;