samba_dnsupdate: samba-tool add avoids existing record error messages

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13613

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Rowland Penny <rpenny@samba.org>

diff --git a/selftest/knownfail.d/samba_dnsupdate b/selftest/knownfail.d/samba_dnsupdate
deleted file mode 100644 (file)
index 5d7dd28..0000000
--- a/selftest/knownfail.d/samba_dnsupdate
+++ /dev/null
@@ -1 +0,0 @@
-^samba.tests.blackbox.samba_dnsupdate.+SambaDnsUpdateTests.test_samba_dnsupdate_samba_tool_all_names

diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index ec8aed6edbecf157ccfe24d2e0e63b7c08420caf..2ca3dea1775f284e5185a438c2c83845b3beebf5 100755 (executable)
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -590,6 +590,8 @@ def call_samba_tool(d, op="add", zone=None):
     try:
         cmd = cmd_dns()
         full_args = ["dns", op, "--use-kerberos", "off", "-P"] + args
+        if op == 'add':
+            full_args.append("--allow-existing")
         if opts.verbose:
             print(f'Calling samba-tool {" ".join(full_args)}')
         command, resolved_args = cmd._resolve(*full_args)