From 1baea8d651ffdd214972f5a3f50470fcab88b9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= Date: Wed, 12 Jun 2019 21:16:25 +0200 Subject: [PATCH] python/ntacls: use correct "state directory" smb.conf option instead of "state dir" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 670a12df52df63a067b638d37bec71341bf18bdd) BUG: https://bugzilla.samba.org/show_bug.cgi?id=14002 --- python/samba/ntacls.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python/samba/ntacls.py b/python/samba/ntacls.py index 32ceb54fd1b..b73f8182d32 100644 --- a/python/samba/ntacls.py +++ b/python/samba/ntacls.py @@ -76,7 +76,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) -- 2.21.0