From owner-svn-src-all@freebsd.org Sat Nov 17 20:58:37 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8FFA811057A3; Sat, 17 Nov 2018 20:58:37 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 398617F2EF; Sat, 17 Nov 2018 20:58:37 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B981153C; Sat, 17 Nov 2018 20:58:37 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAHKwa6A078802; Sat, 17 Nov 2018 20:58:36 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAHKwahv078797; Sat, 17 Nov 2018 20:58:36 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201811172058.wAHKwahv078797@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sat, 17 Nov 2018 20:58:36 +0000 (UTC) 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 X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12: bin/setfacl tests/sys/acl X-SVN-Commit-Revision: 340523 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 398617F2EF X-Spamd-Result: default: False [0.32 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.32)[0.323,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2018 20:58:37 -0000 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