diff options
| -rw-r--r-- | mail-filter/gld/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch | 32 |
2 files changed, 17 insertions, 21 deletions
diff --git a/mail-filter/gld/ChangeLog b/mail-filter/gld/ChangeLog index 2160a84ca9e8..218968e2ca06 100644 --- a/mail-filter/gld/ChangeLog +++ b/mail-filter/gld/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-filter/gld # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.26 2005/10/15 08:55:38 slarti Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.27 2005/10/21 16:31:21 slarti Exp $ + + 21 Oct 2005; Tom Martin <slarti@gentoo.org> + files/gld-1.5.2-mxgrey-fix.patch: + Updated patch. Thanks to <kyberneticist@yahoo.com> in bug #108900. 15 Oct 2005; Tom Martin <slarti@gentoo.org> +files/gld-1.5.2-mxgrey-fix.patch: diff --git a/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch b/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch index 4ec6be79f22e..c33644abb83b 100644 --- a/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch +++ b/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch @@ -1,24 +1,18 @@ ---- gld-1.5.2/greylist.c.orig 2005-08-17 00:44:06.000000000 +0200 -+++ gld-1.5.2/greylist.c 2005-08-17 00:40:32.000000000 +0200 -@@ -181,10 +181,29 @@ +--- gld-1.5.2/greylist.c 2005-04-21 05:41:09.000000000 -0400 ++++ gld-1.5.2/greylist.c 2005-10-20 14:05:05.000000000 -0400 +@@ -181,10 +181,28 @@ else if(conf->update==1) { - if(conf->lightd==1 && fnotdomain==1) -- snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and -recipient='%s'",ts,ip,osender,orecipient); -- -- snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and -recipient='%s'",ts,ip,sender,recipient); -+ +- snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,osender,orecipient); + if(ts-n>conf->mini) + { -+ if(conf->lightd==1 && fnotdomain==1) -+ snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and -recipient='%s'",ts,ip,osender,orecipient); -+ -+ snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and -recipient='%s'",ts,ip,sender,recipient); ++ if(conf->lightd==1 && fnotdomain==1) ++ snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,osender,orecipient); + +- snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,sender,recipient); ++ snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,sender,recipient); + } + else + { @@ -28,14 +22,12 @@ recipient='%s'",ts,ip,sender,recipient); + // In fact this means that the THIRD retry will immidiately pass the greylist, as mxgrey checks only for ip and (n>1). + // + // 2005-08-16 martin@it4linux.de -+ // ++ // + + if(conf->lightd==1 && fnotdomain==1) -+ snprintf(query,sizeof(query)-1,"update greylist set last=%d where ip='%s' and sender='%s' and -recipient='%s'",ts,ip,osender,orecipient); ++ snprintf(query,sizeof(query)-1,"update greylist set last=%d where ip='%s' and sender='%s' and recipient='%s'",ts,ip,osender,orecipient); + -+ snprintf(query,sizeof(query)-1,"update greylist set last=%d where ip='%s' and sender='%s' and -recipient='%s'",ts,ip,sender,recipient); ++ snprintf(query,sizeof(query)-1,"update greylist set last=%d where ip='%s' and sender='%s' and recipient='%s'",ts,ip,sender,recipient); + } SQLQuery(query); |