diff options
| author | Björn Baumbach <bb@sernet.de> | 2019-06-12 21:16:25 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-06-26 11:37:29 +0000 |
| commit | f8d504acb4c380f1de14ed750897218878617c4d (patch) | |
| tree | 5ca554aa2a6fbaf98ad826f1e7a991e67e52c71c | |
| parent | 662d66dcd3c7e23eed4f4131c62b8c22692e23b8 (diff) | |
| download | samba-f8d504acb4c380f1de14ed750897218878617c4d.tar.gz | |
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>
(cherry picked from commit 670a12df52df63a067b638d37bec71341bf18bdd)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14002
Autobuild-User(v4-10-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-10-test): Wed Jun 26 11:37:29 UTC 2019 on sn-devel-144
| -rw-r--r-- | python/samba/ntacls.py | 4 | ||||
| -rw-r--r-- | selftest/knownfail | 2 |
2 files changed, 3 insertions, 3 deletions
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 04b443b2e1b..1817db384e0 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -361,5 +361,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 |