diff options
| author | Damien Miller <djm@mindrot.org> | 2005-07-06 09:45:26 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2005-07-06 09:45:26 +1000 |
| commit | f92c0794ec9162f4e0d5291fe58e4fcb5a00f6d3 (patch) | |
| tree | 7b440478910b9ab407b0d87f07b258aadd20abc5 /channels.c | |
| parent | fd94fbaf563d2d9a0c512e59085fe91d7e693576 (diff) | |
- markus@cvs.openbsd.org 2005/07/04 14:04:11
[channels.c]
don't forget to set x11_saved_display
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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" @@ -2964,7 +2964,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; |