IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

_domain_name_validatord moved from DNS to realmdomains

Browse Source 
Validator is no more used in dns plugin

Part of ticket:
IPA should allow internationalized domain names
https://fedorahosted.org/freeipa/ticket/3169

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Martin Basti 2014-03-20 09:38:57 +01:00 committed by Martin Kosek
parent 5b88b39499
commit dafd162ae5
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipalib/plugins/dns.py
View File

@ -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:

9
ipalib/plugins/realmdomains.py
View File

@ -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):
"""