From kde-commits  Sun Feb 21 11:00:33 2010
From: Oswald Buddenhagen <ossi () kde ! org>
Date: Sun, 21 Feb 2010 11:00:33 +0000
To: kde-commits
Subject: KDE/kdebase/workspace/kdm
Message-Id: <1266750033.273074.22280.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=126675065511044

SVN commit 1093650 by ossi:

Xservers is long dead, and so is sessreg

kdm does not use an Xservers config file any more, so don't mention it
in the README.

the lack of the file would also make BSD-style sessreg invocations fail.
kdm has built-in sessreg anyway, so don't write config examples using
the external one.

BUG: 211854

 M  +1 -1      README  
 M  +4 -30     kfrontend/genkdmconf.c  


--- trunk/KDE/kdebase/workspace/kdm/README #1093649:1093650
@@ -46,7 +46,7 @@
 ${kde_datadir} is usually ${prefix}/share/apps
 The indented locations are envisioned for a configuration shared with GDM.
 
-${kde_confdir}/kdm/{kdmrc,Xservers,Xaccess,Xwilling,...}
+${kde_confdir}/kdm/{kdmrc,Xaccess,Xwilling,...}
 ${kde_datadir}/kdm/sessions/*.desktop
   /etc/X11/sessions/,/usr/share/xsessions/
 ${kde_datadir}/kdm/pics/users/
--- trunk/KDE/kdebase/workspace/kdm/kfrontend/genkdmconf.c #1093649:1093650
@@ -646,26 +646,9 @@
 "#\n"
 "#chown $USER /dev/console\n"
 "\n"
-#ifdef _AIX
-"# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
-"# Without it, finger errors out with \"Cannot stat /dev/host:0\".\n"
-"#\n"
-"#devname=`echo $DISPLAY | cut -c1-8`\n"
-"#if [ ! -d /dev/xdm ]; then\n"
-"#  mkdir /dev/xdm\n"
-"#  chmod 755 /dev/xdm\n"
-"#fi\n"
-"#touch /dev/xdm/$devname\n"
-"#chmod 644 /dev/xdm/$devname\n"
-"#exec sessreg -a -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
-#else
-"#exec sessreg -a -l $DISPLAY -h \"`echo $DISPLAY | cut -d: -f1`\""
-# ifdef BSD
-" -x " KDMCONF "/Xservers"
-# endif
-#endif /* _AIX */
-" $USER\n"
-"\n# NOTE: The session is aborted if the last command returns non-zero.\n";
+"# XDM configurations typically have sessreg here. KDM has it built-in.\n"
+"\n"
+"# NOTE: The session is aborted if the last command returns non-zero.\n";
 
 static const char def_reset[] =
 "#! /bin/sh\n"
@@ -677,16 +660,7 @@
 "#chown root /dev/console\n"
 "#chmod 622 /dev/console\n"
 "\n"
-#ifdef _AIX
-"#devname=`echo $DISPLAY | cut -c1-8`\n"
-"#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
-#else
-"#exec sessreg -d -l $DISPLAY -h \"`echo $DISPLAY | cut -d: -f1`\""
-# ifdef BSD
-" -x " KDMCONF "/Xservers"
-# endif
-#endif /* _AIX */
-" $USER\n";
+"# XDM configurations typically have sessreg here. KDM has it built-in.\n";
 
 static const char def_session1[] =
 "#! /bin/sh\n"