diff options
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$Id: ssh.c,v 1.33 2000/05/30 03:44:54 damien Exp $"); +RCSID("$Id: ssh.c,v 1.34 2000/06/07 09:55:44 djm Exp $"); #include <openssl/evp.h> #include <openssl/dsa.h> @@ -438,7 +438,7 @@ 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 @@ -677,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 |