sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

python dns: dns_record_match() matches IPv6 semantically

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2021-06-18 11:30:09 +12:00 committed by Andrew Bartlett
parent 91f5b5f3d0
commit 8d32cdf184
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/samba/dnsserver.py
View File

@ -17,6 +17,7 @@
#
import shlex
import socket
from samba.dcerpc import dnsserver, dnsp
# Note: these are not quite the same as similar looking classes in
@ -309,6 +310,12 @@ def dns_name_equal(n1, n2):
return n1.str.rstrip('.').lower() == n2.str.rstrip('.').lower()
def ipv6_normalise(addr):
"""Convert an AAAA adresss into a canonical form."""
packed = socket.inet_pton(socket.AF_INET6, addr)
return socket.inet_ntop(socket.AF_INET6, packed)
def dns_record_match(dns_conn, server, zone, name, record_type, data):
"""Find a dns record that matches the specified data"""
@ -350,7 +357,7 @@ def dns_record_match(dns_conn, server, zone, name, record_type, data):
if rec.data == urec.data:
found = True
elif record_type == dnsp.DNS_TYPE_AAAA:
if rec.data == urec.data:
if ipv6_normalise(rec.data) == ipv6_normalise(urec.data):
found = True
elif record_type == dnsp.DNS_TYPE_PTR:
if dns_name_equal(rec.data, urec.data):