diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-06 19:44:39 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-06 19:44:39 +0000 |
| commit | 9401e5643e90e23287b785e5fc238bb7c7f2d896 (patch) | |
| tree | 759a23118c7bb4a1cddc87b3ad5c63f459a64bd2 /xserver/os/xdmcp.c | |
| parent | 6d29d2deb77299e537a0daf2babf0e217ce51376 (diff) | |
update to xserver 1.6.4rc1. Tested by many, ok oga@.
Diffstat (limited to 'xserver/os/xdmcp.c')
| -rw-r--r-- | xserver/os/xdmcp.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/xserver/os/xdmcp.c b/xserver/os/xdmcp.c index 275e280db..18e13e954 100644 --- a/xserver/os/xdmcp.c +++ b/xserver/os/xdmcp.c @@ -24,12 +24,8 @@ #include <X11/Xos.h> #if !defined(WIN32) -#ifndef Lynx #include <sys/param.h> #include <sys/socket.h> -#else -#include <socket.h> -#endif #include <netinet/in.h> #include <netdb.h> #endif @@ -44,11 +40,7 @@ #include "input.h" #include "dixstruct.h" #include "opaque.h" - -#if defined(DGUX) -#include <net/net_ioctl.h> -#include <sys/ioctl.h> -#endif +#include "site.h" #ifdef STREAMSCONN #include <tiuser.h> @@ -68,7 +60,7 @@ #define X_INCLUDE_NETDB_H #include <X11/Xos_r.h> -extern char *defaultDisplayClass; +static char *defaultDisplayClass = COMPILEDDISPLAYCLASS; static int xdmcpSocket, sessionSocket; static xdmcp_states state; @@ -499,7 +491,9 @@ XdmcpRegisterConnection ( return; } } - newAddress = (CARD8 *) xalloc (addrlen * sizeof (CARD8)); + if (ConnectionAddresses.length + 1 == 256) + return; + newAddress = xalloc (addrlen * sizeof (CARD8)); if (!newAddress) return; if (!XdmcpReallocARRAY16 (&ConnectionTypes, ConnectionTypes.length + 1)) |