Attachment 18589 Details for Bug 15804 – patch for 4.22

[patch] patch for 4.22

bug-15804-v4-22.patch (text/plain), 1.51 KB, created by Douglas Bagnall on 2025-02-27 01:16:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Bagnall

Created: 2025-02-27 01:16:07 UTC

Size: 1.51 KB

patch

obsolete

>From ed89a1f1b705b904fd003d59a53176490dede767 Mon Sep 17 00:00:00 2001
>From: Andrea Venturoli <ml@netfence.it>
>Date: Wed, 19 Feb 2025 08:51:16 +0100
>Subject: [PATCH] python:tdb_util: "samba-tool domain backup offline" hangs
>
>GNU getopt(3) is by default non-POSIX compliant and accepts options after
>positional arguments (unless forced with POSIXLY_CORRECT). This is not portable,
>e..g., on FreeBSD. Put options first and then positional arguments.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15804
>
>Signed-off-by: Andrea Venturoli <ml@netfence.it>
>Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
>(cherry picked from commit 7e083a6b3a12933b79ef19ccbd4c13bfa0203498)
>---
> python/samba/tdb_util.py | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/python/samba/tdb_util.py b/python/samba/tdb_util.py
>index 99b6e02e03f..202fbdb3f8b 100644
>--- a/python/samba/tdb_util.py
>+++ b/python/samba/tdb_util.py
>@@ -37,9 +37,10 @@ def tdb_copy(file1, file2, readonly=False):
>         raise FileNotFoundError(2, "could not find tdbbackup tool: "
>                                 "is tdb-tools installed?")
> 
>-    tdbbackup_cmd = [toolpath, "-s", ".copy.tdb", file1]
>     if readonly:
>-        tdbbackup_cmd.append("-r")
>+        tdbbackup_cmd = [toolpath, "-r", "-s", ".copy.tdb", file1]
>+    else:
>+        tdbbackup_cmd = [toolpath, "-s", ".copy.tdb", file1]
> 
>     status = subprocess.check_call(tdbbackup_cmd, close_fds=True, shell=False)
> 
>-- 
>2.43.0
>

Flags:

jsutton: review+

Actions: View

Attachments on bug 15804: 18575 | 18576 | 18579 | 18587 | 18588 | 18589