98N/A# Copyright 2007 Sun Microsystems, Inc. All rights reserved.

98N/A# Use subject to license terms.

98N/A#

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#

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#

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

194N/Adiff -urp -x '*~' -x '*.orig' configure.ac configure.ac

705N/A--- configure.ac 2009-05-08 17:43:15.381265000 -0700

705N/A+++ configure.ac 2009-05-08 17:43:23.621871000 -0700

705N/A@@ -1198,6 +1198,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUI

606N/A XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}"

606N/A XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB"

606N/A XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}"

606N/A+XSERVER_SYS_LIBS="${XSERVER_SYS_LIBS} -lproject"

606N/A AC_SUBST([XSERVER_LIBS])

606N/A AC_SUBST([XSERVER_SYS_LIBS])

98N/A

194N/Adiff -urp -x '*~' -x '*.orig' os/Makefile.am os/Makefile.am

705N/A--- os/Makefile.am 2009-02-13 14:24:04.000000000 -0800

705N/A+++ os/Makefile.am 2009-05-08 17:43:23.622460000 -0700

705N/A@@ -24,6 +24,7 @@ libos_la_SOURCES = \

98N/A xdmauth.c \

98N/A xstrans.c \

98N/A xprintf.c \

98N/A+ dtlogin.c \

191N/A $(XORG_SRCS)

98N/A

606N/A if SECURE_RPC

705N/A@@ -38,6 +39,8 @@ if NEED_STRLCAT

194N/A libos_la_SOURCES += $(STRLCAT_SRCS)

98N/A endif

98N/A

98N/A+libos_la_LIBADD = -lproject

98N/A+

606N/A EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \

606N/A $(XDMCP_SRCS) $(STRLCAT_SRCS)

606N/A

194N/Adiff -urp -x '*~' -x '*.orig' os/auth.c os/auth.c

705N/A--- os/auth.c 2009-03-13 10:34:03.000000000 -0700

705N/A+++ os/auth.c 2009-05-08 17:43:23.622937000 -0700

606N/A@@ -289,6 +289,19 @@ AddAuthorization (unsigned name_length,

98N/A return 0;

98N/A }

98N/A

98N/A+#ifdef SUNSOFT

98N/A+/* This function is called from dtlogin.c

98N/A+ * This is added to do "chmod authorization_file" since

98N/A+ * this file is owned by root and we need to change this

98N/A+ * to user logged on.

98N/A+ */

98N/A+const char *

98N/A+GetAuthFilename(void)

98N/A+{

98N/A+ return (authorization_file);

98N/A+}

98N/A+#endif

98N/A+

98N/A #ifdef XCSECURITY

98N/A

98N/A XID

194N/Adiff -urp -x '*~' -x '*.orig' os/connection.c os/connection.c

705N/A--- os/connection.c 2009-04-14 10:14:57.000000000 -0700

705N/A+++ os/connection.c 2009-05-08 17:43:23.623731000 -0700

705N/A@@ -131,6 +131,10 @@ typedef const char *string;

98N/A # include "../dix/Xserver-dtrace.h"

98N/A #endif

98N/A

98N/A+#ifdef SUNSOFT

98N/A+extern void DtloginInit(void);

98N/A+#endif /* SUNSOFT */

98N/A+

606N/A static int lastfdesc; /* maximum file descriptor */

98N/A

98N/A fd_set WellKnownConnections; /* Listener mask */

705N/A@@ -435,6 +439,12 @@ CreateWellKnownSockets(void)

606N/A XFD_COPYSET (&WellKnownConnections, &AllSockets);

606N/A ResetHosts(display);

606N/A

98N/A+#ifdef SUNSOFT

98N/A+ /* Create pipe for dtlogin authentication info before we tell dtlogin

98N/A+ we're done and ready for it to run. */

98N/A+ DtloginInit ();

98N/A+#endif

606N/A+

606N/A InitParentProcess();

606N/A

606N/A #ifdef XDMCP