From: Douglas Bagnall Date: Wed, 4 Jun 2025 02:59:02 +0000 (+1200) Subject: samba_dnsupdate: samba-tool add avoids existing record error messages X-Git-Tag: tevent-0.17.0~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b41c6caaf02b436daba40d9d84006a15df661d98;p=thirdparty%2Fsamba.git 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 Reviewed-by: Jennifer Sutton Reviewed-by: Rowland Penny --- diff --git a/selftest/knownfail.d/samba_dnsupdate b/selftest/knownfail.d/samba_dnsupdate deleted file mode 100644 index 5d7dd2836c2..00000000000 --- 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 ec8aed6edbe..2ca3dea1775 100755 --- 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)