# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.

# Use subject to license terms.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the

# "Software"), to deal in the Software without restriction, including

# without limitation the rights to use, copy, modify, merge, publish,

# distribute, and/or sell copies of the Software, and to permit persons

# to whom the Software is furnished to do so, provided that the above

# copyright notice(s) and this permission notice appear in all copies of

# the Software and that both the above copyright notice(s) and this

# permission notice appear in supporting documentation.

# 

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

# 

# Except as contained in this notice, the name of a copyright holder

# shall not be used in advertising or otherwise to promote the sale, use

# or other dealings in this Software without prior written authorization

# of the copyright holder.

diff -urp -x '*~' -x '*.orig' configure.ac configure.ac

 XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}"

 XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB"

 XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}"

+XSERVER_SYS_LIBS="${XSERVER_SYS_LIBS} -lproject"

 AC_SUBST([XSERVER_LIBS])

 AC_SUBST([XSERVER_SYS_LIBS])

diff -urp -x '*~' -x '*.orig' os/Makefile.am os/Makefile.am

 	xdmauth.c	\

 	xstrans.c	\

 	xprintf.c	\

+	dtlogin.c	\

 	$(XORG_SRCS)

 if SECURE_RPC

 libos_la_SOURCES += $(STRLCAT_SRCS)

 endif

+libos_la_LIBADD = -lproject

+

 EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \

      $(XDMCP_SRCS) $(STRLCAT_SRCS)

diff -urp -x '*~' -x '*.orig' os/auth.c os/auth.c

@@ -289,6 +289,19 @@ AddAuthorization (unsigned name_length, 

     return 0;

 }

+#ifdef SUNSOFT

+/* This function is called from dtlogin.c 

+ * This is added to do "chmod authorization_file" since

+ * this file is owned by root and we need to change this

+ * to user logged on.  

+ */

+const char *

+GetAuthFilename(void)

+{

+    return (authorization_file);

+}

+#endif

+

 #ifdef XCSECURITY

 XID

diff -urp -x '*~' -x '*.orig' os/connection.c os/connection.c

 # include "../dix/Xserver-dtrace.h"

 #endif

+#ifdef SUNSOFT

+extern void DtloginInit(void);

+#endif /* SUNSOFT */

+

 static int lastfdesc;		/* maximum file descriptor */

 fd_set WellKnownConnections;	/* Listener mask */

     XFD_COPYSET (&WellKnownConnections, &AllSockets);

     ResetHosts(display);

+#ifdef SUNSOFT

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

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

+    DtloginInit ();

+#endif

+

     InitParentProcess();

 #ifdef XDMCP