- OpenBSD CVS updates:

  - markus@cvs.openbsd.org
    [session.c]
    make x11-fwd work w/ localhost (xauth add host/unix:11)
    [cipher.c compat.c readconf.c servconf.c]
    check strtok() != NULL; ok niels@
    [key.c]
    fix key_read() for uuencoded keys w/o '='
    [serverloop.c]
    group ssh1 vs. ssh2 in serverloop
    [kex.c kex.h myproposal.h sshconnect2.c sshd.c]
    split kexinit/kexdh, factor out common code
    [readconf.c ssh.1 ssh.c]
    forwardagent defaults to no, add ssh -A
  - theo@cvs.openbsd.org
    [session.c]
    just some line shortening

1 files changed, 5 insertions, 1 deletions

diff --git a/ssh.c b/ssh.c
index 1cc8dbbf3..2934c3a4a 100644
--- a/ssh.c
+++ b/ssh.c
@@ -11,7 +11,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: ssh.c,v 1.32 2000/05/20 05:22:37 damien Exp $");
+RCSID("$Id: ssh.c,v 1.33 2000/05/30 03:44:54 damien Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/dsa.h>
@@ -116,6 +116,7 @@ usage()
         fprintf(stderr, "Options:\n");
         fprintf(stderr, "  -l user     Log in using this user name.\n");
         fprintf(stderr, "  -n          Redirect input from /dev/null.\n");
+        fprintf(stderr, "  -A          Enable authentication agent forwarding.\n");
         fprintf(stderr, "  -a          Disable authentication agent forwarding.\n");
 #ifdef AFS
         fprintf(stderr, "  -k          Disable Kerberos ticket and AFS token forwarding.\n");
@@ -315,6 +316,9 @@ main(int ac, char **av)
                 case 'a':
                         options.forward_agent = 0;
                         break;
+                case 'A':
+                        options.forward_agent = 1;
+                        break;
 #ifdef AFS
                 case 'k':
                         options.kerberos_tgt_passing = 0;