version 1.50.2.1, 2016/01/14 11:53:20 |
version 1.51, 2015/04/24 01:36:00 |
|
|
free(cp); |
free(cp); |
continue; |
continue; |
} |
} |
cctx->env = xrealloc(cctx->env, env_len + 2, |
cctx->env = xreallocarray(cctx->env, env_len + 2, |
sizeof(*cctx->env)); |
sizeof(*cctx->env)); |
cctx->env[env_len++] = cp; |
cctx->env[env_len++] = cp; |
cctx->env[env_len] = NULL; |
cctx->env[env_len] = NULL; |
|
|
char *proto, *data; |
char *proto, *data; |
|
|
/* Get reasonable local authentication information. */ |
/* Get reasonable local authentication information. */ |
if (client_x11_get_proto(display, options.xauth_location, |
client_x11_get_proto(display, options.xauth_location, |
options.forward_x11_trusted, options.forward_x11_timeout, |
options.forward_x11_trusted, options.forward_x11_timeout, |
&proto, &data) == 0) { |
&proto, &data); |
/* Request forwarding with authentication spoofing. */ |
/* Request forwarding with authentication spoofing. */ |
debug("Requesting X11 forwarding with authentication " |
debug("Requesting X11 forwarding with authentication " |
"spoofing."); |
"spoofing."); |
x11_request_forwarding_with_spoofing(id, display, proto, |
x11_request_forwarding_with_spoofing(id, display, proto, |
data, 1); |
data, 1); |
/* XXX exit_on_forward_failure */ |
client_expect_confirm(id, "X11 forwarding", CONFIRM_WARN); |
client_expect_confirm(id, "X11 forwarding", |
/* XXX exit_on_forward_failure */ |
CONFIRM_WARN); |
|
} |
|
} |
} |
|
|
if (cctx->want_agent_fwd && options.forward_agent) { |
if (cctx->want_agent_fwd && options.forward_agent) { |