fortune output from .cshrc and sometimes fail to login due to it. Fix bug with kxkb not detecting installed keyboard layouts on xorg. Approved by: portmgr Obtained from: KDE CVS
31 lines
1.4 KiB
C
31 lines
1.4 KiB
C
--- kdm/kfrontend/genkdmconf.c.orig Thu Aug 5 20:57:04 2004
|
|
+++ kdm/kfrontend/genkdmconf.c Wed Sep 15 18:18:11 2004
|
|
@@ -578,7 +578,7 @@
|
|
"# by Xsetup usually.\n"
|
|
"# This is not required if you use PAM with the pam_console module.\n"
|
|
"#\n"
|
|
-"#chown $USER /dev/console\n"
|
|
+"chown $USER /dev/console\n"
|
|
"\n"
|
|
#ifdef _AIX
|
|
"# We create a pseudodevice for finger. (host:0 becomes xdm/host_0)\n"
|
|
@@ -619,8 +619,8 @@
|
|
"# Reassign ownership of the console to root, this should disallow\n"
|
|
"# assignment of console output to any random users's xterm. See Xstartup.\n"
|
|
"#\n"
|
|
-"#chown root /dev/console\n"
|
|
-"#chmod 622 /dev/console\n"
|
|
+"chown root /dev/console\n"
|
|
+/* "#chmod 622 /dev/console\n" */
|
|
"\n"
|
|
#ifdef _AIX
|
|
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
|
|
@@ -668,7 +668,7 @@
|
|
" # [t]cshrc is always sourced automatically.\n"
|
|
" # Note that sourcing csh.login after .cshrc is non-standard.\n"
|
|
" set -a\n"
|
|
-" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|_)=\"'`\n"
|
|
+" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|GROUPS|SHELLOPTS|_)=\"'`\n"
|
|
" set +a\n"
|
|
" ;;\n"
|
|
" *) # Plain sh, ksh, and anything we don't know.\n"
|