diff options
| author |   markus <markus@openbsd.org> | 2000-05-31 06:36:40 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2000-05-31 06:36:40 +0000 |
| commit | c1ef93775bf79ded9b2b4765dd89060b336dfadd (patch) | |
| tree | e6c7d4e1d917e8399e6b5651b7b78e8606643a67 /usr.bin/ssh/ssh.c | |
| parent | sync with the latest kame code. insufficient len in malloc() call is (diff) | |
| download | wireguard-openbsd-c1ef93775bf79ded9b2b4765dd89060b336dfadd.tar.xz wireguard-openbsd-c1ef93775bf79ded9b2b4765dd89060b336dfadd.zip | |
xauth_location support; pr 1234
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index f343b41a7b6..73afbfda4b5 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$Id: ssh.c,v 1.54 2000/05/30 17:32:06 markus Exp $"); +RCSID("$Id: ssh.c,v 1.55 2000/05/31 06:36:40 markus Exp $"); #include <openssl/evp.h> #include <openssl/dsa.h> @@ -669,17 +669,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 |