diff options
| author | mouring <mouring> | 2002-06-23 21:48:28 +0000 |
|---|---|---|
| committer | mouring <mouring> | 2002-06-23 21:48:28 +0000 |
| commit | 5fe1c9138ac676524c42c9324b8a7cbf44c91d1e (patch) | |
| tree | 688d4eebd598bdaa202e0bea4ac930f7809720bf /channels.c | |
| parent | 1cf4807af40080708ab488f4341ad5377e31e741 (diff) | |
| download | openssh-5fe1c9138ac676524c42c9324b8a7cbf44c91d1e.tar.gz | |
- deraadt@cvs.openbsd.org 2002/06/23 21:06:41
[channels.c channels.h session.c session.h]
display, screen, row, col, xpixel, ypixel are u_int; markus ok
- (bal) Also fixed IPADDR_IN_DISPLAY case where display, screen, row, col,
xpixel are u_int.
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.175 2002/06/10 22:28:41 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.176 2002/06/23 21:06:41 deraadt Exp $"); #include "ssh.h" #include "ssh1.h" @@ -2328,12 +2328,12 @@ channel_connect_to(const char *host, u_short port) /* * Creates an internet domain socket for listening for X11 connections. - * Returns a suitable display number for the DISPLAY variable, or -1 if - * an error occurs. + * Returns 0 and a suitable display number for the DISPLAY variable + * stored in display_numberp , or -1 if an error occurs. */ int x11_create_display_inet(int x11_display_offset, int x11_use_localhost, - int single_connection) + int single_connection, u_int *display_numberp) { Channel *nc = NULL; int display_number, sock; @@ -2431,7 +2431,8 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost, } /* Return the display number for the DISPLAY environment variable. */ - return display_number; + *display_numberp = display_number; + return (0); } static int |