From: Björn Baumbach Date: Wed, 12 Jun 2019 19:16:25 +0000 (+0200) Subject: python/ntacls: use correct "state directory" smb.conf option instead of "state dir" X-Git-Tag: ldb-2.0.5~354 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=670a12df52df63a067b638d37bec71341bf18bdd;p=thirdparty%2Fsamba.git python/ntacls: use correct "state directory" smb.conf option instead of "state dir" samba-tool ntacl get testfile --xattr-backend=tdb --use-ntvfs Fixes: Unknown parameter encountered: "state dir" Signed-off-by: Björn Baumbach Reviewed-by: Stefan Metzmacher --- diff --git a/python/samba/ntacls.py b/python/samba/ntacls.py index 82d950fbbc9..cc40b32a538 100644 --- a/python/samba/ntacls.py +++ b/python/samba/ntacls.py @@ -77,7 +77,9 @@ def checkset_backend(lp, backend, eadbfile): if eadbfile is not None: return (samba.xattr_tdb, eadbfile) else: - return (samba.xattr_tdb, os.path.abspath(os.path.join(lp.get("state dir"), "xattr.tdb"))) + state_dir = lp.get("state directory") + db_path = os.path.abspath(os.path.join(state_dir, "xattr.tdb")) + return (samba.xattr_tdb, db_path) else: raise XattrBackendError("Invalid xattr backend choice %s" % backend) diff --git a/selftest/knownfail b/selftest/knownfail index b9845e8fff9..2c31bf91619 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -370,5 +370,3 @@ ^samba.tests.ntlmdisabled.python\(ktest\).python2.ntlmdisabled.NtlmDisabledTests.test_samr_change_password\(ktest\) ^samba.tests.ntlmdisabled.python\(ad_dc_no_ntlm\).python3.ntlmdisabled.NtlmDisabledTests.test_ntlm_connection\(ad_dc_no_ntlm\) ^samba.tests.ntlmdisabled.python\(ad_dc_no_ntlm\).python2.ntlmdisabled.NtlmDisabledTests.test_ntlm_connection\(ad_dc_no_ntlm\) -^samba4.blackbox.samba-tool_ntacl.*.set_ntacl_ntvfs -^samba4.blackbox.samba-tool_ntacl.*.get_ntacl_ntvfs