diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | init-sh/level0.sh | 11 | ||||
| -rw-r--r-- | init-sh/lib.sh | 9 | ||||
| -rw-r--r-- | msec.spec | 2 |
4 files changed, 12 insertions, 14 deletions
@@ -2,7 +2,7 @@ * msec.lyx: add new file from camille. -1999-15-10 Yoann Vandoorselaere <yoann@mandrakesoft.com> +1999-12-15 Yoann Vandoorselaere <yoann@mandrakesoft.com> * grpuser.sh take only one opt ( --refresh ), take group name from /etc/security/msec/group.conf and add user from /etc/security/msec/user.conf if secure level > 2 @@ -13,7 +13,7 @@ * removed chattr +a because of the problem it can cause to other system automated system task -1999-13-10 Yoann Vandoorselaere <yoann@mandrakesoft.com> +1999-12-13 Yoann Vandoorselaere <yoann@mandrakesoft.com> * Documentation * diff_check.sh : Fix a typo. diff --git a/init-sh/level0.sh b/init-sh/level0.sh index 4b9e743..62904ac 100755 --- a/init-sh/level0.sh +++ b/init-sh/level0.sh @@ -75,14 +75,9 @@ AddBegRules "/usr/X11R6/bin/xhost +" /etc/X11/xdm/Xsession quiet AddBegRules "/usr/X11R6/bin/xhost +" /etc/X11/xinit/xinitrc # Group -if [[ ! -z ${DRAKX_USERS} ]]; then - echo -n "Adding \"${DRAKX_USERS}\" to audio group :" - for user in ${DRAKX_USERS}; do - usermod -G audio "${user}" - done - echo "done." -fi - +echo "Adding system users to specific groups :" +/etc/security/msec/init-sh/grpuser.sh --refresh +echo -e "done.\n" diff --git a/init-sh/lib.sh b/init-sh/lib.sh index c7d0efd..e523f5a 100644 --- a/init-sh/lib.sh +++ b/init-sh/lib.sh @@ -9,7 +9,7 @@ if [[ ${UID} != 0 ]]; then exit 1 fi -COMMENT="# Mandrake-Security : if you remove this comment, remove the next line too." +export COMMENT="# Mandrake-Security : if you remove this comment, remove the next line too." WaitAnswer() { answer="nothing" @@ -60,6 +60,7 @@ AddBegRules() { while (<FH>) { if (!/^\#/ && !/^$/ && !$m) { print FW $ENV{"COMMENT"}; + print FW "\n"; print FW "@ARGV\n\n"; $m++; } print FW; @@ -147,7 +148,7 @@ Ttylog() { LiloUpdate() { - if [[ ! -f /tmp/secure.DrakX ]]; then + if [[ -z ${LILO_PASSWORD} ]]; 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". @@ -159,10 +160,10 @@ LiloUpdate() { password="" fi else - password=${DRAKX_PASSWORD} + password=${LILO_PASSWORD} fi - if [[ ! -z "${password}" ]]; then + if [[ ! -z ${password} ]]; then tmpfile=`mktemp /tmp/secure.XXXXXX` cp -f /etc/lilo.conf ${tmpfile} @@ -36,9 +36,11 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Dec 16 1999 Yoann Vandoorselaere <yoann@mandrakesoft.com> +- Fixed the last AddBegRules() problem. - Indentation problem should be fixed. - All debug finished, changing secure.tmp to a mktemp allocated tmpfile for symlink security. +- DRAKX_USER variable no longer needed. - grpuser.sh take only one opt ( --refresh ), take group name from /etc/security/msec/group.conf and add user from /etc/security/msec/user.conf if secure level > 2 |