diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-21 03:14:49 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-21 03:14:49 +0000 |
| commit | 699776e9ec1378c1e962146a15436e888e9594b0 (patch) | |
| tree | 0189dbbe436772e1635270a00b2cb9ce09f1d508 /session.c | |
| parent | c85ab8afab0b1f73cda607859f32f0d9558af594 (diff) | |
| download | openssh-git-699776e9ec1378c1e962146a15436e888e9594b0.tar.gz | |
- 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
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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; |