1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-22 02:17:26 +00:00

the check for whether a custom DNS setting is valid was in the wrong place

This commit is contained in:
Joshua Tauberer 2014-07-20 14:41:02 +00:00
parent 65c3a44e63
commit 2e0680de4f

View File

@ -188,7 +188,6 @@ def build_zone(domain, all_domains, additional_records, env, is_zone=True):
qname = None qname = None
else: else:
qname = qname[0:len(qname)-len("." + domain)] qname = qname[0:len(qname)-len("." + domain)]
if has_rec(qname, value): continue
if isinstance(value, str): if isinstance(value, str):
values = [("A", value)] values = [("A", value)]
elif isinstance(value, dict): elif isinstance(value, dict):
@ -196,6 +195,7 @@ def build_zone(domain, all_domains, additional_records, env, is_zone=True):
else: else:
raise ValueError() raise ValueError()
for rtype, value2 in values: for rtype, value2 in values:
if has_rec(qname, rtype): continue
if rtype == "TXT": value2 = "\"" + value2 + "\"" if rtype == "TXT": value2 = "\"" + value2 + "\""
records.append((qname, rtype, value2, "(Set by user.)")) records.append((qname, rtype, value2, "(Set by user.)"))