diff options
| author |   djm <djm@openbsd.org> | 2005-06-16 03:38:36 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2005-06-16 03:38:36 +0000 |
| commit | 31d3c030ce4fdf1479181bffe11035d7cdc274e3 (patch) | |
| tree | 56c80fc15d127b909af9c15d34649d98927df4ea /usr.bin/ssh/channels.c | |
| parent | sync (diff) | |
| download | wireguard-openbsd-31d3c030ce4fdf1479181bffe11035d7cdc274e3.tar.xz wireguard-openbsd-31d3c030ce4fdf1479181bffe11035d7cdc274e3.zip | |
move x11_get_proto from ssh.c to clientloop.c, to make muliplexed xfwd easier
later; ok deraadt@
Diffstat (limited to 'usr.bin/ssh/channels.c')
| -rw-r--r-- | usr.bin/ssh/channels.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index b387cddc731..dcc161d1147 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.214 2005/03/14 11:46:56 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.215 2005/06/16 03:38:36 djm Exp $"); #include "ssh.h" #include "ssh1.h" @@ -2918,7 +2918,7 @@ deny_input_open(int type, u_int32_t seq, void *ctxt) * This should be called in the client only. */ void -x11_request_forwarding_with_spoofing(int client_session_id, +x11_request_forwarding_with_spoofing(int client_session_id, const char *disp, const char *proto, const char *data) { u_int data_len = (u_int) strlen(data) / 2; @@ -2928,9 +2928,9 @@ x11_request_forwarding_with_spoofing(int client_session_id, const char *cp; u_int32_t rnd = 0; - cp = getenv("DISPLAY"); - if (cp) - cp = strchr(cp, ':'); + cp = disp; + if (disp) + cp = strchr(disp, ':'); if (cp) cp = strchr(cp, '.'); if (cp) |