diff options
| -rw-r--r-- | ipalib/plugins/dns.py | 11 | ||||
| -rw-r--r-- | ipalib/plugins/realmdomains.py | 9 |
2 files changed, 7 insertions, 13 deletions
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index 27caf851b..6e804778d 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -38,8 +38,6 @@ from ipalib import _, ngettext from ipalib.util import (validate_zonemgr, normalize_zonemgr, get_dns_forward_zone_update_policy, get_dns_reverse_zone_update_policy, - normalize_zone, zone_is_reverse, - validate_domain_name, get_reverse_zone_default, REVERSE_DNS_ZONES) from ipapython.ipautil import valid_ip, CheckedIPAddress, is_host_resolvable from ipapython.dnsutil import DNSName @@ -404,15 +402,6 @@ def _validate_bind_forwarder(ugettext, forwarder): return None -def _domain_name_validator(ugettext, value): - try: - #classless reverse zones can contain slash '/' - normalized_zone = normalize_zone(value) - validate_domain_name(value, allow_slash=zone_is_reverse(normalized_zone)) - - except ValueError, e: - return unicode(e) - def _hostname_validator(ugettext, value): assert isinstance(value, DNSName) if len(value.make_absolute().labels) < 3: diff --git a/ipalib/plugins/realmdomains.py b/ipalib/plugins/realmdomains.py index 923bca47d..2c47ce186 100644 --- a/ipalib/plugins/realmdomains.py +++ b/ipalib/plugins/realmdomains.py @@ -21,8 +21,7 @@ from ipalib import api, errors from ipalib import Str, Flag from ipalib import _ from ipalib.plugins.baseldap import LDAPObject, LDAPUpdate, LDAPRetrieve -from ipalib.plugins.dns import _domain_name_validator -from ipalib.util import has_soa_or_ns_record +from ipalib.util import has_soa_or_ns_record, validate_domain_name from ipapython.dn import DN from ipapython.ipautil import get_domain_name @@ -52,6 +51,12 @@ EXAMPLES: def _domain_name_normalizer(d): return d.lower().rstrip('.') +def _domain_name_validator(ugettext, value): + try: + validate_domain_name(value, allow_slash=False) + except ValueError, e: + return unicode(e) + class realmdomains(LDAPObject): """ |