Fix test failure when run by a user other than the file owner.

diff --git a/MANIFEST b/MANIFEST
index e8907a51820b302abc7c09f802f49c5ec36c7a81..06f378d5eefdb0dd625642d5c283505ce2404b47 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -632,7 +632,6 @@ plugins/sudoers/regress/testsudoers/test1.sh
 plugins/sudoers/regress/testsudoers/test2.inc
 plugins/sudoers/regress/testsudoers/test2.out.ok
 plugins/sudoers/regress/testsudoers/test2.sh
-plugins/sudoers/regress/testsudoers/test3.d/root
 plugins/sudoers/regress/testsudoers/test3.out.ok
 plugins/sudoers/regress/testsudoers/test3.sh
 plugins/sudoers/regress/testsudoers/test4.out.ok

diff --git a/plugins/sudoers/regress/testsudoers/test3.d/root b/plugins/sudoers/regress/testsudoers/test3.d/root
deleted file mode 100644 (file)
index 52ca040..0000000
--- a/plugins/sudoers/regress/testsudoers/test3.d/root
+++ /dev/null
@@ -1 +0,0 @@
-root ALL = ALL

diff --git a/plugins/sudoers/regress/testsudoers/test3.sh b/plugins/sudoers/regress/testsudoers/test3.sh
index c1251b98e02eb8b9a754f17be44ce307d0e1a000..1b7a00f5ffe14b4a5e36962c5055b75e908aa075 100755 (executable)
--- a/plugins/sudoers/regress/testsudoers/test3.sh
+++ b/plugins/sudoers/regress/testsudoers/test3.sh
@@ -3,11 +3,23 @@
 # Test #include facility
 #
 
-MYUID=`\ls -lnd $TESTDIR/test3.d | awk '{print $3}'`
-MYGID=`\ls -lnd $TESTDIR/test3.d | awk '{print $4}'`
-exec 2>&1
-./testsudoers -U $MYUID -G $MYGID root id <<EOF
-#includedir $TESTDIR/test3.d
-EOF
+parentdir="`echo $0 | sed 's:/[^/]*$::'`"
+if [ -d "$parentdir" ]; then
+       # make sure include file is owned by current user
+       rm -rf "${parentdir}/test3.d"
+       mkdir "${parentdir}/test3.d"
+       cat >"${parentdir}/test3.d/root" <<-EOF
+               root ALL = ALL
+       EOF
 
-exit 0
+       MYUID=`\ls -lnd $TESTDIR/test3.d | awk '{print $3}'`
+       MYGID=`\ls -lnd $TESTDIR/test3.d | awk '{print $4}'`
+       exec 2>&1
+       ./testsudoers -U $MYUID -G $MYGID root id <<-EOF
+               #includedir $TESTDIR/test3.d
+       EOF
+       exit 0
+fi
+
+echo "$0: unable to determine parent dir" 1>&2
+exit 1