- (djm) Added --with-cflags, --with-ldflags and --with-libs options to

[openssh.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index 21ef4ec7495eb395ebf16ad0d7cb7ba6d2a76de9..7b9ed7a239db61b03c00152db516b5bee62a3c49 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -116,10 +116,12 @@ 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");
 #endif                         /* AFS */
+        fprintf(stderr, "  -X          Enable X11 connection forwarding.\n");
        fprintf(stderr, "  -x          Disable X11 connection forwarding.\n");
        fprintf(stderr, "  -i file     Identity for RSA authentication (default: ~/.ssh/identity).\n");
        fprintf(stderr, "  -t          Tty; allocate a tty even if command is given.\n");
@@ -314,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;
@@ -367,6 +372,7 @@ main(int ac, char **av)
                        if (ciphers_valid(optarg)) {
                                /* SSH2 only */
                                options.ciphers = xstrdup(optarg);
+                               options.cipher = SSH_CIPHER_ILLEGAL;
                        } else {
                                /* SSH1 only */
                                options.cipher = cipher_number(optarg);
@@ -433,7 +439,7 @@ main(int ac, char **av)
        buffer_init(&command);
 
        OpenSSL_add_all_algorithms();
-       
+
        /*
         * Save the command to execute on the remote host in a buffer. There
         * is no limit on the length of the command, except by the maximum