diff --git a/CHANGES b/CHANGES index 8fc3de5..5e6358e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ 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 done (LP: #1815311) - Add additional Sendmail configuration information to README from OpenDKIM diff --git a/dkimpy_milter/__init__.py b/dkimpy_milter/__init__.py index 07c8bfb..56dd228 100644 --- a/dkimpy_milter/__init__.py +++ b/dkimpy_milter/__init__.py @@ -348,13 +348,13 @@ def main(): Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS) miltername = 'dkimpy-filter' socketname = milterconfig.get('Socket') + own_socketfile(milterconfig) + drop_privileges(milterconfig) + sys.stdout.flush() + Milter.runmilter(miltername, socketname, 240) if milterconfig.get('Syslog'): syslog.syslog('dkimpy-milter started:{0} user:{1}' .format(pid, milterconfig.get('UserID'))) - sys.stdout.flush() - Milter.runmilter(miltername, socketname, 240) - own_socketfile(milterconfig) - drop_privileges(milterconfig) if __name__ == "__main__": main()