Merge branch 'master' of git+ssh://git.launchpad.net/dkimpy-milter

2019-09-23 11:01:56 -04:00
parent 47b7e9892f 68e61d419b
commit d24b298dce
1 changed files with 6 additions and 3 deletions
@@ -316,6 +316,8 @@ class dkimMilter(Milter.Base):
                self.dkim_comment = str(x)
                if milterconfig.get('Syslog'):
                    syslog.syslog("check_dkim: {0}".format(x))
+            if not self.header_a:
+                self.header_a = 'rsa-sha256'
            if res:
                if (milterconfig.get('Syslog') and
                        (milterconfig.get('SyslogSuccess') or
@@ -340,12 +342,13 @@ class dkimMilter(Milter.Base):
                            syslog.syslog('DKIM: Fail ({0})'
                                          .format(d.domain.lower()))
                        else:
-                            syslog.syslog('DKIM: Fail, unextractable domain'
+                            syslog.syslog('DKIM: Fail, unextractable domain')
            if res:
                result = 'pass'
            else:
                result = 'fail'
            res = False
+            if self.header_d:
                self.arresults.append(
                    authres.DKIMAuthenticationResult(result=result,
                                                 header_i=self.header_i,