diff --git a/makefile b/makefile index 65e545b..b5b9437 100644 --- a/makefile +++ b/makefile @@ -2,7 +2,7 @@ web: doxygen rsync -ravK doc/html/ spidey2.bmsi.com:/Public/pymilter -VERSION=1.0.2 +VERSION=1.0.3 PKG=pysrs-$(VERSION) SRCTAR=$(PKG).tar.gz diff --git a/pysrs.spec b/pysrs.spec index 30a7099..0145cd0 100644 --- a/pysrs.spec +++ b/pysrs.spec @@ -135,6 +135,7 @@ fi /etc/logrotate.d/pysrs /usr/share/sendmail-cf/hack/* %{_libexecdir}/milter/pysrs +%{_libexecdir}/milter/srsmilter %if %{use_systemd} %{_unitdir}/* %else @@ -145,7 +146,7 @@ fi * Mon Nov 13 2017 Stuart Gathman 1.0.3-1 - Include srsmilter -* Tue Nov 3 2017 Stuart Gathman 1.0.2-1 +* Fri Nov 3 2017 Stuart Gathman 1.0.2-1 - Fix daemon to run in python2 - Move daemons to /usr/libexec/milter so they get bin_t selinux label diff --git a/srsmilter.py b/srsmilter.py index 183a289..5b98563 100755 --- a/srsmilter.py +++ b/srsmilter.py @@ -223,7 +223,7 @@ def envrcpt(self,to,*params): self.nosrsrcpt.append(to) return Milter.CONTINUE - def eoh(self): + def data(self): if not self.data_allowed: return Milter.REJECT return Milter.CONTINUE @@ -243,7 +243,7 @@ def eom(self): if __name__ == "__main__": global config - config = Config(['srsmilter.cfg','/etc/mail/srsmilter.cfg']) + config = Config(['pysrs.cfg','/etc/mail/pysrs.cfg']) Milter.factory = srsMilter if config.miltersrs: flags = Milter.CHGFROM + Milter.DELRCPT