2
0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 06:15:37 +00:00

Use the same pattern of redefining TESTDIR as test10.sh.

Adapted from a diff from Tim Rice.
This commit is contained in:
Todd C. Miller
2020-09-04 17:24:09 -06:00
parent e92d10011e
commit e561f5b857

View File

@@ -3,49 +3,44 @@
# Test @includedir facility # Test @includedir facility
# #
parentdir="`echo $0 | sed 's:/[^/]*$::'`" TESTDIR="`pwd`/regress/testsudoers"
if [ -d "$parentdir" ]; then # make sure include file is owned by current user
# make sure include file is owned by current user rm -rf "$TESTDIR/test3.d"
rm -rf "${parentdir}/test3.d" mkdir "$TESTDIR/test3.d"
mkdir "${parentdir}/test3.d" cat >"$TESTDIR/test3.d/root" <<-EOF
cat >"${parentdir}/test3.d/root" <<-EOF root ALL = ALL
root ALL = ALL EOF
EOF
MYUID=`\ls -lnd $TESTDIR/test3.d | awk '{print $3}'` MYUID=`\ls -lnd $TESTDIR/test3.d | awk '{print $3}'`
MYGID=`\ls -lnd $TESTDIR/test3.d | awk '{print $4}'` MYGID=`\ls -lnd $TESTDIR/test3.d | awk '{print $4}'`
exec 2>&1 exec 2>&1
echo "Testing @includedir of an unquoted path" echo "Testing @includedir of an unquoted path"
echo "" echo ""
./testsudoers -U $MYUID -G $MYGID root id <<-EOF ./testsudoers -U $MYUID -G $MYGID root id <<-EOF
@includedir $TESTDIR/test3.d @includedir $TESTDIR/test3.d
EOF EOF
echo "" echo ""
echo "Testing @includedir of a double-quoted path" echo "Testing @includedir of a double-quoted path"
echo "" echo ""
./testsudoers -U $MYUID -G $MYGID root id <<-EOF ./testsudoers -U $MYUID -G $MYGID root id <<-EOF
@includedir "$TESTDIR/test3.d" @includedir "$TESTDIR/test3.d"
EOF EOF
echo "" echo ""
echo "Testing #includedir of an unquoted path" echo "Testing #includedir of an unquoted path"
echo "" echo ""
./testsudoers -U $MYUID -G $MYGID root id <<-EOF ./testsudoers -U $MYUID -G $MYGID root id <<-EOF
#includedir $TESTDIR/test3.d #includedir $TESTDIR/test3.d
EOF EOF
echo "" echo ""
echo "Testing #includedir of a double-quoted path" echo "Testing #includedir of a double-quoted path"
echo "" echo ""
./testsudoers -U $MYUID -G $MYGID root id <<-EOF ./testsudoers -U $MYUID -G $MYGID root id <<-EOF
#includedir "$TESTDIR/test3.d" #includedir "$TESTDIR/test3.d"
EOF EOF
rm -rf "${parentdir}/test3.d" rm -rf "$TESTDIR/test3.d"
exit 0 exit 0
fi
echo "$0: unable to determine parent dir" 1>&2
exit 1