* Reorder milter start and dropping privileges so permissions on Unix socket

are correct (LP: 1797720)
This commit is contained in:
Scott Kitterman
2019-02-11 15:09:34 -05:00
parent b1abbf9d61
commit aa4dadc22f
2 changed files with 6 additions and 4 deletions
+2
View File
@@ -1,4 +1,6 @@
1.0.1 UNRELEASED 1.0.1 UNRELEASED
* Reorder milter start and dropping privileges so permissions on Unix socket
are correct (LP: 1797720)
- Make domain checks case insensitive for determining if signing should be - Make domain checks case insensitive for determining if signing should be
done (LP: #1815311) done (LP: #1815311)
- Add additional Sendmail configuration information to README from OpenDKIM - Add additional Sendmail configuration information to README from OpenDKIM
+4 -4
View File
@@ -348,13 +348,13 @@ def main():
Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS) Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS)
miltername = 'dkimpy-filter' miltername = 'dkimpy-filter'
socketname = milterconfig.get('Socket') socketname = milterconfig.get('Socket')
own_socketfile(milterconfig)
drop_privileges(milterconfig)
sys.stdout.flush()
Milter.runmilter(miltername, socketname, 240)
if milterconfig.get('Syslog'): if milterconfig.get('Syslog'):
syslog.syslog('dkimpy-milter started:{0} user:{1}' syslog.syslog('dkimpy-milter started:{0} user:{1}'
.format(pid, milterconfig.get('UserID'))) .format(pid, milterconfig.get('UserID')))
sys.stdout.flush()
Milter.runmilter(miltername, socketname, 240)
own_socketfile(milterconfig)
drop_privileges(milterconfig)
if __name__ == "__main__": if __name__ == "__main__":
main() main()