pydns: rename s/CNameRecord/CNAMERecord/ for consistency

Everything else is TXTRecord, SRVRrcord, SOARecord.

Making CNAME the same allows easier lookups.

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

diff --git a/python/samba/dnsserver.py b/python/samba/dnsserver.py
index 6d8a72919df0795eadff2b7be46e3ba403ca6dc4..4f965a1ec9e182e74f8e7ec7353854c3c72e068b 100644 (file)
--- a/python/samba/dnsserver.py
+++ b/python/samba/dnsserver.py
@@ -65,11 +65,11 @@ class PTRRecord(dnsserver.DNS_RPC_RECORD):
         self.data = ptr_name
 
 
-class CNameRecord(dnsserver.DNS_RPC_RECORD):
+class CNAMERecord(dnsserver.DNS_RPC_RECORD):
 
     def __init__(self, cname, serial=1, ttl=900, rank=dnsp.DNS_RANK_ZONE,
                  node_flag=0):
-        super(CNameRecord, self).__init__()
+        super().__init__()
         self.wType = dnsp.DNS_TYPE_CNAME
         self.dwFlags = rank | node_flag
         self.dwSerial = serial

diff --git a/python/samba/join.py b/python/samba/join.py
index d78375441fb85c40883369e1a4d720372b745221..97745a3901a13393c9611b4e2226bea65379bf04 100644 (file)
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -41,7 +41,7 @@ from samba import werror
 from base64 import b64encode
 from samba import WERRORError, NTSTATUSError
 from samba import sd_utils
-from samba.dnsserver import ARecord, AAAARecord, CNameRecord
+from samba.dnsserver import ARecord, AAAARecord, CNAMERecord
 import logging
 import random
 import time
@@ -1192,7 +1192,7 @@ class DCJoinContext(object):
                             % (msdcs_cname, msdcs_zone, cname_target))
 
             add_rec_buf = dnsserver.DNS_RPC_RECORD_BUF()
-            rec = CNameRecord(cname_target)
+            rec = CNAMERecord(cname_target)
             add_rec_buf.rec = rec
             dns_conn.DnssrvUpdateRecord2(client_version,
                                          0,

diff --git a/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py
index d4b06929aa3b4a08f3a84e12c2c1c7707ed26ff3..dd1cf474c0fda212628b03a2dc1171ed007e7c3b 100644 (file)
--- 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 ARecord, AAAARecord, PTRRecord, CNameRecord, NSRecord, MXRecord, SOARecord, SRVRecord, TXTRecord
+from samba.dnsserver import ARecord, AAAARecord, PTRRecord, CNAMERecord, NSRecord, MXRecord, SOARecord, SRVRecord, TXTRecord
 
 
 def dns_connect(server, lp, creds):
@@ -413,7 +413,7 @@ def data_to_dns_record(record_type, data):
     elif record_type == dnsp.DNS_TYPE_PTR:
         rec = PTRRecord(data)
     elif record_type == dnsp.DNS_TYPE_CNAME:
-        rec = CNameRecord(data)
+        rec = CNAMERecord(data)
     elif record_type == dnsp.DNS_TYPE_NS:
         rec = NSRecord(data)
     elif record_type == dnsp.DNS_TYPE_MX: