From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Fri, 12 Aug 2022 04:44:31 +0000 (+1200)
Subject: samba-tool dns: zonedelete uses DnsConnWrapper messages
X-Git-Tag: talloc-2.4.0~1169
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=633872c7d25e59c65f0f23c2f8f87535a171bfec;p=thirdparty%2Fsamba.git

samba-tool dns: zonedelete uses DnsConnWrapper messages

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py
index 10374ade45e..c7b00ec5e17 100644
--- a/python/samba/netcmd/dns.py
+++ b/python/samba/netcmd/dns.py
@@ -991,15 +991,15 @@ class cmd_zonedelete(Command):
         dns_conn = DnsConnWrapper(server, self.lp, self.creds)
 
         zone = zone.lower()
-        try:
-            res = dns_conn.DnssrvOperation2(dnsserver.DNS_CLIENT_VERSION_LONGHORN,
-                                            0, server, zone, 0, 'DeleteZoneFromDs',
-                                            dnsserver.DNSSRV_TYPEID_NULL,
-                                            None)
-        except WERRORError as e:
-            if e.args[0] == werror.WERR_DNS_ERROR_ZONE_DOES_NOT_EXIST:
-                raise CommandError('Zone does not exist and so could not be deleted.')
-            raise e
+
+        messages = {
+            werror.WERR_DNS_ERROR_ZONE_DOES_NOT_EXIST: (
+                f'Zone {zone} does not exist and so could not be deleted.'),
+        }
+        res = dns_conn.DnssrvOperation2(dnsserver.DNS_CLIENT_VERSION_LONGHORN,
+                                        0, server, zone, 0, 'DeleteZoneFromDs',
+                                        dnsserver.DNSSRV_TYPEID_NULL,
+                                        None, messages=messages)
 
         self.outf.write('Zone %s deleted successfully\n' % zone)