===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/channels.c,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- src/usr.bin/ssh/channels.c	2005/07/04 00:58:42	1.219
+++ src/usr.bin/ssh/channels.c	2005/07/04 14:04:11	1.220
@@ -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 @@
 	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;