diff options
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/channels.c b/channels.c index d34411e18..b85ee5770 100644 --- a/channels.c +++ b/channels.c | |||
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: channels.c,v 1.175 2002/06/10 22:28:41 markus Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.176 2002/06/23 21:06:41 deraadt Exp $"); |
43 | 43 | ||
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | #include "ssh1.h" | 45 | #include "ssh1.h" |
@@ -2328,12 +2328,12 @@ channel_connect_to(const char *host, u_short port) | |||
2328 | 2328 | ||
2329 | /* | 2329 | /* |
2330 | * Creates an internet domain socket for listening for X11 connections. | 2330 | * Creates an internet domain socket for listening for X11 connections. |
2331 | * Returns a suitable display number for the DISPLAY variable, or -1 if | 2331 | * Returns 0 and a suitable display number for the DISPLAY variable |
2332 | * an error occurs. | 2332 | * stored in display_numberp , or -1 if an error occurs. |
2333 | */ | 2333 | */ |
2334 | int | 2334 | int |
2335 | x11_create_display_inet(int x11_display_offset, int x11_use_localhost, | 2335 | x11_create_display_inet(int x11_display_offset, int x11_use_localhost, |
2336 | int single_connection) | 2336 | int single_connection, u_int *display_numberp) |
2337 | { | 2337 | { |
2338 | Channel *nc = NULL; | 2338 | Channel *nc = NULL; |
2339 | int display_number, sock; | 2339 | int display_number, sock; |
@@ -2431,7 +2431,8 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost, | |||
2431 | } | 2431 | } |
2432 | 2432 | ||
2433 | /* Return the display number for the DISPLAY environment variable. */ | 2433 | /* Return the display number for the DISPLAY environment variable. */ |
2434 | return display_number; | 2434 | *display_numberp = display_number; |
2435 | return (0); | ||
2435 | } | 2436 | } |
2436 | 2437 | ||
2437 | static int | 2438 | static int |