summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2019-06-12 21:16:25 +0200
committerKarolin Seeger <kseeger@samba.org>2019-06-26 11:40:27 +0000
commit38d6dd6ae9f15d0f82d893c2cf4fdbfa25daf749 (patch)
tree07e60b7b70905b22cb06a5fe1ec287a1cd75a7f3
parentda0d67b29bf5874325a1e2faba635e663fefd452 (diff)
downloadsamba-38d6dd6ae9f15d0f82d893c2cf4fdbfa25daf749.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-9-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-9-test): Wed Jun 26 11:40:27 UTC 2019 on sn-devel-144
-rw-r--r--python/samba/ntacls.py4
1 files changed, 3 insertions, 1 deletions
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)