From d954704ce92d575340ed1d163fa32fde12eac889 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 24 Feb 2018 14:27:10 +0100 Subject: [PATCH] Use absolute domain names instead of relative ones. see #1403 --- modoboa/admin/models/domain.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modoboa/admin/models/domain.py b/modoboa/admin/models/domain.py index d1ea9876e..d703a76b6 100644 --- a/modoboa/admin/models/domain.py +++ b/modoboa/admin/models/domain.py @@ -206,11 +206,8 @@ class Domain(AdminObject): @property def bind_format_dkim_public_key(self): """Return DKIM public key using Bind format.""" - parts = self.name.split(".") - subdomain = ( - "" if len(parts) == 2 else ".{}".format(".".join(parts[:-2]))) - return "{}._domainkey{} 10800 IN TXT \"v=DKIM1; k=rsa; p={}\"".format( - self.dkim_key_selector, subdomain, self.dkim_public_key) + return "{}._domainkey.{}. 10800 IN TXT \"v=DKIM1; k=rsa; p={}\"".format( + self.dkim_key_selector, self.name, self.dkim_public_key) def add_admin(self, account): """Add a new administrator to this domain.