From 368ffd5374d9150e1778fdcf2bfb429340223536 Mon Sep 17 00:00:00 2001 From: Stuart Gathman Date: Sun, 23 Nov 2008 03:06:47 +0000 Subject: [PATCH] Milter support for chgfrom. --- Milter/__init__.py | 7 +++++-- miltermodule.c | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Milter/__init__.py b/Milter/__init__.py index 8d7b738..5bb025e 100755 --- a/Milter/__init__.py +++ b/Milter/__init__.py @@ -112,8 +112,8 @@ class Milter: def chgheader(self,field,idx,value): return self.__ctx.chgheader(field,idx,value) - def addrcpt(self,rcpt): - return self.__ctx.addrcpt(rcpt) + def addrcpt(self,rcpt,params=None): + return self.__ctx.addrcpt(rcpt,params) def delrcpt(self,rcpt): return self.__ctx.delrcpt(rcpt) @@ -121,6 +121,9 @@ class Milter: def replacebody(self,body): return self.__ctx.replacebody(body) + def chgfrom(self,sender,params=None): + return self.__ctx.chgfrom(sender,params) + # When quarantined, a message goes into the mailq as if to be delivered, # but delivery is deferred until the message is unquarantined. def quarantine(self,reason): diff --git a/miltermodule.c b/miltermodule.c index f407ba0..d927caa 100644 --- a/miltermodule.c +++ b/miltermodule.c @@ -35,6 +35,9 @@ $ python setup.py help libraries=["milter","smutil","resolv"] * $Log$ + * Revision 1.12 2008/11/21 20:42:52 customdesigned + * Support smfi_chgfrom and smfi_addrcpt_par. + * * Revision 1.11 2007/09/25 02:26:29 customdesigned * Update license. * @@ -1031,7 +1034,7 @@ milter_chgfrom(PyObject *self, PyObject *args) { SMFICTX *ctx; PyThreadState *t; - if (!PyArg_ParseTuple(args, "sz:chgfrom", &sender, ¶ms)) + if (!PyArg_ParseTuple(args, "s|z:chgfrom", &sender, ¶ms)) return NULL; ctx = _find_context(self); if (ctx == NULL) return NULL;