From 9422e4962af0d43308cfae95ab8e7370ee035525 Mon Sep 17 00:00:00 2001
From: Yoann Vandoorselaere <yoann@mandriva.com>
Date: Thu, 9 Dec 1999 16:44:11 +0000
Subject: *** empty log message ***

---
 ChangeLog         |  1 +
 init-sh/level0.sh |  5 +++++
 init-sh/level1.sh | 12 ++++++++++--
 init-sh/level2.sh |  5 +++++
 init-sh/lib.sh    |  3 ++-
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4fb5182..d1dcf5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 1999-12-09  Yoann Vandoorselaere <yoann@mandrakesoft.com>
+	* xhost + localhost for lower level, xhost + for level0.
 	* Many bugfix, just trying to get a bugfree release
     * Renamed some variable, added consistencie. 
 	* security_check.sh: print header at begining of the log.
diff --git a/init-sh/level0.sh b/init-sh/level0.sh
index a0cd43c..1e0a7f1 100755
--- a/init-sh/level0.sh
+++ b/init-sh/level0.sh
@@ -65,6 +65,11 @@ echo "Adding \"non secure\" PATH variable :"
 AddRules "PATH=\$PATH:/usr/X11R6/bin:/usr/games:." /etc/profile quiet
 AddRules "export PATH SECURE_LEVEL" /etc/profile
 
+# Xserver
+echo "Allowing users to connect X server from everywhere :"
+AddRules "/usr/X11R6/bin/xhost +" /etc/X11/xdm/Xsession quiet
+AddRules "/usr/X11R6/bin/xhost +" /etc/X11/xinit/xinitrc
+
 # Group
 echo -n "Adding \"${DRAKX_USERS}\" to audio group :"
 for user in ${DRAKX_USERS}; do
diff --git a/init-sh/level1.sh b/init-sh/level1.sh
index a0cd43c..861a34c 100755
--- a/init-sh/level1.sh
+++ b/init-sh/level1.sh
@@ -44,9 +44,9 @@ echo -e "\t- Check passwd file integrity : no."
     AddRules "CHECK_PASSWD=no" /etc/security/msec/security.conf	        quiet
 echo -e "\t- Check shadow file integrity : no."
     AddRules "CHECK_SHADOW=no" /etc/security/msec/security.conf	        quiet
-echo -e "\t- Security warning on tty : \"no\" :"
+echo -e "\t- Security warning on tty : no."
     AddRules "TTY_WARN=no" /etc/security/msec/security.conf	        quiet
-echo -e "\t- Security warning in syslog : \"no\" :"			
+echo -e "\t- Security warning in syslog : no."			
     AddRules "SYSLOG_WARN=no" /etc/security/msec/security.conf		
 # end security check
 
@@ -65,6 +65,14 @@ echo "Adding \"non secure\" PATH variable :"
 AddRules "PATH=\$PATH:/usr/X11R6/bin:/usr/games:." /etc/profile quiet
 AddRules "export PATH SECURE_LEVEL" /etc/profile
 
+
+# Xserver
+echo "Allowing users to connect X server from localhost :"
+AddRules "/usr/X11R6/bin/xhost + localhost" /etc/X11/xdm/Xsession quiet
+AddRules "/usr/X11R6/bin/xhost + localhost" /etc/X11/xinit/xinitrc
+
+###
+
 # Group
 echo -n "Adding \"${DRAKX_USERS}\" to audio group :"
 for user in ${DRAKX_USERS}; do
diff --git a/init-sh/level2.sh b/init-sh/level2.sh
index 20f3298..d387b13 100755
--- a/init-sh/level2.sh
+++ b/init-sh/level2.sh
@@ -65,6 +65,11 @@ echo "Adding \"normal\" PATH variable :"
 AddRules "PATH=\$PATH:/usr/X11R6/bin:/usr/games" /etc/profile quiet
 AddRules "export PATH SECURE_LEVEL" /etc/profile
 
+# Xserver
+echo "Allowing users to connect X server from localhost :"
+AddRules "/usr/X11R6/bin/xhost + localhost" /etc/X11/xdm/Xsession quiet
+AddRules "/usr/X11R6/bin/xhost + localhost" /etc/X11/xinit/xinitrc
+
 # Group
 echo -n "Adding \"${DRAKX_USERS}\" to audio group :"
 for user in ${DRAKX_USERS}; do
diff --git a/init-sh/lib.sh b/init-sh/lib.sh
index ec14be3..7c90b05 100644
--- a/init-sh/lib.sh
+++ b/init-sh/lib.sh
@@ -171,9 +171,10 @@ CleanRules /etc/lilo.conf
 CleanRules /etc/rc.d/rc.firewall
 CleanRules /etc/crontab
 CleanRules /etc/security/msec/security.users
+CleanRules /etc/X11/xdm/Xsession
+CleanRules /etc/X11/xinit/xinitrc
 
 echo -e "\nStarting to reconfigure the system : "
-
 # For all secure level
 echo "Setting spoofing protection : "
 AddRules "echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter" /etc/rc.d/rc.firewall
-- 
cgit v1.2.1