diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-10-17 08:25:12 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-10-17 08:25:12 +0000 |
| commit | 6276e7260cbbecac70f89242cdec4f09caa55f1f (patch) | |
| tree | da516ec741ecf11179661ef78115c76181d239bb /app/xdm/config | |
| parent | 33978d08ea305c896741d052aa181253af43f4aa (diff) | |
Don't automatically launch dbus as part of the default user sessions.
requested by deraadt@ no objection ajacoutot@
Diffstat (limited to 'app/xdm/config')
| -rw-r--r-- | app/xdm/config/Xsession.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/xdm/config/Xsession.cpp b/app/xdm/config/Xsession.cpp index 307136371..4bac5e3d5 100644 --- a/app/xdm/config/Xsession.cpp +++ b/app/xdm/config/Xsession.cpp @@ -1,6 +1,6 @@ XCOMM!SHELL_CMD XCOMM -XCOMM $OpenBSD: Xsession.cpp,v 1.13 2014/02/25 22:16:24 matthieu Exp $ +XCOMM $OpenBSD: Xsession.cpp,v 1.14 2015/10/17 08:25:11 matthieu Exp $ XCOMM redirect errors to a file in user's home directory if we can @@ -105,9 +105,6 @@ else exec `eval $XDESKTOP` } #endif - if [ -x /usr/local/bin/dbus-launch -a -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then - eval `dbus-launch --sh-syntax --exit-with-session` - fi BINDIR/xterm & BINDIR/fvwm fi |