aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2015-04-28 09:44:24 +0100
committerColin Guthrie <colin@mageia.org>2015-04-28 09:45:01 +0100
commit8296e4b8b597ccd3f197c9fa489003d97951b6e9 (patch)
tree5dac72ec47dac2481fd1d9a14d261c9829217442
parentfb986b41b90ad78e7bf8273b60c94ddee3d1ec69 (diff)
downloadinitscripts-8296e4b8b597ccd3f197c9fa489003d97951b6e9.tar
initscripts-8296e4b8b597ccd3f197c9fa489003d97951b6e9.tar.gz
initscripts-8296e4b8b597ccd3f197c9fa489003d97951b6e9.tar.bz2
initscripts-8296e4b8b597ccd3f197c9fa489003d97951b6e9.tar.xz
initscripts-8296e4b8b597ccd3f197c9fa489003d97951b6e9.zip
Check correct msec config file for SECURE_TMP config.
Note: I think this is bogus. It doesn't deal properly with homedirs on NFS with SECURE_TMP set as many programs require filesystem behaviour that NFS cannot honour. If anything, the tmp folder should be mounted as tmpfs. Ultimately however this is what XDG_RUNTIME_DIR is meant to do and programs should generally move away from it. I'd suggest even that TMP and TMPDIR point to /run/user/603/tmp if you want a really secure TMPDIR system. Or at least something along those lines. mga#14778
-rw-r--r--mandriva/tmpdir.csh4
-rw-r--r--mandriva/tmpdir.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/mandriva/tmpdir.csh b/mandriva/tmpdir.csh
index a2cc08da..c0deecab 100644
--- a/mandriva/tmpdir.csh
+++ b/mandriva/tmpdir.csh
@@ -1,8 +1,8 @@
# $Id$
# Set TMPDIR and TMP
-if (-f /etc/sysconfig/shell) then
- eval `cat /etc/sysconfig/shell | grep -v ^# | sed -re 's/^([^=]+=)/set \1/'`
+if (-f /etc/security/shell) then
+ eval `cat /etc/security/shell | grep -v ^# | sed -re 's/^([^=]+=)/set \1/'`
endif
if ($?SECURE_TMP) then
diff --git a/mandriva/tmpdir.sh b/mandriva/tmpdir.sh
index c4e1abd6..9aaa65b7 100644
--- a/mandriva/tmpdir.sh
+++ b/mandriva/tmpdir.sh
@@ -2,8 +2,8 @@
# $Id$
# Set TMPDIR to ~/tmp and create it if directory not exist.
-if [ -f /etc/sysconfig/shell ];then
- . /etc/sysconfig/shell
+if [ -f /etc/security/shell ];then
+ . /etc/security/shell
fi
if [[ "$SECURE_TMP" = "yes" ]];then