]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
python:tdb_util: "samba-tool domain backup offline" hangs
authorAndrea Venturoli <ml@netfence.it>
Wed, 19 Feb 2025 07:51:16 +0000 (08:51 +0100)
committerJule Anger <janger@samba.org>
Tue, 4 Mar 2025 11:23:45 +0000 (11:23 +0000)
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)

Autobuild-User(v4-20-test): Jule Anger <janger@samba.org>
Autobuild-Date(v4-20-test): Tue Mar  4 11:23:45 UTC 2025 on atb-devel-224

python/samba/tdb_util.py

index 99b6e02e03f5e6659e1f0b148a10503e419e1712..202fbdb3f8b3b9f0eac89ce2d8021e64838839f8 100644 (file)
@@ -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)