mirror of
https://github.com/X11Libre/xserver.git
synced 2026-11-02 03:15:52 +00:00
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
This commit is contained in:
Alan Coopersmith
commit
c2535f6792
1265 changed files with 5182 additions and 5954 deletions
|
|
@ -1,6 +1,6 @@
|
|||
noinst_LTLIBRARIES = libos.la libcwrapper.la
|
||||
|
||||
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
|
||||
AM_CFLAGS = $(DIX_CFLAGS)
|
||||
|
||||
# FIXME: Add support for these in configure.ac
|
||||
K5AUTH_SOURCES = k5auth.c
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.42 2003/10/16 01:33:35 dawes Exp $ */
|
||||
/***********************************************************
|
||||
|
||||
Copyright 1987, 1998 The Open Group
|
||||
|
|
@ -46,7 +45,6 @@ SOFTWARE.
|
|||
|
||||
******************************************************************/
|
||||
|
||||
/* $Xorg: WaitFor.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
|
||||
|
||||
/*****************************************************************
|
||||
* OS Dependent input routines:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
/* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
|
||||
/* $XdotOrg: xserver/xorg/os/access.c,v 1.15 2006/02/15 20:44:13 ajax Exp $ */
|
||||
/***********************************************************
|
||||
|
||||
Copyright 1987, 1998 The Open Group
|
||||
|
|
@ -55,7 +53,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|||
SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
/* $XFree86: xc/programs/Xserver/os/access.c,v 3.53 2004/01/02 18:23:19 tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Xorg: auth.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
Copyright 1988, 1998 The Open Group
|
||||
|
|
@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
|
|||
from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: auth.c,v 1.13 2003/04/27 21:31:08 herrb Exp $ */
|
||||
|
||||
/*
|
||||
* authorization hooks for the server
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Xorg: connection.c,v 1.6 2001/02/09 02:05:23 xorgcvs Exp $ */
|
||||
/***********************************************************
|
||||
|
||||
Copyright 1987, 1989, 1998 The Open Group
|
||||
|
|
@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|||
SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.64 2003/10/07 22:50:42 herrb Exp $ */
|
||||
/*****************************************************************
|
||||
* Stuff to create connections --- OS dependent
|
||||
*
|
||||
|
|
|
|||
2
os/io.c
2
os/io.c
|
|
@ -45,7 +45,6 @@ SOFTWARE.
|
|||
|
||||
|
||||
******************************************************************/
|
||||
/* $Xorg: io.c,v 1.6 2001/02/09 02:05:23 xorgcvs Exp $ */
|
||||
/*****************************************************************
|
||||
* i/o functions
|
||||
*
|
||||
|
|
@ -53,7 +52,6 @@ SOFTWARE.
|
|||
* InsertFakeRequest, ResetCurrentRequest
|
||||
*
|
||||
*****************************************************************/
|
||||
/* $XFree86: xc/programs/Xserver/os/io.c,v 3.34 2002/05/31 18:46:05 dawes Exp $ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Xorg: k5auth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
Copyright 1993, 1994, 1998 The Open Group
|
||||
|
|
@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
|
|||
from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.4 2001/01/17 22:37:10 dawes Exp $ */
|
||||
|
||||
/*
|
||||
* Kerberos V5 authentication scheme
|
||||
|
|
|
|||
1
os/log.c
1
os/log.c
|
|
@ -76,7 +76,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
|
|||
* authorization from the copyright holder(s) and author(s).
|
||||
*/
|
||||
|
||||
/* $XFree86: xc/programs/Xserver/os/log.c,v 1.6 2003/11/07 13:45:27 tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Xorg: mitauth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
Copyright 1988, 1998 The Open Group
|
||||
|
|
@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
|
|||
from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/os/mitauth.c,v 1.4 2001/01/17 22:37:11 dawes Exp $ */
|
||||
|
||||
/*
|
||||
* MIT-MAGIC-COOKIE-1 authorization scheme
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.10 2003/07/16 01:39:03 dawes Exp $ */
|
||||
/***********************************************************
|
||||
|
||||
Copyright 1987, 1998 The Open Group
|
||||
|
|
@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|||
SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
/* $Xorg: oscolor.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.17 2002/05/31 18:46:06 dawes Exp $ */
|
||||
/***********************************************************
|
||||
|
||||
Copyright 1987, 1998 The Open Group
|
||||
|
|
@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|||
SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
/* $Xorg: osdep.h,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.29 2003/09/09 03:20:41 dawes Exp $ */
|
||||
/***********************************************************
|
||||
|
||||
Copyright 1987, 1998 The Open Group
|
||||
|
|
@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|||
SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
/* $Xorg: osinit.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Xorg: rpcauth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
Copyright 1991, 1998 The Open Group
|
||||
|
|
@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
|
|||
from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/os/rpcauth.c,v 3.7 2001/12/14 20:00:35 dawes Exp $ */
|
||||
|
||||
/*
|
||||
* SUN-DES-1 authentication mechanism
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Xorg: secauth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
|
||||
/*
|
||||
Copyright 1996, 1998 The Open Group
|
||||
|
||||
|
|
@ -24,7 +23,6 @@ not be used in advertising or otherwise to promote the sale, use or
|
|||
other dealings in this Software without prior written authorization
|
||||
from The Open Group.
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
24
os/utils.c
24
os/utils.c
|
|
@ -1,5 +1,3 @@
|
|||
/* $XdotOrg: xserver/xorg/os/utils.c,v 1.26 2006-06-01 22:06:41 daniels Exp $ */
|
||||
/* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
Copyright 1987, 1998 The Open Group
|
||||
|
|
@ -50,7 +48,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
|
|||
OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.96 2004/01/07 04:16:37 dawes Exp $ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
@ -139,13 +136,9 @@ _X_EXPORT Bool noTestExtensions;
|
|||
_X_EXPORT Bool noBigReqExtension = FALSE;
|
||||
#endif
|
||||
#ifdef COMPOSITE
|
||||
#ifdef XFree86Server
|
||||
/* COMPOSITE is disabled by default for now until the
|
||||
* interface is stable */
|
||||
#define COMPOSITE_DEFAULT FALSE
|
||||
#else
|
||||
#define COMPOSITE_DEFAULT TRUE
|
||||
#endif
|
||||
/* COMPOSITE is disabled by default for now until the
|
||||
* interface is stable */
|
||||
#define COMPOSITE_DEFAULT FALSE
|
||||
_X_EXPORT Bool noCompositeExtension = !COMPOSITE_DEFAULT;
|
||||
#endif
|
||||
|
||||
|
|
@ -268,12 +261,6 @@ int SyncOn = 0;
|
|||
extern int SelectWaitTime;
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifndef SPECIAL_MALLOC
|
||||
#define MEMBUG
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
|
||||
#define HAS_SAVED_IDS_AND_SETEUID
|
||||
#endif
|
||||
|
|
@ -549,7 +536,6 @@ GiveUp(int sig)
|
|||
errno = olderrno;
|
||||
}
|
||||
|
||||
#ifndef DDXTIME
|
||||
_X_EXPORT CARD32
|
||||
GetTimeInMillis(void)
|
||||
{
|
||||
|
|
@ -558,7 +544,6 @@ GetTimeInMillis(void)
|
|||
X_GETTIMEOFDAY(&tp);
|
||||
return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
|
||||
}
|
||||
#endif
|
||||
|
||||
_X_EXPORT void
|
||||
AdjustWaitForDelay (pointer waitTime, unsigned long newdelay)
|
||||
|
|
@ -595,7 +580,6 @@ void UseMsg(void)
|
|||
#endif
|
||||
ErrorF("-audit int set audit trail level\n");
|
||||
ErrorF("-auth file select authorization file\n");
|
||||
ErrorF("bc enable bug compatibility\n");
|
||||
ErrorF("-br create root window with black background\n");
|
||||
ErrorF("+bs enable any backing store support\n");
|
||||
ErrorF("-bs disable any backing store support\n");
|
||||
|
|
@ -783,8 +767,6 @@ ProcessCommandLine(int argc, char *argv[])
|
|||
else
|
||||
UseMsg();
|
||||
}
|
||||
else if ( strcmp( argv[i], "bc") == 0)
|
||||
permitOldBugs = TRUE;
|
||||
else if ( strcmp( argv[i], "-br") == 0)
|
||||
blackRoot = TRUE;
|
||||
else if ( strcmp( argv[i], "+bs") == 0)
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ dealings in this Software without prior written authorization from
|
|||
Pascal Haible.
|
||||
*/
|
||||
|
||||
/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.35tsi Exp $ */
|
||||
|
||||
/* Only used if INTERNAL_MALLOC is defined
|
||||
* - otherwise xalloc() in utils.c is used
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Xorg: xdmauth.c,v 1.4 2001/02/09 02:05:24 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
Copyright 1988, 1998 The Open Group
|
||||
|
|
@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
|
|||
from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xdmauth.c,v 1.7 2002/11/05 05:50:34 keithp Exp $ */
|
||||
|
||||
/*
|
||||
* XDM-AUTHENTICATION-1 (XDMCP authentication) and
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.7 2005/05/02 21:57:32 harold Exp $ */
|
||||
/* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */
|
||||
/*
|
||||
* Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
|
||||
*
|
||||
|
|
@ -14,7 +12,6 @@
|
|||
* without express or implied warranty.
|
||||
*
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.31 2003/12/30 21:24:32 herrb Exp $ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
@ -1603,6 +1600,10 @@ get_fromaddr_by_name(
|
|||
, &ai, &aifirst
|
||||
#endif
|
||||
);
|
||||
#if defined(IPv6) && defined(AF_INET6)
|
||||
if (aifirst != NULL)
|
||||
freeaddrinfo(aifirst);
|
||||
#endif
|
||||
xdm_from = argv[i];
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue