Attachment 2378 Details for Bug 2959 – xorg-x11-6.8.2-xdm-config-utmp-fixes.patch

[patch] xorg-x11-6.8.2-xdm-config-utmp-fixes.patch

xorg-x11-6.8.2-xdm-config-utmp-fixes.patch (text/plain), 2.88 KB, created by Mike A. Harris on 2005-04-10 17:22:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike A. Harris

Created: 2005-04-10 17:22:42 UTC

Size: 2.88 KB

patch

obsolete

>diff -Naur xc.orig/programs/xdm/config/Imakefile xc/programs/xdm/config/Imakefile
>--- xc.orig/programs/xdm/config/Imakefile	2004-07-27 02:24:47.000000000 -0400
>+++ xc/programs/xdm/config/Imakefile	2005-04-10 19:48:25.000000000 -0400
>@@ -56,6 +56,8 @@
> InstallNamedProg(GiveConsole,GiveConsole,$(XDMDIR))
> InstallNamedProg(TakeConsole,TakeConsole,$(XDMDIR))
> InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMDIR))
>+InstallNamedProg(Xstartup,Xstartup,$(XDMDIR))
>+InstallNamedProg(Xreset,Xreset,$(XDMDIR))
> InstallNamedProg(Xwilling,Xwilling,$(XDMDIR))
> #else
> InstallNonExecFileNoClobber(xdm-config,$(XDMDIR))
>@@ -66,6 +68,8 @@
> InstallNamedProgNoClobber(GiveConsole,GiveConsole,$(XDMDIR))
> InstallNamedProgNoClobber(TakeConsole,TakeConsole,$(XDMDIR))
> InstallNamedProgNoClobber(Xsetup_0,Xsetup_0,$(XDMDIR))
>+InstallNamedProgNoClobber(Xstartup,Xstartup,$(XDMDIR))
>+InstallNamedProgNoClobber(Xreset,Xreset,$(XDMDIR))
> InstallNamedProgNoClobber(Xwilling,Xwilling,$(XDMDIR))
> #endif
> 
>diff -Naur xc.orig/programs/xdm/config/Xreset xc/programs/xdm/config/Xreset
>--- xc.orig/programs/xdm/config/Xreset	1969-12-31 19:00:00.000000000 -0500
>+++ xc/programs/xdm/config/Xreset	2005-04-10 19:39:57.000000000 -0400
>@@ -0,0 +1,5 @@
>+#!/bin/sh
>+# Deregister a login. (Derived from TakeConsole as follows:)
>+#
>+/usr/X11R6/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \
>+	-x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
>diff -Naur xc.orig/programs/xdm/config/Xstartup xc/programs/xdm/config/Xstartup
>--- xc.orig/programs/xdm/config/Xstartup	1969-12-31 19:00:00.000000000 -0500
>+++ xc/programs/xdm/config/Xstartup	2005-04-10 19:39:49.000000000 -0400
>@@ -0,0 +1,5 @@
>+#!/bin/sh
>+# Register a login (derived from GiveConsole as follows:)
>+#
>+/usr/X11R6/bin/sessreg  -a -w "/var/log/wtmp" -u "/var/run/utmp" \
>+	-x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
>diff -Naur xc.orig/programs/xdm/config/xdm-conf.cpp xc/programs/xdm/config/xdm-conf.cpp
>--- xc.orig/programs/xdm/config/xdm-conf.cpp	2004-04-23 15:54:43.000000000 -0400
>+++ xc/programs/xdm/config/xdm-conf.cpp	2005-04-10 19:46:57.000000000 -0400
>@@ -15,15 +15,17 @@
> ! X terminals may not be configured that way, so they will require
> ! individual resource settings.
> DisplayManager*authorize:	true
>-! The following three resources set up display :0 as the console.
>-DisplayManager._0.setup:	XDMDIR/Xsetup_0
>-DisplayManager._0.startup:	XDMDIR/GiveConsole
>-DisplayManager._0.reset:	XDMDIR/TakeConsole
> !
> DisplayManager*chooser:		CHOOSERPATH
> DisplayManager*resources:	XDMDIR/Xresources
>+DisplayManager*startup:		XDMDIR/Xstartup
> DisplayManager*session:		XDMDIR/Xsession
>+DisplayManager*reset:		XDMDIR/Xreset
> DisplayManager*authComplain:	true
>+! The following three resources set up display :0 as the console.
>+DisplayManager._0.setup:	XDMDIR/Xsetup_0
>+DisplayManager._0.startup:	XDMDIR/GiveConsole
>+DisplayManager._0.reset:	XDMDIR/TakeConsole
> #ifdef XPM
> DisplayManager*loginmoveInterval:	10
> #endif /* XPM */

Flags:

mharris: 6.8-branch?

Actions: View | Splinter Review

Attachments on bug 2959: 2375 | 2376 | 2377 | 2378

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.