]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
python/ntacls: use correct "state directory" smb.conf option instead of "state dir"
authorBjörn Baumbach <bb@sernet.de>
Wed, 12 Jun 2019 19:16:25 +0000 (21:16 +0200)
committerKarolin Seeger <kseeger@samba.org>
Wed, 26 Jun 2019 11:40:27 +0000 (11:40 +0000)
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

python/samba/ntacls.py

index b3a9c276955a135ca6436cdd52d0f0c7d7f59d85..ff2e92679c16e4962831c88a8b117020c4820592 100644 (file)
@@ -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)