]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
test: Fix the FreeBSD build
authorVolker Lendecke <vl@samba.org>
Thu, 26 Nov 2020 13:30:36 +0000 (14:30 +0100)
committerJeremy Allison <jra@samba.org>
Mon, 30 Nov 2020 23:48:02 +0000 (23:48 +0000)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Mon Nov 30 23:48:02 UTC 2020 on sn-devel-184

source3/modules/test_vfs_posixacl.c

index e5a333334ed326c81052e260ed0c68feeefb9f40..19e7d9842771302397b7871c39e7eac342f0564b 100644 (file)
@@ -86,13 +86,25 @@ static void acl_check_entry(acl_entry_t acl_entry, SMB_ACL_TAG_T tag,
                assert_int_equal(*id_p, id);
        }
 
+#ifdef HAVE_ACL_GET_PERM_NP
+       ret = acl_get_perm_np(acl_permset, ACL_READ);
+#else
        ret = acl_get_perm(acl_permset, ACL_READ);
+#endif
        assert_int_equal(ret, read ? 1 : 0);
 
+#ifdef HAVE_ACL_GET_PERM_NP
+       ret = acl_get_perm_np(acl_permset, ACL_WRITE);
+#else
        ret = acl_get_perm(acl_permset, ACL_WRITE);
+#endif
        assert_int_equal(ret, write ? 1 : 0);
 
+#ifdef HAVE_ACL_GET_PERM_NP
+       ret = acl_get_perm_np(acl_permset, ACL_EXECUTE);
+#else
        ret = acl_get_perm(acl_permset, ACL_EXECUTE);
+#endif
        assert_int_equal(ret, execute ? 1 : 0);
 }