diff options
author | Petr Spacek <pspacek@redhat.com> | 2016-08-12 17:08:30 +0200 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2016-08-17 12:28:56 +0200 |
commit | b73ef3d7f9c757f1161db6801aadef52dd323195 (patch) | |
tree | 62fcc797d2222898f40f1d69be1386e2028b0d3b /ipaserver/plugins/dns.py | |
parent | 5776f1e90000ccfc24689c99951864248ed01045 (diff) | |
download | freeipa-b73ef3d7f9c757f1161db6801aadef52dd323195.tar.gz freeipa-b73ef3d7f9c757f1161db6801aadef52dd323195.tar.xz freeipa-b73ef3d7f9c757f1161db6801aadef52dd323195.zip |
DNS: allow to add forward zone to already broken sub-domain
Errors during DNS resolution might indicate that forwarder is the
necessary configuration which is missing. Now we disallow adding a
forwarder only if the zone is normally resolvable without the forwarder.
https://fedorahosted.org/freeipa/ticket/6062
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaserver/plugins/dns.py')
-rw-r--r-- | ipaserver/plugins/dns.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/plugins/dns.py b/ipaserver/plugins/dns.py index 585b28c15..6f1bd716d 100644 --- a/ipaserver/plugins/dns.py +++ b/ipaserver/plugins/dns.py @@ -2097,7 +2097,7 @@ class DNSZoneBase_add(LDAPCreate): if not options['skip_overlap_check']: try: - check_zone_overlap(keys[-1]) + check_zone_overlap(keys[-1], raise_on_error=False) except ValueError as e: raise errors.InvocationError(e.message) |