Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.146
diff -u -r1.146 ChangeLog
--- xc/ChangeLog	30 Jul 2004 01:35:31 -0000	1.146
+++ xc/ChangeLog	30 Jul 2004 03:18:39 -0000
@@ -1,3 +1,8 @@
+2004-07-29 Roland Mainz <roland.mainz@nrubsig.org>
+	* xc/programs/Xserver/Xprint/etc/init.d/xprint
+        Bugzilla #937: /etc/init.d/xprint should clear some environment
+        variables.
+
 2004-07-29  Torrey T. Lyons <torrey@freedesktop.org>
 
 	* xc/lib/GL/apple/Imakefile:
Index: xc/programs/Xserver/Xprint/etc/init.d/xprint
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/etc/init.d/xprint,v
retrieving revision 1.10
diff -u -r1.10 xprint
--- xc/programs/Xserver/Xprint/etc/init.d/xprint	19 Jun 2004 21:56:01 -0000	1.10
+++ xc/programs/Xserver/Xprint/etc/init.d/xprint	30 Jul 2004 03:20:05 -0000
@@ -139,9 +139,9 @@
 # Force use of a POSIX conformant sh 
 # (Solaris /sbin/sh is plain Bourne shell)
 [ "$1" != "posix_sh_forced" -a -x /bin/ksh  ]            && exec /bin/ksh  "$0" posix_sh_forced "$@"
-[ "$1" != "posix_sh_forced" -a -x /bin/bash ]            && exec /bin/bash "$0" posix_sh_forced "$@"
+[ "$1" != "posix_sh_forced" -a -x /bin/bash ]            && exec /bin/bash --norc --noprofile "$0" posix_sh_forced "$@"
 [ "$1" != "posix_sh_forced" -a -x /usr/local/bin/ksh ]   && exec /usr/local/bin/ksh "$0" posix_sh_forced "$@"
-[ "$1" != "posix_sh_forced" -a -x /usr/local/bin/bash ]  && exec /usr/local/bin/bash "$0" posix_sh_forced "$@"
+[ "$1" != "posix_sh_forced" -a -x /usr/local/bin/bash ]  && exec /usr/local/bin/bash --norc --noprofile "$0" posix_sh_forced "$@"
 if [ "$1" != "posix_sh_forced" ] ; then
     echo "${0}: ## FATAL ERROR: No POSIX-shell found."  1>&2
     exit 1
@@ -155,6 +155,9 @@
 # Change current dir to a location which is writeable by everyone
 cd /tmp
 
+# Clear some environment variables
+unset TEMP TMPDIR SCREENDIR
+
 # Set search path for commands
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 if [ "$(uname -s)" = "SunOS" ] ; then