From: Tim Beale Date: Tue, 15 Jan 2019 01:09:15 +0000 (+1300) Subject: ntacls: Pass correct use_ntvfs through to setntacl() X-Git-Tag: ldb-1.6.1~472 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3fe96fc2e2d942b4a2e241777b5ee12b2295b97;p=thirdparty%2Fsamba.git ntacls: Pass correct use_ntvfs through to setntacl() We were already checking the smb.conf to see if it uses the NTVFS file server or the default smbd server. However, we weren't passing this through to the setntacl() call. This fixes the problem we noticed with 'samba-tool gpo aclcheck' failing after a restore. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13676 Signed-off-by: Tim Beale Reviewed-by: Jeremy Allison --- diff --git a/python/samba/ntacls.py b/python/samba/ntacls.py index 99245737529..5bf646caf9f 100644 --- a/python/samba/ntacls.py +++ b/python/samba/ntacls.py @@ -454,7 +454,8 @@ class NtaclsHelper: def setntacl(self, path, ntacl_sd): # ntacl_sd can be obj or str - return setntacl(self.lp, path, ntacl_sd, self.dom_sid) + return setntacl(self.lp, path, ntacl_sd, self.dom_sid, + use_ntvfs=self.use_ntvfs) def _create_ntacl_file(dst, ntacl_sddl_str): diff --git a/selftest/knownfail.d/gpo b/selftest/knownfail.d/gpo deleted file mode 100644 index fabe2babf0e..00000000000 --- a/selftest/knownfail.d/gpo +++ /dev/null @@ -1,3 +0,0 @@ -# 'samba-tool gpo aclcheck' currently fails against restored testenvs (due to a bug) -samba.tests.samba_tool.gpo.samba.tests.samba_tool.gpo.GpoCmdTestCase.test_aclcheck\(renamedc:local\) -samba.tests.samba_tool.gpo.samba.tests.samba_tool.gpo.GpoCmdTestCase.test_aclcheck\(offlinebackupdc:local\)