summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-02-05 12:11:34 +1100
committerDamien Miller <djm@mindrot.org>2002-02-05 12:11:34 +1100
commit95c249ff475a9e0c15a4a8fcc9668f8dddb0a6c3 (patch)
treed66a300fac9b34f4262009250fb504cfa1b2efaf /session.c
parent512bccbb5a7d4c2a8fc53dad17f4a6f7a07b0474 (diff)
- stevesk@cvs.openbsd.org 2002/01/27 14:57:46
[channels.c servconf.c servconf.h session.c sshd.8 sshd_config] add X11UseLocalhost; ok markus@
Diffstat (limited to 'session.c')
-rw-r--r--session.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/session.c b/session.c
index 268d1384e..7e1d0a82b 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
33 */ 33 */
34 34
35#include "includes.h" 35#include "includes.h"
36RCSID("$OpenBSD: session.c,v 1.118 2002/01/26 16:44:22 stevesk Exp $"); 36RCSID("$OpenBSD: session.c,v 1.119 2002/01/27 14:57:46 stevesk Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -2021,7 +2021,7 @@ session_setup_x11fwd(Session *s)
2021 return 0; 2021 return 0;
2022 } 2022 }
2023 s->display_number = x11_create_display_inet(options.x11_display_offset, 2023 s->display_number = x11_create_display_inet(options.x11_display_offset,
2024 options.gateway_ports, s->single_connection); 2024 options.x11_use_localhost, s->single_connection);
2025 if (s->display_number == -1) { 2025 if (s->display_number == -1) {
2026 debug("x11_create_display_inet failed."); 2026 debug("x11_create_display_inet failed.");
2027 return 0; 2027 return 0;
@@ -2035,7 +2035,7 @@ session_setup_x11fwd(Session *s)
2035 * authorization entry is added with xauth(1). This will be 2035 * authorization entry is added with xauth(1). This will be
2036 * different than the DISPLAY string for localhost displays. 2036 * different than the DISPLAY string for localhost displays.
2037 */ 2037 */
2038 if (!options.gateway_ports) { 2038 if (options.x11_use_localhost) {
2039 snprintf(display, sizeof display, "localhost:%d.%d", 2039 snprintf(display, sizeof display, "localhost:%d.%d",
2040 s->display_number, s->screen); 2040 s->display_number, s->screen);
2041 snprintf(auth_display, sizeof auth_display, "unix:%d.%d", 2041 snprintf(auth_display, sizeof auth_display, "unix:%d.%d",