633N/A# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
606N/A# Use subject to license terms.
606N/A# Permission is hereby granted, free of charge, to any person obtaining a
606N/A# copy of this software and associated documentation files (the
606N/A# "Software"), to deal in the Software without restriction, including
606N/A# without limitation the rights to use, copy, modify, merge, publish,
606N/A# distribute,
and/or sell copies of the Software, and to permit persons
606N/A# to whom the Software is furnished to do so, provided that the above
606N/A# copyright notice(s) and this permission notice appear in all copies of
606N/A# the Software and that both the above copyright notice(s) and this
606N/A# permission notice appear in supporting documentation.
606N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
606N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
606N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
606N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
606N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
606N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
606N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
606N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
606N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
606N/A# Except as contained in this notice, the name of a copyright holder
606N/A# shall not be used in advertising or otherwise to promote the sale, use
606N/A# or other dealings in this Software without prior written authorization
606N/A# of the copyright holder.
633N/A@@ -216,6 +216,14 @@ dnl Find the math libary
98N/A AC_CHECK_LIB(m, sqrt)
606N/A AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))
196N/A+dnl Check for libtsol for Solaris Trusted Extensions module
196N/A+AC_CHECK_LIB(tsol, bsllow, [BUILD_TSOL_MODULE=yes], [BUILD_TSOL_MODULE=no])
98N/A+AM_CONDITIONAL(BUILD_TSOL_MODULE, [test x$BUILD_TSOL_MODULE = xyes])
235N/A+if test "x$BUILD_TSOL_MODULE" = xyes; then
606N/A+ TSOL_SYS_LIBS='-ltsol -ltsnet -lsecdb -lbsm'
98N/A dnl AGPGART headers
633N/A@@ -1286,8 +1294,8 @@ AC_MSG_RESULT([$XVFB])
235N/A AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
235N/A if test "x$XVFB" = xyes; then
606N/A- XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB"
606N/A- XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
606N/A+ XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB $TSOL_LIB"
606N/A+ XVFB_SYS_LIBS="$XVFBMODULES_LIBS $TSOL_SYS_LIBS"
606N/A AC_SUBST([XVFB_SYS_LIBS])
633N/A@@ -1304,8 +1312,8 @@ AC_MSG_RESULT([$XNEST])
235N/A AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
235N/A if test "x$XNEST" = xyes; then
606N/A- XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB $IA_LIB"
606N/A- XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
606N/A+ XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB $IA_LIB $TSOL_LIB"
606N/A+ XNEST_SYS_LIBS="$XNESTMODULES_LIBS $TSOL_SYS_LIBS"
606N/A AC_SUBST([XNEST_SYS_LIBS])
633N/A@@ -1658,8 +1666,8 @@ AC_MSG_RESULT([$XPRINT])
235N/A if test "x$XPRINT" = xyes; then
606N/A PKG_CHECK_MODULES([XPRINTMODULES], [printproto x11 xfont $XDMCP_MODULES xau])
606N/A XPRINT_CFLAGS="$XPRINTMODULES_CFLAGS -DXPRINT"
606N/A- XPRINT_LIBS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS $MIEXT_DAMAGE_LIB $XKB_LIB $XKB_STUB_LIB"
606N/A- XPRINT_SYS_LIBS="$XPRINTMODULES_LIBS"
606N/A+ XPRINT_LIBS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS $MIEXT_DAMAGE_LIB $XKB_LIB $XKB_STUB_LIB $TSOL_LIB"
606N/A+ XPRINT_SYS_LIBS="$XPRINTMODULES_LIBS $TSOL_SYS_LIBS"
606N/A AC_SUBST([xpconfigdir])
633N/A@@ -2014,7 +2022,7 @@ if test "$KDRIVE" = yes; then
606N/A KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
235N/A- KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB $OS_LIB"
235N/A+ KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB $TSOL_LIB $OS_LIB"
98N/A # Add Sun IA extension
98N/A+# Add Sun Trusted Extensions extension
98N/A@@ -74,8 +74,8 @@ Equipment Corporation.
98N/A ******************************************************************/
98N/A-/* XSERVER_DTRACE additions:
98N/A- * Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
606N/A+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
98N/A * Permission is hereby granted, free of charge, to any person obtaining a
98N/A * copy of this software and associated documentation files (the
606N/A@@ -177,6 +177,10 @@ extern int connBlockScreenStart;
606N/A static void KillAllClients(void);
98N/A+SecurityHookPtr pSecHook = NULL;
98N/A static int nextFreeClientID; /* always MIN free client ID */
98N/A static int nClients; /* number of authorized clients */
606N/A@@ -789,7 +793,12 @@ ProcCirculateWindow(ClientPtr client)
606N/A return(client->noClientException);
606N/A GetGeometry(ClientPtr client, xGetGeometryReply *rep)
606N/A@@ -1927,7 +1936,12 @@ ProcPutImage(ClientPtr client)
606N/A return (client->noClientException);
606N/A DoGetImage(ClientPtr client, int format, Drawable drawable,
606N/A int x, int y, int width, int height,
606N/A Mask planemask, xGetImageReply **im_return)
606N/A@@ -3400,6 +3414,11 @@ CloseDownClient(ClientPtr client)
98N/A UngrabServer(client);
98N/A BITCLEAR(grabWaiters, client->index);
98N/A+ (*pSecHook->DeleteClientFromAnySelections)(client);
98N/A DeleteClientFromAnySelections(client);
98N/A ReleaseActiveGrabs(client);
98N/A DeleteClientFontStuff(client);
98N/A@@ -76,7 +76,7 @@ Equipment Corporation.
98N/A /*****************************************************************
98N/A-Copyright 2003-2005 Sun Microsystems, Inc.
98N/A+Copyright 2007 Sun Microsystems, Inc.
98N/A All rights reserved.
606N/A@@ -299,7 +299,12 @@ static void DoEnterLeaveEvents(
98N/A-static WindowPtr XYToWindow(
98N/A+WindowPtr XYToWindow(
606N/A@@ -2142,7 +2147,12 @@ PointInBorderSize(WindowPtr pWin, int x,
606N/A * @returns the window at the given coordinates.
98N/A XYToWindow(int x, int y)
98N/A@@ -45,6 +45,34 @@ SOFTWARE.
98N/A ******************************************************************/
98N/A+/* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
98N/A+ * Permission is hereby granted, free of charge, to any person obtaining a
98N/A+ * copy of this software and associated documentation files (the
98N/A+ * "Software"), to deal in the Software without restriction, including
98N/A+ * without limitation the rights to use, copy, modify, merge, publish,
98N/A+ * distribute,
and/or sell copies of the Software, and to permit persons
98N/A+ * to whom the Software is furnished to do so, provided that the above
98N/A+ * copyright notice(s) and this permission notice appear in all copies of
98N/A+ * the Software and that both the above copyright notice(s) and this
98N/A+ * permission notice appear in supporting documentation.
98N/A+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
98N/A+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
98N/A+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
98N/A+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
98N/A+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
98N/A+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
98N/A+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
98N/A+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
98N/A+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
98N/A+ * Except as contained in this notice, the name of a copyright holder
98N/A+ * shall not be used in advertising or otherwise to promote the sale, use
98N/A+ * or other dealings in this Software without prior written authorization
98N/A+ * of the copyright holder.
98N/A #ifdef HAVE_DIX_CONFIG_H
606N/A@@ -60,6 +88,11 @@ SOFTWARE.
98N/A+extern SecurityHookPtr pSecHook;
98N/A /*****************************************************************
606N/A@@ -239,6 +272,12 @@ ProcChangeProperty(ClientPtr client)
98N/A+ err = (*pSecHook->ChangeWindowProperty)(client, pWin, stuff->property,
98N/A+ stuff->type, (int)format, (int)mode, len, (pointer)&stuff[1], TRUE);
606N/A err = dixChangeWindowProperty(client, pWin, stuff->property, stuff->type,
606N/A (int)format, (int)mode, len, &stuff[1],
606N/A@@ -629,6 +668,11 @@ ProcDeleteProperty(ClientPtr client)
98N/A+ result = (*pSecHook->DeleteProperty)(client, pWin, stuff->property);
606N/A result = DeleteProperty(client, pWin, stuff->property);
98N/A if (client->noClientException != Success)
98N/A return(client->noClientException);
98N/A@@ -98,6 +98,33 @@ Equipment Corporation.
98N/A ******************************************************************/
98N/A+/* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
98N/A+ * Permission is hereby granted, free of charge, to any person obtaining a
98N/A+ * copy of this software and associated documentation files (the
98N/A+ * "Software"), to deal in the Software without restriction, including
98N/A+ * without limitation the rights to use, copy, modify, merge, publish,
98N/A+ * distribute,
and/or sell copies of the Software, and to permit persons
98N/A+ * to whom the Software is furnished to do so, provided that the above
98N/A+ * copyright notice(s) and this permission notice appear in all copies of
98N/A+ * the Software and that both the above copyright notice(s) and this
98N/A+ * permission notice appear in supporting documentation.
98N/A+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
98N/A+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
98N/A+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
98N/A+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
98N/A+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
98N/A+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
98N/A+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
98N/A+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
98N/A+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
98N/A+ * Except as contained in this notice, the name of a copyright holder
98N/A+ * shall not be used in advertising or otherwise to promote the sale, use
98N/A+ * or other dealings in this Software without prior written authorization
98N/A+ * of the copyright holder.
98N/A #ifdef HAVE_DIX_CONFIG_H
606N/A@@ -172,6 +199,11 @@ static Bool TileScreenSaver(int i, int k
98N/A _X_EXPORT int numSaveUndersViewable = 0;
98N/A _X_EXPORT int deltaSaveUndersViewable = 0;
98N/A+extern SecurityHookPtr pSecHook;
606N/A@@ -820,6 +852,11 @@ FreeWindowResources(WindowPtr pWin)
98N/A DeleteWindowFromAnySaveSet(pWin);
98N/A+ (*pSecHook->DeleteWindowFromAnySelections)(pWin);
98N/A DeleteWindowFromAnySelections(pWin);
98N/A DeleteWindowFromAnyEvents(pWin, TRUE);
98N/A REGION_UNINIT(pScreen, &pWin->clipList);
606N/A@@ -1915,7 +1952,12 @@ IsSiblingAboveMe(
606N/A@@ -1952,7 +1994,12 @@ MakeBoundingRegion (
606N/A@@ -2161,7 +2208,12 @@ WhereDoIGoInTheStack(
98N/A ReflectStackChange(
606N/A@@ -87,6 +87,7 @@ XDMX_LIBS = \
606N/A Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
606N/A@@ -127,6 +127,7 @@ static ModuleDefault ModuleDefaults[] =
606N/A {.name = "dri2", .toLoad = TRUE, .load_opt=NULL},
606N/A {.name = "ia", .toLoad = TRUE, .load_opt=NULL},
606N/A+ {.name = "xtsol", .toLoad = TRUE, .load_opt=NULL},
606N/A {.name = NULL, .toLoad = FALSE, .load_opt=NULL}
606N/A libia_la_LDFLAGS = -avoid-version
98N/A+if BUILD_TSOL_MODULE
98N/A+# Sun Trusted Extensions extension module additions
98N/A+libxtsol_la_LDFLAGS = -avoid-version
633N/A@@ -173,6 +173,14 @@ extern void MarkClientException(
633N/A extern void ddxBeforeReset (void);
633N/A+extern int DoGetImage(ClientPtr client, int format, Drawable drawable,
633N/A+ int x, int y, int width, int height,
633N/A+ Mask planemask, xGetImageReply **im_return);
633N/A+extern int GetGeometry(ClientPtr client, xGetGeometryReply *rep);
633N/A extern void CopyISOLatin1Lowered(
633N/A@@ -84,4 +84,8 @@ extern int ProcRecolorCursor(ClientPtr /
633N/A extern void PostSyntheticMotion(int x, int y, int screen, unsigned long time);
633N/A+extern WindowPtr XYToWindow(int x, int y);
633N/A #endif /* DIXEVENTS_H */
98N/A@@ -45,6 +45,34 @@ SOFTWARE.
98N/A ******************************************************************/
98N/A+/* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
98N/A+ * Permission is hereby granted, free of charge, to any person obtaining a
98N/A+ * copy of this software and associated documentation files (the
98N/A+ * "Software"), to deal in the Software without restriction, including
98N/A+ * without limitation the rights to use, copy, modify, merge, publish,
98N/A+ * distribute,
and/or sell copies of the Software, and to permit persons
98N/A+ * to whom the Software is furnished to do so, provided that the above
98N/A+ * copyright notice(s) and this permission notice appear in all copies of
98N/A+ * the Software and that both the above copyright notice(s) and this
98N/A+ * permission notice appear in supporting documentation.
98N/A+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
98N/A+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
98N/A+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
98N/A+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
98N/A+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
98N/A+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
98N/A+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
98N/A+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
98N/A+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
98N/A+ * Except as contained in this notice, the name of a copyright holder
98N/A+ * shall not be used in advertising or otherwise to promote the sale, use
98N/A+ * or other dealings in this Software without prior written authorization
98N/A+ * of the copyright holder.
98N/A #ifndef EXTENSIONSTRUCT_H
98N/A #define EXTENSIONSTRUCT_H
606N/A@@ -55,6 +83,10 @@ SOFTWARE.
98N/A typedef struct _ExtensionEntry {
98N/A void (* CloseDown)( /* called at server shutdown */
606N/A@@ -108,5 +140,21 @@ extern Bool AddExtensionAlias(
606N/A extern ExtensionEntry *CheckExtension(const char *extname);
606N/A extern ExtensionEntry *GetExtensionEntry(int major);
606N/A+ XID (*CheckAuthorization)(unsigned int, char *, unsigned int,
98N/A+ char *, ClientPtr , char **);
98N/A+ int (*ChangeWindowProperty)(ClientPtr, WindowPtr, Atom, Atom, int, int,
98N/A+ unsigned long, pointer, Bool);
98N/A+ int (*DeleteProperty)(ClientPtr, WindowPtr, Atom);
98N/A+ void (*DeleteClientFromAnySelections)(ClientPtr);
98N/A+ void (*DeleteWindowFromAnySelections)(WindowPtr);
98N/A+} SecurityHook, *SecurityHookPtr;
98N/A+extern SecurityHookPtr pSecHook;
98N/A #endif /* EXTENSIONSTRUCT_H */
633N/A@@ -256,4 +256,9 @@ extern void DisableMapUnmapEvents(
633N/A extern void EnableMapUnmapEvents(
633N/A WindowPtr /* pWin */ );
633N/A+extern void ReflectStackChange(WindowPtr pWin, WindowPtr pSib, VTKind kind);
606N/A@@ -34,6 +34,10 @@ if RECORD
606N/A@@ -59,6 +63,7 @@ SUBDIRS = \
235N/A@@ -86,6 +86,10 @@ SOFTWARE.
235N/A #define SolarisIAExtension
98N/A+#ifdef TSOL /* Maintaining binary compatibility with Xtsol module */
98N/A #if defined(QNX4) /* sleaze for Watcom on QNX4 ... */
606N/A@@ -227,6 +231,9 @@ extern Bool noXvExtension;
235N/A #ifdef SolarisIAExtension
606N/A@@ -272,6 +279,10 @@ typedef void (*InitExtension)(INITARGS);
235N/A #ifdef SolarisIAExtension
235N/A /* FIXME: this whole block of externs should be from the appropriate headers */
606N/A@@ -398,6 +409,9 @@ extern void CompositeExtensionInit(INITA
235N/A #ifdef SolarisIAExtension
235N/A extern void IAExtensionInit(void);
235N/A+extern void TsolExtensionInit(void);
235N/A /* The following is only a small first step towards run-time
235N/A * configurable extensions.
606N/A@@ -458,6 +472,9 @@ static ExtensionToggle ExtensionToggleLi
235N/A { "SECURITY", &noSecurityExtension },
235N/A+ { TSOLNAME /* "SUN_TSOL" */, &noXTSolExtension },
235N/A { "SYNC", &noSyncExtension },
606N/A@@ -682,6 +699,11 @@ InitExtensions(argc, argv)
235N/A #ifdef SolarisIAExtension
235N/A if (!noIAExtension) IAExtensionInit();
235N/A+ if (!noXTSolExtension) {
98N/A@@ -44,6 +44,33 @@ ARISING OUT OF OR IN CONNECTION WITH THE
98N/A ******************************************************************/
98N/A+/* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
98N/A+ * Permission is hereby granted, free of charge, to any person obtaining a
98N/A+ * copy of this software and associated documentation files (the
98N/A+ * "Software"), to deal in the Software without restriction, including
98N/A+ * without limitation the rights to use, copy, modify, merge, publish,
98N/A+ * distribute,
and/or sell copies of the Software, and to permit persons
98N/A+ * to whom the Software is furnished to do so, provided that the above
98N/A+ * copyright notice(s) and this permission notice appear in all copies of
98N/A+ * the Software and that both the above copyright notice(s) and this
98N/A+ * permission notice appear in supporting documentation.
98N/A+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
98N/A+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
98N/A+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
98N/A+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
98N/A+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
98N/A+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
98N/A+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
98N/A+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
98N/A+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
98N/A+ * Except as contained in this notice, the name of a copyright holder
98N/A+ * shall not be used in advertising or otherwise to promote the sale, use
98N/A+ * or other dealings in this Software without prior written authorization
98N/A+ * of the copyright holder.
98N/A /*****************************************************************
98N/A * Stuff to create connections --- OS dependent
606N/A@@ -298,6 +325,11 @@ static int ListenTransCount;
98N/A static void ErrorConnMax(XtransConnInfo /* trans_conn */);
98N/A+extern SecurityHookPtr pSecHook;
98N/A static XtransConnInfo
98N/A lookup_trans_conn (int fd)
606N/A@@ -721,6 +753,12 @@ ClientAuthorized(ClientPtr client,
98N/A+ auth_id = (*pSecHook->CheckAuthorization) (proto_n, auth_proto,
98N/A+ string_n, auth_string, client, &reason);
98N/A auth_id = CheckAuthorization (proto_n, auth_proto,
98N/A string_n, auth_string, client, &reason);
606N/A@@ -1148,3 +1148,27 @@ SecurityExtensionInit(INITARGS)
606N/A /* Label objects that were created before we could register ourself */
606N/A SecurityLabelInitial();
606N/A+/* API needed for Xtsol module to
get/set client trustLevel */
606N/A+getClientTrustLevel(ClientPtr client)
606N/A+ SecurityStateRec *state;
606N/A+ state = dixLookupPrivate(&client->devPrivates, stateKey);
606N/A+ return state->trustLevel;
606N/A+setClientTrustLevel(ClientPtr client, unsigned int newLevel)
606N/A+ SecurityStateRec *state;
606N/A+ unsigned int oldLevel;
606N/A+ state = dixLookupPrivate(&client->devPrivates, stateKey);
606N/A+ oldLevel = state->trustLevel;
606N/A+ state->trustLevel = newLevel;
606N/A@@ -80,4 +80,8 @@ typedef struct {
606N/A /* Give this value or higher to the -audit option to get security messages */
606N/A #define SECURITY_AUDIT_LEVEL 4
606N/A+/* API needed for Xtsol module to
get/set client trustLevel */
606N/A+extern unsigned int getClientTrustLevel(ClientPtr client);
606N/A+extern unsigned int setClientTrustLevel(ClientPtr client, unsigned int newLevel);
606N/A #endif /* _SECURITY_SRV_H */