4 files changed, 5 insertions, 7 deletions
diff --git a/init-sh/custom.sh b/init-sh/custom.sh
index 8707965..7cbf578 100755
--- a/init-sh/custom.sh
+++ b/init-sh/custom.sh
@@ -84,8 +84,7 @@ echo "this is done by searching in the stack frame the one which contain the"
 echo "destination address, and by substracting the frame address to the destination buffer one" 
 WaitAnswer; clear
 if [[ ${answer} == yes ]]; then
-	AddRules "export LD_PRELOAD=/usr/lib/libsafe.so.1.3" /etc/profile
-	AddRules "export LD_PRELOAD=/usr/lib/libsafe.so.1.3" /etc/zprofile
+	AddRules "/lib/libsafe.so.1.3" /etc/ld.so.preload
 fi
 fi
 
diff --git a/init-sh/level4.sh b/init-sh/level4.sh
index 01508d7..06d4edf 100755
--- a/init-sh/level4.sh
+++ b/init-sh/level4.sh
@@ -111,8 +111,7 @@ AddRules "export PATH SECURE_LEVEL" /etc/zprofile
 
 if [[ -f /usr/lib/libsafe.so.1.2 ]]; then
     echo "Enabling stack overflow protection :"
-    AddRules "export LD_PRELOAD=/usr/lib/libsafe.so.1.3" /etc/profile
-    AddRules "export LD_PRELOAD=/usr/lib/libsafe.so.1.3" /etc/zprofile
+    AddRules "/lib/libsafe.so.1.3" /etc/ld.so.preload
 fi
 
 # Do not boot on a shell
diff --git a/init-sh/level5.sh b/init-sh/level5.sh
index b1cf839..1eb8d18 100755
--- a/init-sh/level5.sh
+++ b/init-sh/level5.sh
@@ -128,8 +128,7 @@ AddRules "export PATH SECURE_LEVEL" /etc/zprofile
 
 if [[ -f /usr/lib/libsafe.so.1.2 ]]; then
     echo "Enabling stack overflow protection :"
-    AddRules "export LD_PRELOAD=/usr/lib/libsafe.so.1.3" /etc/profile
-    AddRules "export LD_PRELOAD=/usr/lib/libsafe.so.1.3" /etc/zprofile
+    AddRules "/lib/libsafe.so.1.3" /etc/ld.so.preload
 fi
 
 # Do not boot on a shell
diff --git a/init-sh/lib.sh b/init-sh/lib.sh
index 271a69a..2c7009c 100644
--- a/init-sh/lib.sh
+++ b/init-sh/lib.sh
@@ -142,7 +142,7 @@ Ttylog() {
 LoaderUpdate() {
    
     # Ask only if we're not inside DrakX.
-    if [[ -z ${DRAKX_PASSWORD} ]]; then
+    if [[ ! ${DRAKX_PASSWORD+set} ]]; then
     	echo "Do you want a password authentication at boot time ?"
     	echo "Be very carefull,"
     	echo "this will prevent your server to reboot without an operator to enter password".
@@ -241,6 +241,7 @@ CommentUserRules /etc/securetty
 CleanRules /etc/security/msec/security.conf
 CommentUserRules /etc/security/msec/security.conf
 CleanRules /etc/profile
+CleanRules /etc/ld.so.preload
 
 CleanLoaderRules
 LoaderDrakX