diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2021-03-26 20:52:20 +1300 |
|---|---|---|
| committer | Douglas Bagnall <dbagnall@samba.org> | 2021-04-08 21:54:35 +0000 |
| commit | 99a88cf82eb24ab5ca668b4bb7be346783fa81fe (patch) | |
| tree | 7df23de38a6167e4350c59dd9da9acf98493b3ff /python | |
| parent | 87e71cd61168bbd6ed61484c98b84a72fb93482d (diff) | |
| download | samba-99a88cf82eb24ab5ca668b4bb7be346783fa81fe.tar.gz samba-99a88cf82eb24ab5ca668b4bb7be346783fa81fe.tar.bz2 samba-99a88cf82eb24ab5ca668b4bb7be346783fa81fe.zip | |
samba-tool dns: use dnsserver.flag_from_string()
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/netcmd/dns.py | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py index 183cc3dae66..a267c4105b5 100644 --- a/python/samba/netcmd/dns.py +++ b/python/samba/netcmd/dns.py @@ -40,7 +40,7 @@ from samba.netcmd import ( ) from samba.dcerpc import dnsp, dnsserver -from samba.dnsserver import record_from_string, DNSParseError +from samba.dnsserver import record_from_string, DNSParseError, flag_from_string def dns_connect(server, lp, creds): @@ -166,30 +166,10 @@ def dns_addr_array_string(array): def dns_type_flag(rec_type): - rtype = rec_type.upper() - if rtype == 'A': - record_type = dnsp.DNS_TYPE_A - elif rtype == 'AAAA': - record_type = dnsp.DNS_TYPE_AAAA - elif rtype == 'PTR': - record_type = dnsp.DNS_TYPE_PTR - elif rtype == 'NS': - record_type = dnsp.DNS_TYPE_NS - elif rtype == 'CNAME': - record_type = dnsp.DNS_TYPE_CNAME - elif rtype == 'SOA': - record_type = dnsp.DNS_TYPE_SOA - elif rtype == 'MX': - record_type = dnsp.DNS_TYPE_MX - elif rtype == 'SRV': - record_type = dnsp.DNS_TYPE_SRV - elif rtype == 'TXT': - record_type = dnsp.DNS_TYPE_TXT - elif rtype == 'ALL': - record_type = dnsp.DNS_TYPE_ALL - else: - raise CommandError('Unknown type of DNS record %s' % rec_type) - return record_type + try: + return flag_from_string(rec_type) + except DNSParseError as e: + raise CommandError(*e.args) def dns_client_version(cli_version): |