Attachment 18576 Details for Bug 15804 – Patch against master

[patch] Patch against master

0001-python-tdb_util-samba-tool-domain-backup-offline-han.patch (text/plain), 1.27 KB, created by Michael Osipov on 2025-02-19 07:57:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2025-02-19 07:57:40 UTC

Size: 1.27 KB

patch

obsolete

>From dad9791e21b67979f9d6ecfdc9900d1feb44ef52 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
>---
> 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.48.1
>

Actions: View

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