17 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
17 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 # DEALINGS IN THE SOFTWARE. |
20 # DEALINGS IN THE SOFTWARE. |
21 diff --git a/configure.ac b/configure.ac |
21 diff --git a/configure.ac b/configure.ac |
22 index de6665a..ac7caae 100644 |
22 index d59ea4a..d960d4c 100644 |
23 --- a/configure.ac |
23 --- a/configure.ac |
24 +++ b/configure.ac |
24 +++ b/configure.ac |
25 @@ -1458,6 +1458,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) |
25 @@ -1464,6 +1464,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) |
26 XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}" |
26 XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}" |
27 XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB" |
27 XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB" |
28 XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}" |
28 XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}" |
29 +XSERVER_SYS_LIBS="${XSERVER_SYS_LIBS} -lproject" |
29 +XSERVER_SYS_LIBS="${XSERVER_SYS_LIBS} -lproject" |
30 AC_SUBST([XSERVER_LIBS]) |
30 AC_SUBST([XSERVER_LIBS]) |
31 AC_SUBST([XSERVER_SYS_LIBS]) |
31 AC_SUBST([XSERVER_SYS_LIBS]) |
32 |
32 |
33 diff --git a/dix/main.c b/dix/main.c |
33 diff --git a/dix/main.c b/dix/main.c |
34 index e20ffd6..7cab838 100644 |
34 index f79e861..148fb08 100644 |
35 --- a/dix/main.c |
35 --- a/dix/main.c |
36 +++ b/dix/main.c |
36 +++ b/dix/main.c |
37 @@ -115,6 +115,11 @@ Equipment Corporation. |
37 @@ -115,6 +115,11 @@ Equipment Corporation. |
38 #include "dpmsproc.h" |
38 #include "dpmsproc.h" |
39 #endif |
39 #endif |
58 +#endif |
58 +#endif |
59 + |
59 + |
60 if(serverGeneration == 1) |
60 if(serverGeneration == 1) |
61 { |
61 { |
62 CreateWellKnownSockets(); |
62 CreateWellKnownSockets(); |
63 @@ -293,6 +305,11 @@ int main(int argc, char *argv[], char *envp[]) |
63 @@ -294,6 +306,11 @@ int main(int argc, char *argv[], char *envp[]) |
64 pthread_mutex_unlock(&serverRunningMutex); |
64 pthread_mutex_unlock(&serverRunningMutex); |
65 #endif |
65 #endif |
66 |
66 |
67 +#ifdef SUNSOFT |
67 +#ifdef SUNSOFT |
68 + /* Return to root privs before calling the rest of close down */ |
68 + /* Return to root privs before calling the rest of close down */ |
71 + |
71 + |
72 UndisplayDevices(); |
72 UndisplayDevices(); |
73 |
73 |
74 /* Now free up whatever must be freed */ |
74 /* Now free up whatever must be freed */ |
75 diff --git a/os/Makefile.am b/os/Makefile.am |
75 diff --git a/os/Makefile.am b/os/Makefile.am |
76 index 66a4a0f..b4f90ce 100644 |
76 index 725691d..c41954d 100644 |
77 --- a/os/Makefile.am |
77 --- a/os/Makefile.am |
78 +++ b/os/Makefile.am |
78 +++ b/os/Makefile.am |
79 @@ -40,6 +40,9 @@ if NEED_STRLCAT |
79 @@ -41,6 +41,9 @@ if NEED_STRLCAT |
80 libos_la_SOURCES += $(STRLCAT_SRCS) |
80 libos_la_SOURCES += $(STRLCAT_SRCS) |
81 endif |
81 endif |
82 |
82 |
83 +libos_la_SOURCES += dtlogin.c |
83 +libos_la_SOURCES += dtlogin.c |
84 +libos_la_LIBADD = -lproject |
84 +libos_la_LIBADD = -lproject |