- 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 b391c67..314d38f 100644
--- 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
@@ -2779,4 +2782,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3834 2005/07/05 23:44:59 djm Exp $
+$Id: ChangeLog,v 1.3835 2005/07/05 23:45:26 djm Exp $
diff --git a/channels.c b/channels.c
index 14ff166..a7c69a0 100644
--- 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 @@
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;