diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2005-07-04 14:04:12 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2005-07-04 14:04:12 +0000 |
| commit | d733cf72e812185a579a4a87868760dab9283e6d (patch) | |
| tree | d33cbf293d7640d93da0cd818a746f04b4f5d89c /usr.bin/ssh | |
| parent | 2b8dcadfddb8a4f5468f7e0189f5e2d8239f7aa3 (diff) | |
don't forget to set x11_saved_display
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/channels.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index 26f193e51aa..17d04cdb0ab 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.219 2005/07/04 00:58:42 djm Exp $"); +RCSID("$OpenBSD: channels.c,v 1.220 2005/07/04 14:04:11 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -2930,7 +2930,9 @@ x11_request_forwarding_with_spoofing(int client_session_id, const char *disp, const char *cp; u_int32_t rnd = 0; - if (x11_saved_display && strcmp(disp, x11_saved_display) != 0) { + if (x11_saved_display == NULL) + x11_saved_display = xstrdup(disp); + else if (strcmp(disp, x11_saved_display) != 0) { error("x11_request_forwarding_with_spoofing: different " "$DISPLAY already forwarded"); return; |