From cb9593d1571ed8704ebe33084463b2462a30cab9 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Fri, 7 Nov 2014 12:45:43 +0100 Subject: [PATCH] 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 --- install/share/bind.zone.db.template | 2 +- 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 6795bb01a7d8003a26dcc8a1cbc337550b3c296c..ec175c60825869ea9b86f7d1351a96189028b5d4 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 6cf018e9cda3734a99a8ac5ac1df134e9e4c2293..16894de0a009aacb123cf76072f2556aebc5722f 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) -- 2.1.0