summaryrefslogtreecommitdiffstats
path: root/ipalib/plugins/realmdomains.py
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2014-03-20 09:38:57 +0100
committerMartin Kosek <mkosek@redhat.com>2014-06-03 15:55:32 +0200
commitdafd162ae5a9a5fa621c651b3a8aaf8ea174746e (patch)
treec19591145222223d3667d7ad053be24e3d54494a /ipalib/plugins/realmdomains.py
parent5b88b39499f6d6ea46efa55b1a50353fc3c17fe7 (diff)
downloadfreeipa-dafd162ae5a9a5fa621c651b3a8aaf8ea174746e.tar.gz
freeipa-dafd162ae5a9a5fa621c651b3a8aaf8ea174746e.tar.xz
freeipa-dafd162ae5a9a5fa621c651b3a8aaf8ea174746e.zip
_domain_name_validatord moved from DNS to realmdomains
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>
Diffstat (limited to 'ipalib/plugins/realmdomains.py')
-rw-r--r--ipalib/plugins/realmdomains.py9
1 files changed, 7 insertions, 2 deletions
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):
"""