Date: Sat, 17 Nov 2018 20:58:36 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r340523 - in stable/12: bin/setfacl tests/sys/acl Message-ID: <201811172058.wAHKwahv078797@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Sat Nov 17 20:58:35 2018 New Revision: 340523 URL: https://svnweb.freebsd.org/changeset/base/340523 Log: MFC r339781: Don't print pathconf() errors if the target file doesn't exist. MFC r339782: Update and re-enable ACL tests. PR: 229930 Modified: stable/12/bin/setfacl/setfacl.c stable/12/tests/sys/acl/Makefile stable/12/tests/sys/acl/tools-nfs4-psarc.test stable/12/tests/sys/acl/tools-nfs4.test stable/12/tests/sys/acl/tools-posix.test Directory Properties: stable/12/ (props changed) Modified: stable/12/bin/setfacl/setfacl.c ============================================================================== --- stable/12/bin/setfacl/setfacl.c Sat Nov 17 20:55:11 2018 (r340522) +++ stable/12/bin/setfacl/setfacl.c Sat Nov 17 20:58:35 2018 (r340523) @@ -220,8 +220,8 @@ handle_file(FTS *ftsp, FTSENT *file) } else if (ret == 0) { if (acl_type == ACL_TYPE_NFS4) acl_type = ACL_TYPE_ACCESS; - } else if (ret < 0 && errno != EINVAL) { - warn("%s: pathconf(..., _PC_ACL_NFS4) failed", + } else if (ret < 0 && errno != EINVAL && errno != ENOENT) { + warn("%s: pathconf(_PC_ACL_NFS4) failed", file->fts_path); } Modified: stable/12/tests/sys/acl/Makefile ============================================================================== --- stable/12/tests/sys/acl/Makefile Sat Nov 17 20:55:11 2018 (r340522) +++ stable/12/tests/sys/acl/Makefile Sat Nov 17 20:58:35 2018 (r340523) @@ -14,11 +14,9 @@ ${PACKAGE}FILES+= tools-posix.test SCRIPTS+= run -# Disable 00 and 02 until they've been updated for setfacl's new behavior -# PR 229930 tests/sys/acl/00:main fails in CI due to unexpected error message -# TAP_TESTS_SH+= 00 -# TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 00 TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 TAP_TESTS_SH+= 03 TAP_TESTS_SH+= 04 Modified: stable/12/tests/sys/acl/tools-nfs4-psarc.test ============================================================================== --- stable/12/tests/sys/acl/tools-nfs4-psarc.test Sat Nov 17 20:55:11 2018 (r340522) +++ stable/12/tests/sys/acl/tools-nfs4-psarc.test Sat Nov 17 20:58:35 2018 (r340523) @@ -186,7 +186,7 @@ $ ls -l xxx yyy zzz | cut -d' ' -f1 > -rw-r--r-- $ setfacl -m u:42:x:allow,g:43:w:allow nnn xxx yyy zzz -> setfacl: nnn: stat() failed: No such file or directory +> setfacl: nnn: acl_get_file() failed: No such file or directory $ ls -l nnn xxx yyy zzz | cut -d' ' -f1 > ls: nnn: No such file or directory @@ -215,7 +215,7 @@ $ getfacl -nq nnn xxx yyy zzz > everyone@:r-----a-R-c--s:-------:allow $ setfacl -b nnn xxx yyy zzz -> setfacl: nnn: stat() failed: No such file or directory +> setfacl: nnn: acl_get_file() failed: No such file or directory $ ls -l nnn xxx yyy zzz | cut -d' ' -f1 > ls: nnn: No such file or directory Modified: stable/12/tests/sys/acl/tools-nfs4.test ============================================================================== --- stable/12/tests/sys/acl/tools-nfs4.test Sat Nov 17 20:55:11 2018 (r340522) +++ stable/12/tests/sys/acl/tools-nfs4.test Sat Nov 17 20:58:35 2018 (r340523) @@ -214,7 +214,7 @@ $ ls -l xxx yyy zzz | cut -d' ' -f1 > -rw-r--r-- $ setfacl -m u:42:x:allow,g:43:w:allow nnn xxx yyy zzz -> setfacl: nnn: stat() failed: No such file or directory +> setfacl: nnn: acl_get_file() failed: No such file or directory $ ls -l nnn xxx yyy zzz | cut -d' ' -f1 > ls: nnn: No such file or directory @@ -252,7 +252,7 @@ $ getfacl -nq nnn xxx yyy zzz > everyone@:r-----a-R-c--s:-------:allow $ setfacl -b nnn xxx yyy zzz -> setfacl: nnn: stat() failed: No such file or directory +> setfacl: nnn: acl_get_file() failed: No such file or directory $ ls -l nnn xxx yyy zzz | cut -d' ' -f1 > ls: nnn: No such file or directory Modified: stable/12/tests/sys/acl/tools-posix.test ============================================================================== --- stable/12/tests/sys/acl/tools-posix.test Sat Nov 17 20:55:11 2018 (r340522) +++ stable/12/tests/sys/acl/tools-posix.test Sat Nov 17 20:58:35 2018 (r340523) @@ -226,7 +226,7 @@ $ ls -l xxx yyy zzz | cut -d' ' -f1 > -rw-r--r-- $ setfacl -m u:42:x,g:43:w nnn xxx yyy zzz -> setfacl: nnn: stat() failed: No such file or directory +> setfacl: nnn: acl_get_file() failed: No such file or directory $ ls -l nnn xxx yyy zzz | cut -d' ' -f1 > ls: nnn: No such file or directory @@ -258,7 +258,7 @@ $ getfacl -nq nnn xxx yyy zzz > other::r-- $ setfacl -b nnn xxx yyy zzz -> setfacl: nnn: stat() failed: No such file or directory +> setfacl: nnn: acl_get_file() failed: No such file or directory $ ls -l nnn xxx yyy zzz | cut -d' ' -f1 > ls: nnn: No such file or directory @@ -267,7 +267,7 @@ $ ls -l nnn xxx yyy zzz | cut -d' ' -f1 > -rw-r--r--+ $ setfacl -bn nnn xxx yyy zzz -> setfacl: nnn: stat() failed: No such file or directory +> setfacl: nnn: acl_get_file() failed: No such file or directory $ ls -l nnn xxx yyy zzz | cut -d' ' -f1 > ls: nnn: No such file or directory
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811172058.wAHKwahv078797>