1 files changed, 6 insertions, 1 deletions

diff --git a/session.c b/session.c
index 005f7ab17..187f38edd 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 @@ session_setup_x11fwd(Session *s)
                 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;