From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 5 Jun 2006 17:16:29 +0000 (-0000)
Subject: Store the original suid bits when suidctl is enabled for bug #135639.  Thanks to... 
X-Git-Tag: v2.1~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e445e41b5405f23d3060cfc76972d45ad1e8916;p=portage.git

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
---

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?