===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/mux.c,v
retrieving revision 1.53.2.1
retrieving revision 1.54
diff -u -r1.53.2.1 -r1.54
--- src/usr.bin/ssh/mux.c	2016/01/14 11:50:37	1.53.2.1
+++ src/usr.bin/ssh/mux.c	2015/08/19 23:18:26	1.54
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.53.2.1 2016/01/14 11:50:37 sthen Exp $ */
+/* $OpenBSD: mux.c,v 1.54 2015/08/19 23:18:26 djm Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *
@@ -652,6 +652,8 @@
 	u_int lport, cport;
 	int i, ret = 0, freefwd = 1;
 
+	memset(&fwd, 0, sizeof(fwd));
+
 	/* XXX - lport/cport check redundant */
 	if (buffer_get_int_ret(&ftype, m) != 0 ||
 	    (listen_addr = buffer_get_string_ret(m, NULL)) == NULL ||
@@ -819,6 +821,8 @@
 	int i, ret = 0;
 	u_int lport, cport;
 
+	memset(&fwd, 0, sizeof(fwd));
+
 	if (buffer_get_int_ret(&ftype, m) != 0 ||
 	    (listen_addr = buffer_get_string_ret(m, NULL)) == NULL ||
 	    buffer_get_int_ret(&lport, m) != 0 ||
@@ -1337,18 +1341,16 @@
 		char *proto, *data;
 
 		/* Get reasonable local authentication information. */
-		if (client_x11_get_proto(display, options.xauth_location,
+		client_x11_get_proto(display, options.xauth_location,
 		    options.forward_x11_trusted, options.forward_x11_timeout,
-		    &proto, &data) == 0) {
-			/* Request forwarding with authentication spoofing. */
-			debug("Requesting X11 forwarding with authentication "
-			    "spoofing.");
-			x11_request_forwarding_with_spoofing(id, display, proto,
-			    data, 1);
-			/* XXX exit_on_forward_failure */
-			client_expect_confirm(id, "X11 forwarding",
-			    CONFIRM_WARN);
-		}
+		    &proto, &data);
+		/* Request forwarding with authentication spoofing. */
+		debug("Requesting X11 forwarding with authentication "
+		    "spoofing.");
+		x11_request_forwarding_with_spoofing(id, display, proto,
+		    data, 1);
+		client_expect_confirm(id, "X11 forwarding", CONFIRM_WARN);
+		/* XXX exit_on_forward_failure */
 	}
 
 	if (cctx->want_agent_fwd && options.forward_agent) {