ports/113029: [patch] [x11/xdm] xdm-1.1.4_1 - Xstartup and Xreset refer to undefined XDMCONFIGDIR

[Jonathan Liu]

>Number:         113029
>Category:       ports
>Synopsis:       [patch] [x11/xdm] xdm-1.1.4_1 - Xstartup and Xreset refer to undefined XDMCONFIGDIR
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 26 14:10:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Liu
>Release:        6.2-RELEASE
>Organization:
>Environment:
FreeBSD freebsd 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:40:53 UTC 2007     root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
XDM tries to access the Xservers file in directory 'XDMCONFIGDIR' which is not defined.

I am using X.Org 7.2 built using ports on a clean installation without X11 installed.

Patch might break compatibility with previous versions of X.Org?
>How-To-Repeat:
Enable XDMCP and try to login using XDMCP query.
>Fix:
--- Xreset.orig Sat May 26 04:35:58 2007
+++ Xreset      Sat May 26 23:54:13 2007
@@ -1,4 +1,4 @@
 #!/bin/sh
 # Deregister a login. (Derived from TakeConsole as follows:)
 #
-/usr/local/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp"        -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER
+/usr/local/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp"        -x "/usr/local/lib/X11/xdm/Xservers" -l $DISPLAY -h "" $USER

--- Xstartup.orig       Sat May 26 04:35:58 2007
+++ Xstartup    Sat May 26 23:51:55 2007
@@ -1,4 +1,4 @@
 #!/bin/sh
 # Register a login (derived from GiveConsole as follows:)
 #
-/usr/local/bin/sessreg  -a -w "/var/log/wtmp" -u "/var/run/utmp"       -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER
+/usr/local/bin/sessreg  -a -w "/var/log/wtmp" -u "/var/run/utmp"       -x "/usr/local/lib/X11/xdm/Xservers" -l $DISPLAY -h "" $USER

>Release-Note:
>Audit-Trail:
>Unformatted: