libsafe.so.2 in levels 4/5 and remove the . in PATH

6 files changed, 2 insertions, 67 deletions

diff --git a/init-sh/level0.sh b/init-sh/level0.sh
index 07c6126..c7ee590 100755
--- a/init-sh/level0.sh
+++ b/init-sh/level0.sh
@@ -70,16 +70,6 @@ echo "Setting umask to 022 (u=rw,g=r,o=r) :"
 AddRules "umask 022" /etc/profile.d/msec.sh
 AddRules "umask 022" /etc/profile.d/msec.csh
 
-
-echo "Adding \"non secure\" PATH variable :"
-AddRules "if ! echo \${PATH} |grep -q /usr/X11R6/bin ; then\n\texport PATH=\$PATH:/usr/X11R6/bin\nfi" /etc/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q /usr/X11R6/bin) } then\n\tsetenv PATH \"\${PATH}:/usr/X11R6/bin\"\nendif" /etc/profile.d/msec.csh quiet
-AddRules "if ! echo \${PATH} |grep -q /usr/games ; then\n\texport PATH=\$PATH:/usr/games\nfi" /etc/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q /usr/games) } then\n\tsetenv PATH \"\${PATH}:/usr/games\"\nendif" /etc/profile.d/msec.csh quiet
-
-AddRules "if ! echo \${PATH} |grep -q :. ; then\n\texport PATH=\$PATH:.\nfi" /etc/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q :.) } then\n\tsetenv PATH \"\${PATH}:.\"\nendif" /etc/profile.d/msec.csh quiet
-
 # Xserver
 echo "Allowing users to connect X server from everywhere :"
 AddBegRules "/usr/X11R6/bin/xhost +" /etc/X11/xinit.d/msec quiet
diff --git a/init-sh/level1.sh b/init-sh/level1.sh
index 9f0eccc..6fadfe5 100755
--- a/init-sh/level1.sh
+++ b/init-sh/level1.sh
@@ -70,18 +70,6 @@ echo "Setting umask to 022 (u=rw,g=r,o=r) :"
 AddRules "umask 022" /etc/profile.d/msec.sh
 AddRules "umask 022" /etc/profile.d/msec.csh
 
-echo "Adding \"non secure\" PATH variable :"
-AddRules "if ! echo \${PATH} |grep -q /usr/X11R6/bin ; then\n\texport PATH=\$PATH:/usr/X11R6/bin\nfi" /etc/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q /usr/X11R6/bin) } then\n\tsetenv PATH \"\${PATH}:/usr
-/X11R6/bin\"\nendif" /etc/profile.d/msec.csh quiet
-AddRules "if ! echo \${PATH} |grep -q /usr/games ; then\n\texport PATH=\$PATH:/usr/games\nfi" /et
-c/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q /usr/games) } then\n\tsetenv PATH \"\${PATH}:/usr/games\"\nendif" /etc/profile.d/msec.csh quiet
-
-AddRules "if ! echo \${PATH} |grep -q :. ; then\n\texport PATH=\$PATH:.\nfi" /etc/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q :.) } then\n\tsetenv PATH \"\${PATH}:.\"\nendif" /etc
-/profile.d/msec.csh quiet
-
 # Xserver
 echo "Allowing users to connect X server from localhost :"
 AddBegRules "/usr/X11R6/bin/xhost + localhost" /etc/X11/xinit.d/msec
diff --git a/init-sh/level2.sh b/init-sh/level2.sh
index 6cc646c..e194a69 100755
--- a/init-sh/level2.sh
+++ b/init-sh/level2.sh
@@ -71,17 +71,6 @@ echo "Setting umask to 022 (u=rw,g=r,o=r) :"
 AddRules "umask 022" /etc/profile.d/msec.sh
 AddRules "umask 022" /etc/profile.d/msec.csh
 
-echo "Adding \"non secure\" PATH variable :"
-AddRules "if ! echo \${PATH} |grep -q /usr/X11R6/bin ; then\n\texport PATH=\$PATH:/usr/X11R6/bin\nfi" /etc/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q /usr/X11R6/bin) } then\n\tsetenv PATH \"\${PATH}:/usr
-/X11R6/bin\"\nendif" /etc/profile.d/msec.csh quiet
-AddRules "if ! echo \${PATH} |grep -q /usr/games ; then\n\texport PATH=\$PATH:/usr/games\nfi" /etc/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q /usr/games) } then\n\tsetenv PATH \"\${PATH}:/usr/games\"\nendif" /etc/profile.d/msec.csh quiet
-
-AddRules "if ! echo \${PATH} |grep -q :. ; then\n\texport PATH=\$PATH:.\nfi" /etc/profile.d/msec.
-sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q :.) } then\n\tsetenv PATH \"\${PATH}:.\"\nendif" /etc/profile.d/msec.csh quiet
-
 # Xserver
 echo "Allowing users to connect X server from localhost :"
 AddBegRules "/usr/X11R6/bin/xhost + localhost" /etc/X11/xinit.d/msec
diff --git a/init-sh/level3.sh b/init-sh/level3.sh
index f7fa66e..f0b8178 100755
--- a/init-sh/level3.sh
+++ b/init-sh/level3.sh
@@ -78,16 +78,6 @@ echo "Setting umask to 022 (u=rw,g=r,o=r) :"
 AddRules "umask 022" /etc/profile.d/msec.sh
 AddRules "umask 022" /etc/profile.d/msec.csh
 
-echo "Adding \"non secure\" PATH variable :"
-AddRules "if ! echo \${PATH} |grep -q /usr/X11R6/bin ; then\n\texport PATH=\$PATH:/usr/X11R6/bin\nfi" /etc/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q /usr/X11R6/bin) } then\n\tsetenv PATH \"\${PATH}:/usr/X11R6/bin\"\nendif" /etc/profile.d/msec.csh quiet
-AddRules "if ! echo \${PATH} |grep -q /usr/games ; then\n\texport PATH=\$PATH:/usr/games\nfi" /et
-c/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q /usr/games) } then\n\tsetenv PATH \"\${PATH}:/usr/games\"\nendif" /etc/profile.d/msec.csh quiet
-
-AddRules "if ! echo \${PATH} |grep -q :. ; then\n\texport PATH=\$PATH:.\nfi" /etc/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q :.) } then\n\tsetenv PATH \"\${PATH}:.\"\nendif" /etc/profile.d/msec.csh quiet
-
 # Do not boot on a shell
 AllowReboot
 
diff --git a/init-sh/level4.sh b/init-sh/level4.sh
index 30d0436..7889b7e 100755
--- a/init-sh/level4.sh
+++ b/init-sh/level4.sh
@@ -110,21 +110,9 @@ echo "Setting umask to 022 (u=rw,g=rx) for root, 077 (u=rw) for user :"
 AddRules "if [[ \${UID} == 0 ]]; then umask 022; else umask 077; fi" /etc/profile.d/msec.sh
 AddRules "if [[ \${UID} == 0 ]]; then umask 022; else umask 077; fi" /etc/profile.d/msec.csh
 
-echo "Adding \"normal\" PATH variable :"
-AddRules "if ! echo \${PATH} |grep -q /usr/X11R6/bin ; then\n\texport PATH=\$PATH:/usr/X11R6/bin\nfi" /etc/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q /usr/X11R6/bin) } then\n\tsetenv PATH \"\${PATH}:/usr
-/X11R6/bin\"\nendif" /etc/profile.d/msec.csh quiet
-AddRules "if ! echo \${PATH} |grep -q /usr/games ; then\n\texport PATH=\$PATH:/usr/games\nfi" /et
-c/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q /usr/games) } then\n\tsetenv PATH \"\${PATH}:/usr/games\"\nendif" /etc/profile.d/msec.csh quiet
-
-AddRules "if ! echo \${PATH} |grep -q :. ; then\n\texport PATH=\$PATH:.\nfi" /etc/profile.d/msec.
-sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q :.) } then\n\tsetenv PATH \"\${PATH}:.\"\nendif" /etc/profile.d/msec.csh quiet
-
 if [[ -f /lib/libsafe.so.1.3 ]]; then
     echo "Enabling stack overflow protection :"
-    AddRules "/lib/libsafe.so.1.3" /etc/ld.so.preload
+    AddRules "/lib/libsafe.so.2" /etc/ld.so.preload
 fi
 
 # Do not boot on a shell
diff --git a/init-sh/level5.sh b/init-sh/level5.sh
index 6f99fa9..08517f6 100755
--- a/init-sh/level5.sh
+++ b/init-sh/level5.sh
@@ -120,19 +120,9 @@ echo "Setting umask to 077 (u=rw) :"
 AddRules "umask 077" /etc/profile.d/msec.sh
 AddRules "umask 077" /etc/profile.d/msec.csh
 
-echo "Adding \"normal\" PATH variable :"
-AddRules "if ! echo \${PATH} |grep -q /usr/X11R6/bin ; then\n\texport PATH=\$PATH:/usr/X11R6/bin\nfi" /etc/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q /usr/X11R6/bin) } then\n\tsetenv PATH \"\${PATH}:/usr/X11R6/bin\"\nendif" /etc/profile.d/msec.csh quiet
-AddRules "if ! echo \${PATH} |grep -q /usr/games ; then\n\texport PATH=\$PATH:/usr/games\nfi" /etc/profile.d/msec.sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q /usr/games) } then\n\tsetenv PATH \"\${PATH}:/usr/games\"\nendif" /etc/profile.d/msec.csh quiet
-
-AddRules "if ! echo \${PATH} |grep -q :. ; then\n\texport PATH=\$PATH:.\nfi" /etc/profile.d/msec.
-sh quiet
-AddRules "if ! { (echo "\${PATH}" | grep -q :.) } then\n\tsetenv PATH \"\${PATH}:.\"\nendif" /etc/profile.d/msec.csh quiet
-
 if [[ -f /lib/libsafe.so.1.3 ]]; then
     echo "Enabling stack overflow protection :"
-    AddRules "/lib/libsafe.so.1.3" /etc/ld.so.preload
+    AddRules "/lib/libsafe.so.2" /etc/ld.so.preload
 fi
 
 # Do not boot on a shell