Commit dfff516b authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Added origin to all entries that previosly were blank

parent 612d6b9a
......@@ -123,7 +123,7 @@ def header(tree, domain, origin=None):
minimum=soa.minimum[0]))
for ns in tree._host_._interface_._nameserver_:
if ns.domain[0] == domain and ns.primary[0] == 'yes':
result += " IN NS %s" % (
result += "@ IN NS %s" % (
util.fqn(tree, ns._parent))
pass
pass
......@@ -133,7 +133,7 @@ def header(tree, domain, origin=None):
continue
subdomain = ns.domain[0].split('.')
if subdomain[1:] == domain.split('.'):
delegation.append( '%-16sIN NS %s' %
delegation.append( '%-16sIN NS %s' %
(subdomain[0], util.fqn(tree, ns._parent)))
for d in sorted(delegation):
......@@ -199,11 +199,11 @@ def generate_forward(tree, hosts):
if m.domain[0] == domain]:
pri = int(mx.priority[0] or 0)
ttl = mx.ttl[0] or ''
result += (' %-8s IN MX %d %s' %
result += ('@ %-8s IN MX %d %s' %
(ttl, pri, util.fqn(tree, mx._parent)))
pass
for txt in [ t for t in tree._subnet_._txt_ if t.domain[1] == domain]:
result += (' IN TXT "%s"' % (txt.value[0]))
result += ('@ IN TXT "%s"' % (txt.value[0]))
pass
for srv in [ s for s in tree._subnet_._srv_ if s.domain[1] == domain]:
s = {}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment