sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-03 12:58:35 +03:00
Code

samba_dnsupdate: Make nsupdate use the server given by the SOA record

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2017-04-10 17:10:27 +12:00
parent 00de59a478
commit 5f7b7c2263
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source4/scripting/bin/samba_dnsupdate
View File

@ -237,7 +237,7 @@ def hostname_match(h1, h2):
h2 = str(h2)
return h1.lower().rstrip('.') == h2.lower().rstrip('.')
def check_one_dns_name(name, name_type, d=None):
def get_resolver(d=None):
resolv_conf = os.getenv('RESOLV_CONF')
if not resolv_conf:
resolv_conf = '/etc/resolv.conf'
@ -245,7 +245,12 @@ def check_one_dns_name(name, name_type, d=None):
if d is not None and d.nameservers != []:
resolver.nameservers = d.nameservers
elif d is not None:
return resolver
def check_one_dns_name(name, name_type, d=None):
resolver = get_resolver(d)
if d is not None and len(d.nameservers) == 0:
d.nameservers = resolver.nameservers
ans = resolver.query(name, name_type)
@ -438,10 +443,18 @@ def call_nsupdate(d, op="add"):
# NS record may point to, even as we get a ticket to that other
# server.
#
# Therefore we must not set this in production.
# Therefore we must not set this in production, instead we want
# to find the name of a SOA for the zone and use that server.
if os.getenv('RESOLV_CONF') and d.nameservers != []:
f.write('server %s\n' % d.nameservers[0])
else:
resolver = get_resolver(d)
zone = dns.resolver.zone_for_name(normalised_name,
resolver=resolver)
soa = resolver.query(zone, "SOA")
f.write('server %s\n' % soa[0].mname)
if d.type == "A":
f.write("update %s %s %u A %s\n" % (op, normalised_name, default_ttl, d.ip))