diff options
| author |   djm <djm@openbsd.org> | 2015-04-17 13:16:48 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-04-17 13:16:48 +0000 |
| commit | a0bac96a55f5d3c8f10ff99bd247553d760e889b (patch) | |
| tree | 32ca60e0fc18113c4be2e474a59d09416a902cf0 /usr.bin/ssh/ssh.c | |
| parent | while trying to reproduce lockups on mp alpha i hit an (diff) | |
| download | wireguard-openbsd-a0bac96a55f5d3c8f10ff99bd247553d760e889b.tar.xz wireguard-openbsd-a0bac96a55f5d3c8f10ff99bd247553d760e889b.zip | |
debug log missing DISPLAY environment when X11 forwarding
requested; bz#1682 ok dtucker@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index c4087c1a35a..1b83d9d0209 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.416 2015/03/03 06:48:58 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.417 2015/04/17 13:16:48 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1623,6 +1623,8 @@ ssh_session(void) } /* Request X11 forwarding if enabled and DISPLAY is set. */ display = getenv("DISPLAY"); + if (display == NULL && options.forward_x11) + debug("X11 forwarding requested but DISPLAY not set"); if (options.forward_x11 && display != NULL) { char *proto, *data; /* Get reasonable local authentication information. */ @@ -1724,6 +1726,8 @@ ssh_session2_setup(int id, int success, void *arg) return; /* No need for error message, channels code sens one */ display = getenv("DISPLAY"); + if (display == NULL && options.forward_x11) + debug("X11 forwarding requested but DISPLAY not set"); if (options.forward_x11 && display != NULL) { char *proto, *data; /* Get reasonable local authentication information. */ |