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: samba-4.9.10~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38d6dd6ae9f15d0f82d893c2cf4fdbfa25daf749;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 (cherry picked from commit 670a12df52df63a067b638d37bec71341bf18bdd) BUG: https://bugzilla.samba.org/show_bug.cgi?id=14002 Autobuild-User(v4-9-test): Karolin Seeger Autobuild-Date(v4-9-test): Wed Jun 26 11:40:27 UTC 2019 on sn-devel-144 --- diff --git a/python/samba/ntacls.py b/python/samba/ntacls.py index b3a9c276955..ff2e92679c1 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)