File openssh-6.6p1-avoid_undefined_display_messages.patch of Package openssh.10219

# HG changeset patch
# Parent  8e73413895fa10288228eec55a02ae69d0a5b88d
Prevent printing message about missing DISPLAY variable when it is not set.
bsc#981654

upstream commit: 5658ef2501e785fbbdf5de2dc33b1ff7a4dca73a

diff --git a/openssh-6.6p1/clientloop.c b/openssh-6.6p1/clientloop.c
--- a/openssh-6.6p1/clientloop.c
+++ b/openssh-6.6p1/clientloop.c
@@ -319,18 +319,19 @@ client_x11_get_proto(const char *display
 	struct stat st;
 	u_int now, x11_timeout_real;
 
 	*_proto = proto;
 	*_data = data;
 	proto[0] = data[0] = xauthfile[0] = xauthdir[0] = '\0';
 
 	if (!client_x11_display_valid(display)) {
-		logit("DISPLAY \"%s\" invalid; disabling X11 forwarding",
-		    display);
+		if (display != NULL)
+			logit("DISPLAY \"%s\" invalid; disabling X11 forwarding",
+			    display);
 		return -1;
 	}
 	if (xauth_path != NULL && stat(xauth_path, &st) == -1) {
 		debug("No xauth program.");
 		xauth_path = NULL;
 	}
 
 	if (xauth_path != NULL) {
openSUSE Build Service is sponsored by