- markus@cvs.openbsd.org 2005/07/04 14:04:11

     [channels.c]
     don't forget to set x11_saved_display

diff --git a/ChangeLog b/ChangeLog
index 616a315f2637a4de025e5b0f3de6d63493d9220a..dc5aba3124e75bb8d24c1ccce72db516009d22a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
    - jmc@cvs.openbsd.org 2005/07/04 11:29:51
      [ssh_config.5]
      fix Xr and a little grammar;
+   - markus@cvs.openbsd.org 2005/07/04 14:04:11
+     [channels.c]
+     don't forget to set x11_saved_display
 
 20050626
  - (djm) OpenBSD CVS Sync

diff --git a/channels.c b/channels.c
index 14ff166ae457ed48993e61ed0e7f1031c49cb991..a7c69a066080689e409b16e6db3c21b00137efc0 100644 (file)
--- a/channels.c
+++ b/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"
@@ -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;