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

DNS: autofill admin email

Browse Source 
Admins email (SOA RNAME) is autofilled with value 'hostmaster'. Bind
will automaticaly append zone part.

Part of ticket: https://fedorahosted.org/freeipa/ticket/4149

Reviewed-By: Petr Spacek <pspacek@redhat.com>
This commit is contained in:
Martin Basti
2014-09-16 12:23:21 +02:00
committed by Petr Viktorin
parent 7e24e241ba
commit 239adf9de4
4 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ipalib/util.py
View File

@@ -219,9 +219,6 @@ def normalize_zonemgr(zonemgr):
name = name.replace('.', '\\.')
zonemgr = u''.join((name, u'.', domain))
if not zonemgr.endswith('.'):
zonemgr = zonemgr + u'.'
return zonemgr
def normalize_zone(zone):
@@ -273,18 +270,12 @@ def validate_domain_name(domain_name, allow_underscore=False, allow_slash=False)
def validate_zonemgr(zonemgr):
assert isinstance(zonemgr, DNSName)
assert zonemgr.is_absolute()
""" See RFC 1033, 1035 """
if any('@' in label for label in zonemgr.labels):
raise ValueError(_('too many \'@\' characters'))
if len(zonemgr.labels) < 3:
raise ValueError(_('missing address domain'))
if not zonemgr.labels[0]:
raise ValueError(_('missing mail account'))
def validate_zonemgr_str(zonemgr):
zonemgr = normalize_zonemgr(zonemgr)
zonemgr = DNSName(zonemgr).make_absolute()
return validate_zonemgr(zonemgr)
def validate_hostname(hostname, check_fqdn=True, allow_underscore=False, allow_slash=False):