From dbffeeefd86cb4ec1cb551a696175f9624bbd151 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Sat, 27 Mar 2021 15:55:03 +1300 Subject: [PATCH] py/provision/sambadns: rename CNameRecord -> CNAMERecord Signed-off-by: Douglas Bagnall Reviewed-by: Andreas Schneider --- python/samba/provision/sambadns.py | 6 +++--- source4/scripting/bin/samba_upgradedns | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index 8a5d8a93442..7c6ef0978cf 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -97,10 +97,10 @@ class AAAARecord(dnsp.DnssrvRpcRecord): self.data = ip6_addr -class CNameRecord(dnsp.DnssrvRpcRecord): +class CNAMERecord(dnsp.DnssrvRpcRecord): def __init__(self, cname, serial=1, ttl=900, rank=dnsp.DNS_RANK_ZONE): - super(CNameRecord, self).__init__() + super().__init__() self.wType = dnsp.DNS_TYPE_CNAME self.rank = rank self.dwSerial = serial @@ -447,7 +447,7 @@ def add_ns_glue_record(samdb, container_dn, prefix, host): def add_cname_record(samdb, container_dn, prefix, host): - cname_record = CNameRecord(host) + cname_record = CNAMERecord(host) msg = ldb.Message(ldb.Dn(samdb, "%s,%s" % (prefix, container_dn))) msg["objectClass"] = ["top", "dnsNode"] msg["dnsRecord"] = ldb.MessageElement(ndr_pack(cname_record), ldb.FLAG_MOD_ADD, "dnsRecord") diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns index 308dbb06db8..fc995648226 100755 --- a/source4/scripting/bin/samba_upgradedns +++ b/source4/scripting/bin/samba_upgradedns @@ -52,7 +52,7 @@ from samba.provision.common import ( from samba.provision.sambadns import ( ARecord, AAAARecord, - CNameRecord, + CNAMERecord, NSRecord, SOARecord, SRVRecord, @@ -92,7 +92,7 @@ def convert_dns_rdata(rdata, serial=1): elif rdata.rdtype == dns.rdatatype.AAAA: rec = AAAARecord(rdata.address, serial=serial) elif rdata.rdtype == dns.rdatatype.CNAME: - rec = CNameRecord(rdata.target.to_text(), serial=serial) + rec = CNAMERecord(rdata.target.to_text(), serial=serial) elif rdata.rdtype == dns.rdatatype.NS: rec = NSRecord(rdata.target.to_text(), serial=serial) elif rdata.rdtype == dns.rdatatype.SRV: -- 2.47.3