diff options
| author | Martin Basti <mbasti@redhat.com> | 2014-11-07 12:45:43 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2014-11-13 10:36:28 +0000 |
| commit | a7162e7766150aa7577a42747a4d583a425f7271 (patch) | |
| tree | 809d69436750683af117d9fe7314a7f5844b13c1 | |
| parent | 2639997dfee43d66e94ef9b5441289816c465e7d (diff) | |
| download | freeipa-a7162e7766150aa7577a42747a4d583a425f7271.tar.gz freeipa-a7162e7766150aa7577a42747a4d583a425f7271.tar.xz freeipa-a7162e7766150aa7577a42747a4d583a425f7271.zip | |
Fix: DNS installer adds invalid zonemgr email
Installer adds zonemgr as relative (and invalid) address.
This fix force installer to use absolute email.
Ticket: https://fedorahosted.org/freeipa/ticket/4707
Reviewed-By: David Kupka <dkupka@redhat.com>
| -rw-r--r-- | install/share/bind.zone.db.template | 2 | ||||
| -rw-r--r-- | ipaserver/install/bindinstance.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/install/share/bind.zone.db.template b/install/share/bind.zone.db.template index 6795bb01a..ec175c608 100644 --- a/install/share/bind.zone.db.template +++ b/install/share/bind.zone.db.template @@ -1,6 +1,6 @@ $$ORIGIN $DOMAIN. $$TTL 86400 -@ IN SOA $DOMAIN. $ZONEMGR. ( +@ IN SOA $DOMAIN. $ZONEMGR ( 01 ; serial 3H ; refresh 15M ; retry diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 6cf018e9c..16894de0a 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -563,7 +563,7 @@ class BindInstance(service.Service): self.no_dnssec_validation=no_dnssec_validation if not zonemgr: - self.zonemgr = 'hostmaster.%s' % self.domain + self.zonemgr = 'hostmaster.%s' % normalize_zone(self.domain) else: self.zonemgr = normalize_zonemgr(zonemgr) |