Fix duplicated code resulting from a bad merge of xdm 1.1.9.

This commit is contained in:
matthieu 2011-01-01 20:39:44 +00:00
parent 6fba8185af
commit 831b8e77d0

View File

@ -1,12 +1,10 @@
XCOMM!/bin/sh XCOMM!/bin/sh
XCOMM XCOMM
XCOMM $OpenBSD: Xstartup.cpp,v 1.3 2010/03/28 09:33:02 matthieu Exp $ XCOMM $OpenBSD: Xstartup.cpp,v 1.4 2011/01/01 20:39:44 matthieu Exp $
XCOMM XCOMM
BINDIR/sessreg -a -w WTMP_FILE -u UTMP_FILE \
-x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER
if [ -f /etc/nologin ]; then if [ -f /etc/nologin ]; then
/usr/X11R6/bin/xmessage -file /etc/nologin -timeout 30 -center /usr/X11R6/bin/xmessage -file /etc/nologin -timeout 30 -center
exit 1 exit 1
fi fi
BINDIR/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \ BINDIR/sessreg -a -w WTMP_FILE -u UTMP_FILE \
-x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER -x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER