summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2022-08-13 12:55:01 +1200
committerDouglas Bagnall <dbagnall@samba.org>2022-09-06 21:12:36 +0000
commit2aa5b56b7919ceedef7937c7f3ea17bd2e8ccde2 (patch)
tree6ebfa117dd8062ea0d1b2a2980eb8fd8826fe7f6 /python
parentca82806f68ac86c842717d634407632bf0fd8127 (diff)
downloadsamba-2aa5b56b7919ceedef7937c7f3ea17bd2e8ccde2.tar.gz
samba-2aa5b56b7919ceedef7937c7f3ea17bd2e8ccde2.tar.bz2
samba-2aa5b56b7919ceedef7937c7f3ea17bd2e8ccde2.zip
samba-tool dns: use DnsconnWrapper in zonecreate
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
-rw-r--r--python/samba/netcmd/dns.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py
index 0da55c6898e..b449b9da319 100644
--- a/python/samba/netcmd/dns.py
+++ b/python/samba/netcmd/dns.py
@@ -958,14 +958,14 @@ class cmd_zonecreate(Command):
name_and_param.pszNodeName = 'AllowUpdate'
name_and_param.dwParam = dnsp.DNS_ZONE_UPDATE_SECURE
- try:
- dns_conn.DnssrvOperation2(client_version, 0, server, zone,
- 0, 'ResetDwordProperty', typeid,
- name_and_param)
- except WERRORError as e:
- if e.args[0] == werror.WERR_DNS_ERROR_ZONE_ALREADY_EXISTS:
- self.outf.write('Zone already exists.')
- raise e
+ messages = {
+ werror.WERR_DNS_ERROR_ZONE_ALREADY_EXISTS: (
+ f'Zone "{zone}" already exists.')
+ }
+
+ dns_conn.DnssrvOperation2(client_version, 0, server, zone,
+ 0, 'ResetDwordProperty', typeid,
+ name_and_param, messages=messages)
self.outf.write('Zone %s created successfully\n' % zone)