version 1.180, 2007/08/07 07:32:53 |
version 1.181, 2007/08/15 08:14:46 |
|
|
generated = 1; |
generated = 1; |
} |
} |
} |
} |
snprintf(cmd, sizeof(cmd), |
|
"%s %s%s list %s 2>" _PATH_DEVNULL, |
/* |
xauth_path, |
* When in untrusted mode, we read the cookie only if it was |
generated ? "-f " : "" , |
* successfully generated as an untrusted one in the step |
generated ? xauthfile : "", |
* above. |
display); |
*/ |
debug2("x11_get_proto: %s", cmd); |
if (trusted || generated) { |
f = popen(cmd, "r"); |
snprintf(cmd, sizeof(cmd), |
if (f && fgets(line, sizeof(line), f) && |
"%s %s%s list %s 2>" _PATH_DEVNULL, |
sscanf(line, "%*s %511s %511s", proto, data) == 2) |
xauth_path, |
got_data = 1; |
generated ? "-f " : "" , |
if (f) |
generated ? xauthfile : "", |
pclose(f); |
display); |
|
debug2("x11_get_proto: %s", cmd); |
|
f = popen(cmd, "r"); |
|
if (f && fgets(line, sizeof(line), f) && |
|
sscanf(line, "%*s %511s %511s", proto, data) == 2) |
|
got_data = 1; |
|
if (f) |
|
pclose(f); |
|
} else |
|
error("Warning: untrusted X11 forwarding setup failed: " |
|
"xauth key data not generated"); |
} |
} |
|
|
if (do_unlink) { |
if (do_unlink) { |