- markus@cvs.openbsd.org 2001/06/19 14:09:45
[session.c sshd.8]
disable x11-fwd if use_login is enabled; from lukem@wasabisystems.com
diff --git a/session.c b/session.c
index 005f7ab..187f38e 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.90 2001/06/19 12:34:09 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.91 2001/06/19 14:09:45 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -1980,6 +1980,11 @@
packet_send_debug("No xauth program; cannot forward with spoofing.");
return 0;
}
+ if (options.use_login) {
+ packet_send_debug("X11 forwarding disabled; "
+ "not compatible with UseLogin=yes.");
+ return 0;
+ }
if (s->display != NULL) {
debug("X11 display already set.");
return 0;