diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2018-07-11 19:20:41 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2018-07-11 19:20:41 +0000 |
commit | 0db8836274139cb7808603433b8f4a153494e5d3 (patch) | |
tree | 84813ea78573e0a36a36ee3a0975eaf073c9826c /app | |
parent | 8371646ecbf3f9c9e55b1a6e652a542aa0655211 (diff) |
sessreg -x is useless if not updating utmp. Remove it.
Also don't try to remove utmp lines that were not written.
Diffstat (limited to 'app')
-rw-r--r-- | app/xenodm/config/GiveConsole | 4 | ||||
-rw-r--r-- | app/xenodm/config/TakeConsole | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/xenodm/config/GiveConsole b/app/xenodm/config/GiveConsole index 1abc3fd96..9f998aa1d 100644 --- a/app/xenodm/config/GiveConsole +++ b/app/xenodm/config/GiveConsole @@ -1,6 +1,6 @@ #!/bin/sh # Assign ownership of the console to the invoking user -# $OpenBSD: GiveConsole,v 1.1 2016/10/23 08:30:37 matthieu Exp $ +# $OpenBSD: GiveConsole,v 1.2 2018/07/11 19:20:40 matthieu 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 /etc/X11/xenodm/Xservers $USER +/usr/X11R6/bin/sessreg -a -l $DISPLAY -u none $USER diff --git a/app/xenodm/config/TakeConsole b/app/xenodm/config/TakeConsole index 7cce126e5..a7ae840db 100644 --- a/app/xenodm/config/TakeConsole +++ b/app/xenodm/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.2 2017/10/04 18:28:59 matthieu Exp $ +# $OpenBSD: TakeConsole,v 1.3 2018/07/11 19:20:40 matthieu Exp $ # chown root /dev/console chmod 622 /dev/console if [ -c /dev/drm0 ]; then chown root /dev/drm0 fi -/usr/X11R6/bin/sessreg -d -l $DISPLAY -u /var/run/utmp -x /etc/X11/xenodm/Xservers $USER +/usr/X11R6/bin/sessreg -d -l $DISPLAY -u none $USER |