From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 12 Jan 2012 16:24:54 +0000 (-0500)
Subject: Do multiple expansion when expanding paths to the noexec file, and
X-Git-Tag: SUDO_1_7_9~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b51661d81d0b779a584fa88e060cbfd5828f99a8;p=sudo

Do multiple expansion when expanding paths to the noexec file, and
sesh. Adapted from a diff by Mike Frysinger

--HG--
branch : 1.7
---

diff --git a/configure b/configure
index 3abaa3c2a..16e8f3c55 100755
--- a/configure
+++ b/configure
@@ -19936,14 +19936,24 @@ if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no"; then
 	PROGS="${PROGS} libsudo_noexec.la"
 	INSTALL_NOEXEC="install-noexec"
 
-	eval noexec_file="$with_noexec"
+	noexec_file="$with_noexec"
+	_noexec_file=
+	while test X"$noexec_file" != X"$_noexec_file"; do
+	    _noexec_file="$noexec_file"
+	    eval noexec_file="$_noexec_file"
+	done
 	cat >>confdefs.h <<EOF
 #define _PATH_SUDO_NOEXEC "$noexec_file"
 EOF
 
     fi
     if test X"$with_selinux" != X"no"; then
-	eval sesh_file="$libexecdir/sesh"
+	sesh_file="$libexecdir/sesh"
+	_sesh_file=
+	while test X"$sesh_file" != X"$_sesh_file"; do
+	    _sesh_file="$sesh_file"
+	    eval sesh_file="$_sesh_file"
+	done
 	cat >>confdefs.h <<EOF
 #define _PATH_SUDO_SESH "$sesh_file"
 EOF
diff --git a/configure.in b/configure.in
index d67f76310..36dafc067 100644
--- a/configure.in
+++ b/configure.in
@@ -2931,11 +2931,21 @@ if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no"; then
 	PROGS="${PROGS} libsudo_noexec.la"
 	INSTALL_NOEXEC="install-noexec"
 
-	eval noexec_file="$with_noexec"
+	noexec_file="$with_noexec"
+	_noexec_file=
+	while test X"$noexec_file" != X"$_noexec_file"; do
+	    _noexec_file="$noexec_file"
+	    eval noexec_file="$_noexec_file"
+	done
 	SUDO_DEFINE_UNQUOTED(_PATH_SUDO_NOEXEC, "$noexec_file", [The fully qualified pathname of sudo_noexec.so])
     fi
     if test X"$with_selinux" != X"no"; then
-	eval sesh_file="$libexecdir/sesh"
+	sesh_file="$libexecdir/sesh"
+	_sesh_file=
+	while test X"$sesh_file" != X"$_sesh_file"; do
+	    _sesh_file="$sesh_file"
+	    eval sesh_file="$_sesh_file"
+	done
 	SUDO_DEFINE_UNQUOTED(_PATH_SUDO_SESH, "$sesh_file", [The fully qualified pathname of sesh])
     fi
     exec_prefix="$oexec_prefix"