Start integration of OpenDKIM config file processing

dkimpy_milter/__init__.py

@@ -35,10 +35,8 @@ import StringIO
 import re
 from Milter.config import MilterConfigParser
 from Milter.utils import iniplist,parse_addr,parseaddr
-
+import dkim_milter.config as config
-class Config(object):
+from dkim_milter.util import drop_privileges
-  "Hold configuration options."
-  pass
 
 def read_config(list):
   "Return new config object."
@@ -268,18 +266,16 @@ class dkimMilter(Milter.Base):
       return res
 
 if __name__ == "__main__":
-    Milter.factory = dkimpyMilter
+    configFile = '/etc/dkimpy-milter.conf'
-    Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS)
-    #global config
-    #config = read_config(['dkim-milter.cfg','/etc/mail/dkim-milter.cfg'])
-    configFile = '/etc/dkimpymilter.conf'
     if len(sys.argv) > 1:
         if sys.argv[1] in ( '-?', '--help', '-h' ):
             print('usage: dkimpy-milter [<configfilename>]')
             sys.exit(1)
         configFile = sys.argv[1]
-
     configGlobal = dkimpy-milter.config._processConfigFile(filename = configFile)
+
+    Milter.factory = dkimMilter(configGlobal)
+    Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS)
     miltername = config.miltername
     socketname = config.socketname
     sys.stdout.flush()