From 7ee5ce2586bdd320ad2c70d58b23af9f771ae57f Mon Sep 17 00:00:00 2001
From: Yoann Vandoorselaere <yoann@mandriva.com>
Date: Wed, 1 Dec 1999 16:30:19 +0000
Subject: *** empty log message ***

---
 doc/msec.spec     |  5 ++++-
 init-sh/level1.sh |  4 ++--
 init-sh/level2.sh |  4 ++--
 init-sh/lib.sh    | 30 ++++++++++++++++--------------
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/doc/msec.spec b/doc/msec.spec
index 5905dbe..a3366bb 100644
--- a/doc/msec.spec
+++ b/doc/msec.spec
@@ -1,7 +1,7 @@
 Summary: Security Level & Program for the Linux Mandrake distribution
 Name: msec
 Version: 0.4
-Release: 5mdk
+Release: 6mdk
 Source: ftp://mandrakesoft.com/pub/yoann/msec-0.4.tar.gz
 Copyright: GPL
 Group: System Environment/Base
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/promisc_check
 
 %changelog
+* Wed Dec  1 1999 Yoann Vandoorselaere <yoann@mandrakesoft.com>
+- DrakX compatibility.
+
 * Wed Dec  1 1999 Yoann Vandoorselaere <yoann@mandrakesoft.com>
 - Add & delete of userlist from audio group ( level 1 & 2 ).
 - Minor fix
diff --git a/init-sh/level1.sh b/init-sh/level1.sh
index 7980fa0..919bbbe 100755
--- a/init-sh/level1.sh
+++ b/init-sh/level1.sh
@@ -64,8 +64,8 @@ AddRules "PATH=\$PATH:/usr/X11R6/bin:." /etc/profile quiet
 AddRules "export PATH SECURE_LEVEL" /etc/profile
 
 # Group
-echo -n "Adding \"${USERS_DRAKX}\" to audio group :"
-for user in ${USERS_DRAKX}; do
+echo -n "Adding \"${DRAKX_USERS}\" to audio group :"
+for user in ${DRAKX_USERS}; do
     usermod -G audio "${user}"
 done
 echo "done."
diff --git a/init-sh/level2.sh b/init-sh/level2.sh
index 4ac487f..083c9ea 100755
--- a/init-sh/level2.sh
+++ b/init-sh/level2.sh
@@ -63,8 +63,8 @@ echo "Adding \"normal\" PATH variable :"
 AddRules "PATH=\$PATH:/usr/X11R6/bin" /etc/profile quiet
 AddRules "export PATH SECURE_LEVEL" /etc/profile
 # Group
-echo -n "Adding \"${USERS_DRAKX}\" to audio group :"
-for user in ${USERS_DRAKX}; do
+echo -n "Adding \"${DRAKX_USERS}\" to audio group :"
+for user in ${DRAKX_USERS}; do
     usermod -G audio "${user}"
 done
 echo "done."
\ No newline at end of file
diff --git a/init-sh/lib.sh b/init-sh/lib.sh
index ec5e2dd..47bbcec 100644
--- a/init-sh/lib.sh
+++ b/init-sh/lib.sh
@@ -9,19 +9,6 @@ if [ $UID != 0 ]; then
     exit 1
 fi
 
-# To avoid error, while new initscript package isn't released...
-touch /etc/rc.d/rc.firewall
-
-# If we are currently installing our
-# system with DrakX, we don't ask anything to the user...
-# Instead, DrakX do it and give us a file with some variable.
-if [ -f /tmp/secure.DrakX ]; then
-    . /tmp/secure.DrakX
-fi
-
-if [ -f /etc/security/msec/security.conf ]; then
-    . /etc/security/msec/security.conf
-fi
 
 COMMENT="# Mandrake-Security : if you remove this comment, remove the next line too."
 
@@ -149,6 +136,21 @@ LiloUpdate() {
     fi
 }
 
+# If we are currently installing our
+# system with DrakX, we don't ask anything to the user...
+# Instead, DrakX do it and give us a file with some variable.
+if [ -f /tmp/secure.DrakX ]; then
+    . /tmp/secure.DrakX
+    AddRules "${DRAKX_USERS}" /etc/security/msec/security.conf
+fi
+
+if [ -f /etc/security/msec/security.conf ]; then
+    . /etc/security/msec/security.conf
+fi
+
+# To avoid error, while new initscript package isn't released...
+touch /etc/rc.d/rc.firewall
+
 clear
 echo "Preparing to run security script : "
 CleanRules /etc/syslog.conf
@@ -180,7 +182,7 @@ usermod -G xgrp xfs
 # so we delete ( temporarily ) audio user.
 
 if [ ! -f /tmp/secure.DrakX ]; then
-    for user in ${USERS_DRAKX}; do
+    for user in ${DRAKX_USERS}; do
 	if ! /etc/security/msec/init-sh/grpuser --del audio "${user}"; then
 	    echo "Problem removing user \"${user}\" from group audio."
 	fi
-- 
cgit v1.2.1