diff options
| -rwxr-xr-x | msec.sh | 39 | ||||
| -rwxr-xr-x | profile.d/msec.csh (renamed from msec.csh) | 20 | ||||
| -rwxr-xr-x | profile.d/msec.sh | 31 |
3 files changed, 39 insertions, 51 deletions
diff --git a/msec.sh b/msec.sh deleted file mode 100755 index 34c3786..0000000 --- a/msec.sh +++ /dev/null @@ -1,39 +0,0 @@ -#--------------------------------------------------------------- -# Project : Mandriva Linux -# Module : msec -# File : msec.sh -# Version : $Id$ -# Author : Yoann Vandoorselaere -# Created On : Wed Feb 13 18:35:58 2002 -# Purpose : settings according to security level -#--------------------------------------------------------------- - -if [ -r /etc/sysconfig/msec ]; then - . /etc/sysconfig/msec -fi - -if [ `id -u` -ge 500 ]; then - if [ -n "$UMASK_USER" ]; then - umask $UMASK_USER - else - umask 022 - fi -else - if [ -n "$UMASK_ROOT" ]; then - umask $UMASK_ROOT - else - umask 002 - fi -fi - -if [ -n "$SECURE_LEVEL" ]; then - if [ "$SECURE_LEVEL" -le 1 ] && ! echo ${PATH} | fgrep -q :.; then - export PATH=$PATH:. - fi -fi - -export SECURE_LEVEL - -[ -n "$TMOUT" ] && type typeset > /dev/null 2>&1 && typeset -r TMOUT - -# msec.sh ends here diff --git a/msec.csh b/profile.d/msec.csh index 362f51d..0a6bd70 100755 --- a/msec.csh +++ b/profile.d/msec.csh @@ -1,15 +1,7 @@ -#--------------------------------------------------------------- -# Project : Mandriva Linux -# Module : msec -# File : msec.csh -# Version : $Id$ -# Author : Yoann Vandoorselaere -# Created On : Wed Feb 13 18:35:58 2002 -# Purpose : settings according to security level -#--------------------------------------------------------------- +# shell security options -if ( -r /etc/sysconfig/msec ) then - eval `sed -n 's/^\([^#]*\)=\([^#]*\)/set \1=\2;/p' < /etc/sysconfig/msec` +if ( -r /etc/security/shell ) then + eval `sed -n 's/^\([^#]*\)=\([^#]*\)/set \1=\2;/p' < /etc/security/shell` endif if ( $uid >= 500 ) then @@ -32,6 +24,10 @@ endif # using unhash *after modifying PATH* fixes the pb # So while modifying the PATH, do not rely on the PATH until unhash is done +if ! { (echo "${PATH}" | /bin/grep -q /usr/X11R6/bin) } then + setenv PATH "${PATH}:/usr/X11R6/bin" +endif + if ! { (echo "${PATH}" | /bin/grep -q /usr/games) } then setenv PATH "${PATH}:/usr/games" endif @@ -50,7 +46,7 @@ if (! -r /usr/bin) then endif -# translate sh variables from /etc/sysconfig/msec to their equivalent in csh +# translate sh variables from /etc/security/shell to their equivalent in csh if ( ${?TMOUT} ) then set autologout=`expr $TMOUT / 60` endif diff --git a/profile.d/msec.sh b/profile.d/msec.sh new file mode 100755 index 0000000..288d72b --- /dev/null +++ b/profile.d/msec.sh @@ -0,0 +1,31 @@ +# shell security options + +if [ -r /etc/security/shell ]; then + . /etc/security/shell +fi + +if [ `id -u` -ge 500 ]; then + if [ -n "$UMASK_USER" ]; then + umask $UMASK_USER + else + umask 022 + fi +else + if [ -n "$UMASK_ROOT" ]; then + umask $UMASK_ROOT + else + umask 022 + fi +fi + +if [ -n "$SECURE_LEVEL" ]; then + if [ "$SECURE_LEVEL" -le 1 ] && ! echo ${PATH} | fgrep -q :.; then + export PATH=$PATH:. + fi +fi + +export SECURE_LEVEL + +[ -n "$TMOUT" ] && type typeset > /dev/null 2>&1 && typeset -r TMOUT + +# msec.sh ends here |