- OpenBSD CVS Updates:

[openssh.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index 21ef4ec7495eb395ebf16ad0d7cb7ba6d2a76de9..f9742dc8de63ed1ab6cd6b8e923894ab8de4517c 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -11,7 +11,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: ssh.c,v 1.56 2000/06/20 01:39:44 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/dsa.h>
@@ -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);
@@ -432,8 +438,8 @@ main(int ac, char **av)
        /* Initialize the command to execute on remote host. */
        buffer_init(&command);
 
-       OpenSSL_add_all_algorithms();
-       
+       SSLeay_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
@@ -671,17 +677,17 @@ x11_get_proto(char *proto, int proto_len, char *data, int data_len)
        FILE *f;
        int got_data = 0, i;
 
-#ifdef XAUTH_PATH
-       /* Try to get Xauthority information for the display. */
-       snprintf(line, sizeof line, "%.100s list %.200s 2>/dev/null",
-                XAUTH_PATH, getenv("DISPLAY"));
-       f = popen(line, "r");
-       if (f && fgets(line, sizeof(line), f) &&
-           sscanf(line, "%*s %s %s", proto, data) == 2)
-               got_data = 1;
-       if (f)
-               pclose(f);
-#endif /* XAUTH_PATH */
+       if (options.xauth_location) {
+               /* Try to get Xauthority information for the display. */
+               snprintf(line, sizeof line, "%.100s list %.200s 2>/dev/null",
+                   options.xauth_location, getenv("DISPLAY"));
+               f = popen(line, "r");
+               if (f && fgets(line, sizeof(line), f) &&
+                   sscanf(line, "%*s %s %s", proto, data) == 2)
+                       got_data = 1;
+               if (f)
+                       pclose(f);
+       }
        /*
         * If we didn't get authentication data, just make up some
         * data.  The forwarding code will check the validity of the