X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=run-tests.sh;h=d055560fc8d0b8a90f992583d54f53f3f717ab29;hb=e94122e560ac74cecfbd2507bf7ee867171d20e9;hp=5f11c688f5163d1cb379d8947a38a1397779cf9f;hpb=ef2420c59077d26e659e091e21731f282564a498;p=apply-default-acl.git

diff --git a/run-tests.sh b/run-tests.sh
index 5f11c68..d055560 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -672,13 +672,13 @@ compare
 # we get the expected error.
 TESTNUM=25
 ACTUAL=$( ${BIN} test/nonexistent 2>&1 )
-EXPECTED="${BIN}: test/nonexistent: no such file or directory"
+EXPECTED="${BIN}: test/nonexistent: No such file or directory"
 compare
 
 # Same as the previous test, but with --recursive.
 TESTNUM=26
 ACTUAL=$( ${BIN} --recursive test/nonexistent 2>&1 )
-EXPECTED="${BIN}: test/nonexistent: no such file or directory"
+EXPECTED="${BIN}: test/nonexistent: No such file or directory"
 compare
 
 # If we call apply-default-acl on more than one file, it should report any
@@ -688,5 +688,45 @@ DUMMY1="${TESTDIR}/dummy1"
 DUMMY2="${TESTDIR}/dummy2"
 touch "${DUMMY1}" "${DUMMY2}"
 ACTUAL=$( ${BIN} "${DUMMY1}" test/nonexistent "${DUMMY2}" 2>&1 )
-EXPECTED="${BIN}: test/nonexistent: no such file or directory"
+EXPECTED="${BIN}: test/nonexistent: No such file or directory"
+compare
+
+
+# Ensure that symlinks are not followed.
+TESTNUM=28
+TARGET="${TESTDIR}/foo"
+LINK2TARGET="${TESTDIR}/foo-sym"
+touch "${TARGET}"
+ln -s "${TARGET#${TESTDIR}/}" "${LINK2TARGET}"
+setfacl --default --modify user:${USERS[0]}:rwx "${TESTDIR}"
+"${BIN}" "${LINK2TARGET}"
+ACTUAL=$( getfacl --omit-header "${TARGET}" )
+EXPECTED=$(cat <<EOF
+user::rw-
+group::r--
+other::r--
+
+EOF
+)
+compare
+
+
+# Ensure that symlinks are not followed in subdirectories
+# (recursively).
+TESTNUM=29
+TARGET="${TESTDIR}/bar"
+touch "${TARGET}"
+mkdir "${TESTDIR}/foo"
+LINK2TARGET="${TESTDIR}/foo/bar-sym"
+ln -s "../bar" "${LINK2TARGET}"
+setfacl --default --modify user:${USERS[0]}:rwx "${TESTDIR}/foo"
+"${BIN}" --recursive "${TESTDIR}/foo"
+ACTUAL=$( getfacl --omit-header "${TARGET}" )
+EXPECTED=$(cat <<EOF
+user::rw-
+group::r--
+other::r--
+
+EOF
+)
 compare