summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-05 17:16:29 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-05 17:16:29 +0000
commit2e445e41b5405f23d3060cfc76972d45ad1e8916 (patch)
tree35ac5027b3cd2ce20a15b3b3e3f1e257b69ce1cc
parent06222333d1d420c840e0374adf9e4df980cefd29 (diff)
downloadportage-2e445e41b5405f23d3060cfc76972d45ad1e8916.tar.gz
portage-2e445e41b5405f23d3060cfc76972d45ad1e8916.tar.bz2
portage-2e445e41b5405f23d3060cfc76972d45ad1e8916.zip
Store the original suid bits when suidctl is enabled for bug #135639. Thanks to splite-gentoo@sigint.cs.purdue.edu for this patch.
svn path=/main/trunk/; revision=3462
-rwxr-xr-xbin/misc-functions.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 1a2f1b3f2..6bdd6d638 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -295,6 +295,7 @@ preinst_suid_scan() {
vecho ">>> Removing sbit on non registered ${i/${IMAGE}/}"
for x in 5 4 3 2 1 0; do echo -ne "\a"; sleep 0.25 ; done
vecho -ne "\a"
+ ls_ret=$(ls -ldh "${i}")
chmod ugo-s "${i}"
grep ^#${i/${IMAGE}/}$ ${sfconf} > /dev/null || {
# sandbox prevents us from writing directly
@@ -302,7 +303,6 @@ preinst_suid_scan() {
# can easly be bypassed using the addwrite() function
addwrite "${sfconf}"
vecho ">>> Appending commented out entry to ${sfconf} for ${PF}"
- ls_ret=$(ls -ldh "${i}")
echo "## ${ls_ret%${IMAGE}*}${ls_ret#*${IMAGE}}" >> ${sfconf}
echo "#${i/${IMAGE}/}" >> ${sfconf}
# no delwrite() eh?