py/provision/sambadns: rename CNameRecord -> CNAMERecord

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index 8a5d8a93442ce83950896f32b45f77ae9b2f18dd..7c6ef0978cf21536483f358e0049634f1619cbc2 100644 (file)
--- 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 308dbb06db8ca22a3b1d282a14153d192cdf637d..fc995648226851e1be8ce71142e4c6658e3e24c6 100755 (executable)
--- 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: