version 1.53.2.1, 2016/01/14 11:50:37 |
version 1.54, 2015/08/19 23:18:26 |
|
|
u_int lport, cport; |
u_int lport, cport; |
int i, ret = 0, freefwd = 1; |
int i, ret = 0, freefwd = 1; |
|
|
|
memset(&fwd, 0, sizeof(fwd)); |
|
|
/* XXX - lport/cport check redundant */ |
/* XXX - lport/cport check redundant */ |
if (buffer_get_int_ret(&ftype, m) != 0 || |
if (buffer_get_int_ret(&ftype, m) != 0 || |
(listen_addr = buffer_get_string_ret(m, NULL)) == NULL || |
(listen_addr = buffer_get_string_ret(m, NULL)) == NULL || |
|
|
int i, ret = 0; |
int i, ret = 0; |
u_int lport, cport; |
u_int lport, cport; |
|
|
|
memset(&fwd, 0, sizeof(fwd)); |
|
|
if (buffer_get_int_ret(&ftype, m) != 0 || |
if (buffer_get_int_ret(&ftype, m) != 0 || |
(listen_addr = buffer_get_string_ret(m, NULL)) == NULL || |
(listen_addr = buffer_get_string_ret(m, NULL)) == NULL || |
buffer_get_int_ret(&lport, m) != 0 || |
buffer_get_int_ret(&lport, m) != 0 || |
|
|
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) { |