version 1.181, 2002/07/03 14:21:05 |
version 1.182, 2002/07/19 17:42:40 |
|
|
FILE *f; |
FILE *f; |
int got_data = 0, i; |
int got_data = 0, i; |
char *display; |
char *display; |
|
struct stat st; |
|
|
*_proto = proto; |
*_proto = proto; |
*_data = data; |
*_data = data; |
proto[0] = data[0] = '\0'; |
proto[0] = data[0] = '\0'; |
if (options.xauth_location && (display = getenv("DISPLAY"))) { |
if (!options.xauth_location || |
|
(stat(options.xauth_location, &st) == -1)) { |
|
debug("No xauth program."); |
|
} else { |
|
if ((display = getenv("DISPLAY")) == NULL) { |
|
debug("x11_get_proto: DISPLAY not set"); |
|
return; |
|
} |
/* Try to get Xauthority information for the display. */ |
/* Try to get Xauthority information for the display. */ |
if (strncmp(display, "localhost:", 10) == 0) |
if (strncmp(display, "localhost:", 10) == 0) |
/* |
/* |
|
|
else |
else |
snprintf(line, sizeof line, "%s list %.200s 2>" |
snprintf(line, sizeof line, "%s list %.200s 2>" |
_PATH_DEVNULL, options.xauth_location, display); |
_PATH_DEVNULL, options.xauth_location, display); |
debug2("x11_get_proto %s", line); |
debug2("x11_get_proto: %s", line); |
f = popen(line, "r"); |
f = popen(line, "r"); |
if (f && fgets(line, sizeof(line), f) && |
if (f && fgets(line, sizeof(line), f) && |
sscanf(line, "%*s %511s %511s", proto, data) == 2) |
sscanf(line, "%*s %511s %511s", proto, data) == 2) |
|
|
if (!got_data) { |
if (!got_data) { |
u_int32_t rand = 0; |
u_int32_t rand = 0; |
|
|
|
log("Warning: No xauth data; using fake authentication data for X11 forwarding."); |
strlcpy(proto, "MIT-MAGIC-COOKIE-1", sizeof proto); |
strlcpy(proto, "MIT-MAGIC-COOKIE-1", sizeof proto); |
for (i = 0; i < 16; i++) { |
for (i = 0; i < 16; i++) { |
if (i % 4 == 0) |
if (i % 4 == 0) |