From 2c31895648bc4c8556ec08982ebbd50c48ee3a63 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 24 Feb 2018 14:16:19 +0100
Subject: [PATCH] Fixed syntax for subdomains.

see #1403
---
 modoboa/admin/models/domain.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modoboa/admin/models/domain.py b/modoboa/admin/models/domain.py
index 98d286c47..d1ea9876e 100644
--- a/modoboa/admin/models/domain.py
+++ b/modoboa/admin/models/domain.py
@@ -206,8 +206,11 @@ class Domain(AdminObject):
     @property
     def bind_format_dkim_public_key(self):
         """Return DKIM public key using Bind format."""
-        return "{}._domainkey 10800 IN TXT \"v=DKIM1; k=rsa; p={}\"".format(
-            self.dkim_key_selector, self.dkim_public_key)
+        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)
 
     def add_admin(self, account):
         """Add a new administrator to this domain.