aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xinit-sh/custom.sh3
-rwxr-xr-xinit-sh/level4.sh3
-rwxr-xr-xinit-sh/level5.sh3
-rw-r--r--init-sh/lib.sh3
-rw-r--r--msec.spec2
6 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 139f57d..e507c7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-03 Yoann Vandoorselaere <yoann@mandrakesoft.com>
+LoaderUpdate() make a difference between an empty
+variable, and a non existing one.
+
2000-04-25 Yoann Vandoorselaere <yoann@mandrakesoft.com>
- Fix a bug with comment removed pointed out by Konrad Bernloehr.
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
diff --git a/msec.spec b/msec.spec
index f5fcaf2..2f41023 100644
--- a/msec.spec
+++ b/msec.spec
@@ -1,4 +1,4 @@
-%define version 0.15
+%define version 0.14
%define release 3mdk
Summary: Security Level & Program for the Linux Mandrake distribution