From: djm@openbsd.org Date: Fri, 17 Apr 2015 13:16:48 +0000 (+0000) Subject: upstream commit X-Git-Tag: V_6_9_P1~110 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a58be33cb6cd24441fa7e634db0e5babdd56f07f;p=thirdparty%2Fopenssh-portable.git upstream commit debug log missing DISPLAY environment when X11 forwarding requested; bz#1682 ok dtucker@ --- diff --git a/ssh.c b/ssh.c index 0ad82f029..ae4092544 100644 --- a/ssh.c +++ b/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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1673,6 +1673,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. */ @@ -1774,6 +1776,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. */