Attachment 15260 Details for Bug 14002 – proposed patch for 4.9

[patch] proposed patch for 4.9

fix-14002_v4-9.patch (text/plain), 1.44 KB, created by Björn Baumbach on 2019-06-20 13:09:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2019-06-20 13:09:06 UTC

Size: 1.44 KB

patch

obsolete

>From 1baea8d651ffdd214972f5a3f50470fcab88b9cd Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>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 <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
>---
> 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
>

Flags:

abartlet: review+
dbagnall: review+
bbaumbach: ci-passed+

Actions: View

Attachments on bug 14002: 15257 | 15260