diff options
| author | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2015-01-25 21:51:21 +0000 |
|---|---|---|
| committer | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2015-01-25 21:51:21 +0000 |
| commit | f508cc235cb5b523da7b9900110916733900ca92 (patch) | |
| tree | bde6a9e77cfc4ce6b2613cd12fe30dd6315be502 /app/xdm/config | |
| parent | a24971c23893a068f9891fad6d235b9da8f8347a (diff) | |
Pass sessreg(1) the correct path to the Xservers file.
xdm sessions were erroneously marked as active after being terminated.
Issue noticed and patch by Patrick Keshishian.
ok matthieu@
Diffstat (limited to 'app/xdm/config')
| -rw-r--r-- | app/xdm/config/GiveConsole | 4 | ||||
| -rw-r--r-- | app/xdm/config/TakeConsole | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/xdm/config/GiveConsole b/app/xdm/config/GiveConsole index 22e75c556..cc0700359 100644 --- a/app/xdm/config/GiveConsole +++ b/app/xdm/config/GiveConsole @@ -1,6 +1,6 @@ #!/bin/sh # Assign ownership of the console to the invoking user -# $OpenBSD: GiveConsole,v 1.4 2013/11/18 20:39:48 matthieu Exp $ +# $OpenBSD: GiveConsole,v 1.5 2015/01/25 21:51:20 jca Exp $ # # By convention, both xconsole and xterm -C check that the # console is owned by the invoking user and is readable before attaching @@ -11,4 +11,4 @@ chown $USER /dev/console if [ -c /dev/drm0 ]; then chown $USER /dev/drm0 fi -/usr/X11R6/bin/sessreg -a -l $DISPLAY -u none -x /usr/X11R6/lib/X11/xdm/Xservers $USER +/usr/X11R6/bin/sessreg -a -l $DISPLAY -u none -x /etc/X11/xdm/Xservers $USER diff --git a/app/xdm/config/TakeConsole b/app/xdm/config/TakeConsole index 89ca69cf7..2581b4c92 100644 --- a/app/xdm/config/TakeConsole +++ b/app/xdm/config/TakeConsole @@ -1,11 +1,11 @@ #!/bin/sh # Reassign ownership of the console to root, this should disallow # assignment of console output to any random users's xterm -# $OpenBSD: TakeConsole,v 1.4 2013/11/18 20:39:48 matthieu Exp $ +# $OpenBSD: TakeConsole,v 1.5 2015/01/25 21:51:20 jca Exp $ # chmod 622 /dev/console chown root /dev/console if [ -c /dev/drm0 ]; then chown root /dev/drm0 fi -/usr/X11R6/bin/sessreg -d -l $DISPLAY -u /var/run/utmp -x /usr/X11R6/lib/X11/xdm/Xservers $USER +/usr/X11R6/bin/sessreg -d -l $DISPLAY -u /var/run/utmp -x /etc/X11/xdm/Xservers $USER |