Module Name: xsrc
Committed By: mrg
Date: Sun Mar 9 08:45:08 UTC 2025
Modified Files:
xsrc/external/mit/xinit/dist: startx.cpp
Log Message:
revert a portion of the previous, which ends up failing with our
MK_COOKIE definition now being a variable instead of cpp expanded
directly into the script.
startx now starts up the X server again.
XXX.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xinit/dist/startx.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xinit/dist/startx.cpp
diff -u xsrc/external/mit/xinit/dist/startx.cpp:1.11 xsrc/external/mit/xinit/dist/startx.cpp:1.12
--- xsrc/external/mit/xinit/dist/startx.cpp:1.11 Sun Mar 9 08:09:32 2025
+++ xsrc/external/mit/xinit/dist/startx.cpp Sun Mar 9 08:45:08 2025
@@ -20,7 +20,8 @@ bundle_id_prefix=BUNDLE_ID_PREFIX
xauth=XAUTH
bindir=__bindir__
libexecdir=__libexecdir__
-mk_cookie=MK_COOKIE
+# XXX using $mk_cookie here expands bad.
+# mk_cookie=MK_COOKIE
has_cookie_maker=HAS_COOKIE_MAKER
unset SESSION_MANAGER
@@ -265,8 +266,8 @@ if [ "$enable_xauth" = 1 ] ; then
hostname="$(uname -n)"
authdisplay=${display:-:0}
- if [ -n "$has_cookie_maker" ] && [ -n "$mk_cookie" ] ; then
- mcookie=$($mk_cookie)
+ if [ -n "$has_cookie_maker" ] && [ -n 'MK_COOKIE' ] ; then
+ mcookie=`MK_COOKIE`
else
if [ -r /dev/urandom ]; then
mcookie=$(dd if=dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\")
