diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-01-01 20:39:45 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-01-01 20:39:45 +0000 |
| commit | e2c13297a0c9b5d41e37e8cb1ef623f7501c53e3 (patch) | |
| tree | 77a6154639cc649db5974d61b3966d7dfc8a3cf1 /app | |
| parent | a2672432f0db0a40394cae4cbe1950c0ef831323 (diff) | |
Fix duplicated code resulting from a bad merge of xdm 1.1.9.
Diffstat (limited to 'app')
| -rw-r--r-- | app/xdm/config/Xstartup.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/xdm/config/Xstartup.cpp b/app/xdm/config/Xstartup.cpp index fe663fa5d..576e96b6b 100644 --- a/app/xdm/config/Xstartup.cpp +++ b/app/xdm/config/Xstartup.cpp @@ -1,12 +1,10 @@ XCOMM!/bin/sh 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 -BINDIR/sessreg -a -w WTMP_FILE -u UTMP_FILE \ - -x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER if [ -f /etc/nologin ]; then /usr/X11R6/bin/xmessage -file /etc/nologin -timeout 30 -center exit 1 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 |