very minor cleanup - starts and creates socket

This commit is contained in:
Scott Kitterman
2018-02-13 23:42:24 -05:00
parent c523afe8e5
commit f5e08c4ea1
3 changed files with 1 additions and 4 deletions
+1 -1
View File
@@ -46,4 +46,4 @@ PidFile /var/run/dkimpy-milter/dkimpy-milter.pid
### Change to user "userid" before starting normal operation? May include ### Change to user "userid" before starting normal operation? May include
### a group ID as well, separated from the userid by a colon. ### a group ID as well, separated from the userid by a colon.
# #
UserID dkimpy-milter UserID dkimpy-milter
-2
View File
@@ -246,9 +246,7 @@ def main():
print('usage: dkimpy-milter [<configfilename>]') print('usage: dkimpy-milter [<configfilename>]')
sys.exit(1) sys.exit(1)
configFile = sys.argv[1] configFile = sys.argv[1]
print('configfile', configFile)
milterconfig = config._processConfigFile(filename = configFile) milterconfig = config._processConfigFile(filename = configFile)
print('Socket', milterconfig.get('Socket'))
drop_privileges(milterconfig) drop_privileges(milterconfig)
Milter.factory = dkimMilter(milterconfig) Milter.factory = dkimMilter(milterconfig)
Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS) Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS)
-1
View File
@@ -21,7 +21,6 @@ def drop_privileges(milterconfig):
import grp import grp
import pwd import pwd
import syslog import syslog
import dkim
if os.getuid() != 0: if os.getuid() != 0:
if milterconfig.get('Syslog'): if milterconfig.get('Syslog'):