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 <bb@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/python/samba/ntacls.py b/python/samba/ntacls.py
index 82d950fbbc9aa2e61e4cc1be5cc478156e5fc01b..cc40b32a5384725e742d1d20b74092b64f151a56 100644 (file)
--- 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 b9845e8fff9142bee876b32a9348e88b96d17ddc..2c31bf916190c7cc420c9ce145bffb4bcedbe3f5 100644 (file)
--- 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