import optparse
from samba import getopt as options
from ldb import SCOPE_BASE
+from samba import dsdb
from samba.auth import system_session
from samba.samdb import SamDB
from samba.dcerpc import netlogon, winbind
-samba.ensure_external_module("dns", "dnspython")
+samba.ensure_third_party_module("dns", "dnspython")
import dns.resolver
import dns.exception
parser.add_option("--all-interfaces", action="store_true")
parser.add_option("--use-file", type="string", help="Use a file, rather than real DNS calls")
parser.add_option("--update-list", type="string", help="Add DNS names from the given file")
+parser.add_option("--update-cache", type="string", help="Cache database of already registered records")
parser.add_option("--fail-immediately", action='store_true', help="Exit on first failure")
parser.add_option("--no-credentials", dest='nocreds', action='store_true', help="don't try and get credentials")
parser.add_option("--no-substiutions", dest='nosubs', action='store_true', help="don't try and expands variables in file specified by --update-list")
IP4s = []
for i in IPs:
if i.find(':') != -1:
- if i.find('%') == -1:
- # we don't want link local addresses for DNS updates
- IP6s.append(i)
+ IP6s.append(i)
else:
IP4s.append(i)
creds.set_machine_account(lp)
creds.set_krb_forwardable(credentials.NO_KRB_FORWARDABLE)
(tmp_fd, ccachename) = tempfile.mkstemp()
- creds.get_named_ccache(lp, ccachename)
+ try:
+ creds.get_named_ccache(lp, ccachename)
+ except RuntimeError as e:
+ os.unlink(ccachename)
+ raise e
class dnsobj(object):
self.existing_port = None
self.existing_weight = None
self.type = list[0]
- self.name = list[1].lower()
+ self.name = list[1]
+ self.nameservers = []
if self.type == 'SRV':
if len(list) < 4:
raise Exception("Invalid DNS entry %r" % string_form)
- self.dest = list[2].lower()
+ self.dest = list[2]
self.port = list[3]
elif self.type in ['A', 'AAAA']:
self.ip = list[2] # usually $IP, which gets replaced
elif self.type == 'CNAME':
- self.dest = list[2].lower()
+ self.dest = list[2]
elif self.type == 'NS':
- self.dest = list[2].lower()
+ self.dest = list[2]
else:
- raise Exception("Received unexpected DNS reply of type %s" % self.type)
+ raise Exception("Received unexpected DNS reply of type %s: %s" % (self.type, string_form))
def __str__(self):
- if d.type == "A":
+ if self.type == "A":
return "%s %s %s" % (self.type, self.name, self.ip)
- if d.type == "AAAA":
+ if self.type == "AAAA":
return "%s %s %s" % (self.type, self.name, self.ip)
- if d.type == "SRV":
+ if self.type == "SRV":
return "%s %s %s %s" % (self.type, self.name, self.dest, self.port)
- if d.type == "CNAME":
+ if self.type == "CNAME":
return "%s %s %s" % (self.type, self.name, self.dest)
- if d.type == "NS":
+ if self.type == "NS":
return "%s %s %s" % (self.type, self.name, self.dest)
def parse_dns_line(line, sub_vars):
"""parse a DNS line from."""
if line.startswith("SRV _ldap._tcp.pdc._msdcs.") and not samdb.am_pdc():
+ # We keep this as compat to the dns_update_list of 4.0/4.1
if opts.verbose:
print "Skipping PDC entry (%s) as we are not a PDC" % line
return None
subline = samba.substitute_var(line, sub_vars)
+ if subline == '' or subline[0] == "#":
+ return None
return dnsobj(subline)
return True
return False
- resolver = dns.resolver.Resolver()
- if d.type == "NS":
- # we need to lookup the nameserver for the parent domain,
- # and use that to check the NS record
- parent_domain = '.'.join(normalised_name.split('.')[1:])
- try:
- ans = resolver.query(parent_domain, 'NS')
- except dns.exception.DNSException:
- if opts.verbose:
- print "Failed to find parent NS for %s" % d
- return False
- nameservers = set()
- for i in range(len(ans)):
- try:
- ns = resolver.query(str(ans[i]), 'A')
- except dns.exception.DNSException:
- continue
- for j in range(len(ns)):
- nameservers.add(str(ns[j]))
- d.nameservers = list(nameservers)
+ resolv_conf = os.getenv('RESOLV_WRAPPER_CONF')
+ if not resolv_conf:
+ resolv_conf = '/etc/resolv.conf'
+ resolver = dns.resolver.Resolver(filename=resolv_conf, configure=True)
+
+ if d.nameservers != []:
+ resolver.nameservers = d.nameservers
+ else:
+ d.nameservers = resolver.nameservers
try:
- if getattr(d, 'nameservers', None):
- resolver.nameservers = list(d.nameservers)
ans = resolver.query(normalised_name, d.type)
except dns.exception.DNSException:
if opts.verbose:
res = samdb.search(base=samdb.get_default_basedn(), scope=SCOPE_BASE, attrs=["objectGUID"])
guid = samdb.schema_format_value("objectGUID", res[0]['objectGUID'][0])
vars['DOMAINGUID'] = guid
+
+ vars['IF_DC'] = ""
+ vars['IF_RWDC'] = "# "
+ vars['IF_RODC'] = "# "
+ vars['IF_PDC'] = "# "
+ vars['IF_GC'] = "# "
+ vars['IF_RWGC'] = "# "
+ vars['IF_ROGC'] = "# "
+ vars['IF_DNS_DOMAIN'] = "# "
+ vars['IF_RWDNS_DOMAIN'] = "# "
+ vars['IF_RODNS_DOMAIN'] = "# "
+ vars['IF_DNS_FOREST'] = "# "
+ vars['IF_RWDNS_FOREST'] = "# "
+ vars['IF_R0DNS_FOREST'] = "# "
+
am_rodc = samdb.am_rodc()
+ if am_rodc:
+ vars['IF_RODC'] = ""
+ else:
+ vars['IF_RWDC'] = ""
+
+ if samdb.am_pdc():
+ vars['IF_PDC'] = ""
+
+ # check if we "are DNS server"
+ res = samdb.search(base=samdb.get_config_basedn(),
+ expression='(objectguid=%s)' % vars['NTDSGUID'],
+ attrs=["options", "msDS-hasMasterNCs"])
+
+ if len(res) == 1:
+ if "options" in res[0]:
+ options = int(res[0]["options"][0])
+ if (options & dsdb.DS_NTDSDSA_OPT_IS_GC) != 0:
+ vars['IF_GC'] = ""
+ if am_rodc:
+ vars['IF_ROGC'] = ""
+ else:
+ vars['IF_RWGC'] = ""
+
+ basedn = str(samdb.get_default_basedn())
+ forestdn = str(samdb.get_root_basedn())
+
+ if "msDS-hasMasterNCs" in res[0]:
+ for e in res[0]["msDS-hasMasterNCs"]:
+ if str(e) == "DC=DomainDnsZones,%s" % basedn:
+ vars['IF_DNS_DOMAIN'] = ""
+ if am_rodc:
+ vars['IF_RODNS_DOMAIN'] = ""
+ else:
+ vars['IF_RWDNS_DOMAIN'] = ""
+ if str(e) == "DC=ForestDnsZones,%s" % forestdn:
+ vars['IF_DNS_FOREST'] = ""
+ if am_rodc:
+ vars['IF_RODNS_FOREST'] = ""
+ else:
+ vars['IF_RWDNS_FOREST'] = ""
return vars
-def call_nsupdate(d):
+def call_nsupdate(d, op="add"):
"""call nsupdate for an entry."""
global ccachename, nsupdate_cmd, krb5conf
+ assert(op in ["add", "delete"])
+
if opts.verbose:
- print "Calling nsupdate for %s" % d
+ print "Calling nsupdate for %s (%s)" % (d, op)
if opts.use_file is not None:
try:
wfile = os.fdopen(tmp_fd, 'a')
rfile.seek(0)
for line in rfile:
+ if op == "delete":
+ l = parse_dns_line(line, {})
+ if str(l).lower() == str(d).lower():
+ continue
wfile.write(line)
- wfile.write(str(d)+"\n")
+ if op == "add":
+ wfile.write(str(d)+"\n")
os.rename(tmpfile, opts.use_file)
fcntl.lockf(rfile, fcntl.LOCK_UN)
return
(tmp_fd, tmpfile) = tempfile.mkstemp()
f = os.fdopen(tmp_fd, 'w')
- if getattr(d, 'nameservers', None):
+ if d.nameservers != []:
f.write('server %s\n' % d.nameservers[0])
if d.type == "A":
- f.write("update add %s %u A %s\n" % (normalised_name, default_ttl, d.ip))
+ f.write("update %s %s %u A %s\n" % (op, normalised_name, default_ttl, d.ip))
if d.type == "AAAA":
- f.write("update add %s %u AAAA %s\n" % (normalised_name, default_ttl, d.ip))
+ f.write("update %s %s %u AAAA %s\n" % (op, normalised_name, default_ttl, d.ip))
if d.type == "SRV":
- if d.existing_port is not None:
+ if op == "add" and d.existing_port is not None:
f.write("update delete %s SRV 0 %s %s %s\n" % (normalised_name, d.existing_weight,
d.existing_port, d.dest))
- f.write("update add %s %u SRV 0 100 %s %s\n" % (normalised_name, default_ttl, d.port, d.dest))
+ f.write("update %s %s %u SRV 0 100 %s %s\n" % (op, normalised_name, default_ttl, d.port, d.dest))
if d.type == "CNAME":
- f.write("update add %s %u CNAME %s\n" % (normalised_name, default_ttl, d.dest))
+ f.write("update %s %s %u CNAME %s\n" % (op, normalised_name, default_ttl, d.dest))
if d.type == "NS":
- f.write("update add %s %u NS %s\n" % (normalised_name, default_ttl, d.dest))
+ f.write("update %s %s %u NS %s\n" % (op, normalised_name, default_ttl, d.dest))
if opts.verbose:
f.write("show\n")
f.write("send\n")
try:
cmd = nsupdate_cmd[:]
cmd.append(tmpfile)
- env = {}
+ env = os.environ
if krb5conf:
env["KRB5_CONFIG"] = krb5conf
if ccachename:
-def rodc_dns_update(d, t):
+def rodc_dns_update(d, t, op):
'''a single DNS update via the RODC netlogon call'''
global sub_vars
+ assert(op in ["add", "delete"])
+
if opts.verbose:
print "Calling netlogon RODC update for %s" % d
name.weight = 0
if d.port is not None:
name.port = int(d.port)
- name.dns_register = True
+ if op == "add":
+ name.dns_register = True
+ else:
+ name.dns_register = False
dns_names.names = [ name ]
site_name = sub_vars['SITE'].decode('utf-8')
sys.exit(1)
-def call_rodc_update(d):
+def call_rodc_update(d, op="add"):
'''RODCs need to use the netlogon API for nsupdate'''
global lp, sub_vars
+ assert(op in ["add", "delete"])
+
# we expect failure for 3268 if we aren't a GC
if d.port is not None and int(d.port) == 3268:
return
subname = samba.substitute_var(map[t], sub_vars)
if subname.lower() == d.name.lower():
# found a match - do the update
- rodc_dns_update(d, t)
+ rodc_dns_update(d, t, op)
return
if opts.verbose:
print("Unable to map to netlogon DNS update: %s" % d)
else:
dns_update_list = lp.private_path('dns_update_list')
+if opts.update_cache:
+ dns_update_cache = opts.update_cache
+else:
+ dns_update_cache = lp.private_path('dns_update_cache')
+
# use our private krb5.conf to avoid problems with the wrong domain
# bind9 nsupdate wants the default domain set
krb5conf = lp.private_path('krb5.conf')
# build up a list of update commands to pass to nsupdate
update_list = []
dns_list = []
+cache_list = []
+delete_list = []
dup_set = set()
+cache_set = set()
+
+rebuild_cache = False
+try:
+ cfile = open(dns_update_cache, 'r+')
+except IOError:
+ # Perhaps create it
+ cfile = open(dns_update_cache, 'w+')
+ # Open it for reading again, in case someone else got to it first
+ cfile = open(dns_update_cache, 'r+')
+fcntl.lockf(cfile, fcntl.LOCK_EX)
+for line in cfile:
+ line = line.strip()
+ if line == '' or line[0] == "#":
+ continue
+ c = parse_dns_line(line, {})
+ if c is None:
+ continue
+ if str(c) not in cache_set:
+ cache_list.append(c)
+ cache_set.add(str(c))
# read each line, and check that the DNS name exists
for line in file:
# now check if the entries already exist on the DNS server
for d in dns_list:
+ found = False
+ for c in cache_list:
+ if str(c).lower() == str(d).lower():
+ found = True
+ break
+ if not found:
+ rebuild_cache = True
if opts.all_names or not check_dns_name(d):
update_list.append(d)
-if len(update_list) == 0:
+for c in cache_list:
+ found = False
+ for d in dns_list:
+ if str(c).lower() == str(d).lower():
+ found = True
+ break
+ if found:
+ continue
+ rebuild_cache = True
+ if not opts.all_names and not check_dns_name(c):
+ continue
+ delete_list.append(c)
+
+if len(delete_list) == 0 and len(update_list) == 0 and not rebuild_cache:
if opts.verbose:
print "No DNS updates needed"
sys.exit(0)
# get our krb5 creds
-if not opts.nocreds:
- get_credentials(lp)
+if len(delete_list) != 0 or len(update_list) != 0:
+ if not opts.nocreds:
+ get_credentials(lp)
+
+# ask nsupdate to delete entries as needed
+for d in delete_list:
+ if am_rodc:
+ if d.name.lower() == domain.lower():
+ continue
+ if not d.type in [ 'A', 'AAAA' ]:
+ call_rodc_update(d, op="delete")
+ else:
+ call_nsupdate(d, op="delete")
+ else:
+ call_nsupdate(d, op="delete")
# ask nsupdate to add entries as needed
for d in update_list:
else:
call_nsupdate(d)
+if rebuild_cache:
+ (file_dir, file_name) = os.path.split(dns_update_cache)
+ (tmp_fd, tmpfile) = tempfile.mkstemp(dir=file_dir, prefix=file_name, suffix="XXXXXX")
+ wfile = os.fdopen(tmp_fd, 'a')
+ for d in dns_list:
+ wfile.write(str(d)+"\n")
+ os.rename(tmpfile, dns_update_cache)
+fcntl.lockf(cfile, fcntl.LOCK_UN)
+
# delete the ccache if we created it
if ccachename is not None:
os.unlink(ccachename)
git.samba.org / obnox / samba / samba-obnox.git / blobdiff