- Added support for DiagnosticDirectory and updated dkimpy-milter specifics in

dkimpy-milter.conf.5

dkimpy_milter/__init__.py

@@ -247,11 +247,14 @@ class dkimMilter(Milter.Base):
                   syslog.syslog('DKIM: Pass ({0})'.format(d.domain))
               self.dkim_domain = d.domain
           else:
-            fd,fname = tempfile.mkstemp(".dkim")
-            with os.fdopen(fd,"w+b") as fp:
-                fp.write(txt)
-            if milterconfig.get('Syslog'):
-                syslog.syslog('DKIM: Fail (saved as {0})'.format(fname))
+              if milterconfig.get['DiagnosticDirectory']:
+                  fd,fname = tempfile.mkstemp(".dkim")
+                  with os.fdopen(fd,"w+b") as fp:
+                      fp.write(txt)
+                  if milterconfig.get('Syslog'):
+                      syslog.syslog('DKIM: Fail (saved as {0})'.format(fname))
+              else:
+                  syslog.syslog('DKIM: Fail ({0})'.format(d.domain))
           if res:
             result = 'pass'
           else:

dkimpy_milter/config.py

@@ -46,7 +46,8 @@ defaultConfigData = {
         'UserID' : 'dkimpy-milter',
         'Canonicalization' : 'relaxed/simple',
         'InternalHosts' : '127.0.0.1',
-        'InternalHostsObj' : False
+        'InternalHostsObj' : False,
+        'DiagnosticDirectory' : ''
         }
 
 
@@ -334,6 +335,7 @@ def _readConfigFile(path, configData = None, configGlobal = {}):
         'Canonicalization' : 'str',
         'InternalHosts' : 'dataset',
         'InternalHostsObj': 'bool',
+        'DiagnosticDirectory' : 'str'
             }
 
     #  check to see if it's a file