author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
Fri, 25 Mar 2011 17:37:55 -0700 | |
changeset 1097 | 243d7ed7a10c |
parent 1088 | 1c99106ccbe0 |
child 1124 | 7bc7e624f965 |
permissions | -rw-r--r-- |
943
294f64612d23
6948254 Mass update of X gate sources to Oracle copyright format
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
919
diff
changeset
|
1 |
# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. |
98
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
2 |
# |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
3 |
# Permission is hereby granted, free of charge, to any person obtaining a |
919
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
4 |
# copy of this software and associated documentation files (the "Software"), |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
5 |
# to deal in the Software without restriction, including without limitation |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
6 |
# the rights to use, copy, modify, merge, publish, distribute, sublicense, |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
7 |
# and/or sell copies of the Software, and to permit persons to whom the |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
8 |
# Software is furnished to do so, subject to the following conditions: |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
9 |
# |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
10 |
# The above copyright notice and this permission notice (including the next |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
11 |
# paragraph) shall be included in all copies or substantial portions of the |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
12 |
# Software. |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
13 |
# |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
14 |
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
15 |
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
16 |
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
17 |
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
18 |
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
19 |
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
20 |
# DEALINGS IN THE SOFTWARE. |
1088
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
21 |
diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
22 |
diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
23 |
--- configure.ac 2011-02-04 11:37:03.000000000 -0800 |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
24 |
+++ configure.ac 2011-02-15 15:53:16.732320605 -0800 |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
25 |
@@ -1472,6 +1472,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUI |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
26 |
XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}" |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
27 |
XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB" |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
28 |
XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}" |
606
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
194
diff
changeset
|
29 |
+XSERVER_SYS_LIBS="${XSERVER_SYS_LIBS} -lproject" |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
194
diff
changeset
|
30 |
AC_SUBST([XSERVER_LIBS]) |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
194
diff
changeset
|
31 |
AC_SUBST([XSERVER_SYS_LIBS]) |
98
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
32 |
|
1088
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
33 |
diff -Nurp -x '*~' -x '*.orig' dix/main.c dix/main.c |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
34 |
--- dix/main.c 2010-12-02 12:16:53.000000000 -0800 |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
35 |
+++ dix/main.c 2011-02-15 15:53:16.732690379 -0800 |
781
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
36 |
@@ -116,6 +116,11 @@ Equipment Corporation. |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
37 |
#include "dpmsproc.h" |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
38 |
#endif |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
39 |
|
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
40 |
+#ifdef SUNSOFT |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
41 |
+extern void DtloginInit(void); |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
42 |
+extern void DtloginCloseDown(void); |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
43 |
+#endif /* SUNSOFT */ |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
44 |
+ |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
45 |
extern void Dispatch(void); |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
46 |
|
851
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
781
diff
changeset
|
47 |
extern void InitProcVectors(void); |
1088
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
48 |
@@ -168,6 +173,13 @@ int main(int argc, char *argv[], char *e |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
49 |
InitBlockAndWakeupHandlers(); |
781
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
50 |
/* Perform any operating system dependent initializations you'd like */ |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
51 |
OsInit(); |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
52 |
+ |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
53 |
+#ifdef SUNSOFT |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
54 |
+ /* Create pipe for dtlogin authentication info before we tell dtlogin |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
55 |
+ we're done and ready for it to run. */ |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
56 |
+ DtloginInit (); |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
57 |
+#endif |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
58 |
+ |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
59 |
if(serverGeneration == 1) |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
60 |
{ |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
61 |
CreateWellKnownSockets(); |
1088
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
62 |
@@ -290,6 +302,11 @@ int main(int argc, char *argv[], char *e |
781
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
63 |
|
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
64 |
Dispatch(); |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
65 |
|
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
66 |
+#ifdef SUNSOFT |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
67 |
+ /* Return to root privs before calling the rest of close down */ |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
68 |
+ DtloginCloseDown (); |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
69 |
+#endif |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
70 |
+ |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
71 |
UndisplayDevices(); |
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
72 |
|
bf2bd78db20e
6874875 Xorg needs to have privilege to make PCITOOL_DEVICE_SET_REG and PCITOOL_DEVICE_GET_REG ioctl calls
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
705
diff
changeset
|
73 |
/* Now free up whatever must be freed */ |
1088
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
74 |
diff -Nurp -x '*~' -x '*.orig' os/Makefile.am os/Makefile.am |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
75 |
--- os/Makefile.am 2010-03-25 22:17:44.000000000 -0700 |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
76 |
+++ os/Makefile.am 2011-02-15 15:53:16.732911213 -0800 |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
77 |
@@ -47,6 +47,9 @@ if NEED_STRLCAT |
194
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
191
diff
changeset
|
78 |
libos_la_SOURCES += $(STRLCAT_SRCS) |
98
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
79 |
endif |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
80 |
|
1088
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
81 |
+libos_la_SOURCES += dtlogin.c |
98
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
82 |
+libos_la_LIBADD = -lproject |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
83 |
+ |
606
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
194
diff
changeset
|
84 |
EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \ |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
194
diff
changeset
|
85 |
$(XDMCP_SRCS) $(STRLCAT_SRCS) |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
194
diff
changeset
|
86 |
|
1088
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
87 |
diff -Nurp -x '*~' -x '*.orig' os/auth.c os/auth.c |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
88 |
--- os/auth.c 2010-05-12 20:16:31.000000000 -0700 |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
89 |
+++ os/auth.c 2011-02-15 15:53:16.733178408 -0800 |
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
90 |
@@ -290,6 +290,19 @@ AddAuthorization (unsigned name_length, |
98
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
91 |
return 0; |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
92 |
} |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
93 |
|
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
94 |
+#ifdef SUNSOFT |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
95 |
+/* This function is called from dtlogin.c |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
96 |
+ * This is added to do "chmod authorization_file" since |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
97 |
+ * this file is owned by root and we need to change this |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
98 |
+ * to user logged on. |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
99 |
+ */ |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
100 |
+const char * |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
101 |
+GetAuthFilename(void) |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
102 |
+{ |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
103 |
+ return (authorization_file); |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
104 |
+} |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
105 |
+#endif |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
106 |
+ |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
107 |
#ifdef XCSECURITY |
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
108 |
|
c21b46ed1efd
6489660 Xorg server 7.2 [PSARC 2007/051]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
109 |
XID |