Mercurial > dnsbl
changeset 172:d3189495ec68 stable-6-0-7
don't do generic rdns filtering on whitelisted recipients
| author | carl |
|---|---|
| date | Thu, 30 Aug 2007 18:50:00 -0700 |
| parents | 8deb51871b3d |
| children | 83fe0be032c1 |
| files | ChangeLog NEWS configure.in dnsbl.conf src/dnsbl.cpp xml/dnsbl.in |
| diffstat | 6 files changed, 16 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 30 14:40:03 2007 -0700 +++ b/ChangeLog Thu Aug 30 18:50:00 2007 -0700 @@ -1,5 +1,8 @@ $Id$ +6.08 2007-08-30 + Don't do generic reverse dns filtering on authenticated connections. + 6.07 2007-08-30 Add generic reverse dns filtering with regular expression. Fix pre/post scripts in the rpm spec file.
--- a/NEWS Thu Aug 30 14:40:03 2007 -0700 +++ b/NEWS Thu Aug 30 18:50:00 2007 -0700 @@ -1,5 +1,6 @@ $Id$ +6.08 2007-08-30 Don't do generic reverse dns filtering on authenticated connections. 6.07 2007-08-30 Add generic reverse dns filtering with regular expression. 6.06 2007-08-27 Fix bug that effectively disabled spamassassin filtering. 6.05 2007-08-26 Fix unitialized variable in my spamassassin code.
--- a/configure.in Thu Aug 30 14:40:03 2007 -0700 +++ b/configure.in Thu Aug 30 18:50:00 2007 -0700 @@ -1,6 +1,6 @@ AC_PREREQ(2.59) -AC_INIT(dnsbl,6.07,carl@five-ten-sg.com) +AC_INIT(dnsbl,6.08,carl@five-ten-sg.com) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h])
--- a/dnsbl.conf Thu Aug 30 14:40:03 2007 -0700 +++ b/dnsbl.conf Thu Aug 30 18:50:00 2007 -0700 @@ -54,7 +54,7 @@ spamassassin 5; }; - generic "(^|[.-])(host)?([0-9]{1,3}[.-](Red-|dynamic[.-])?){4}" + generic "(^|[.-])(h(ost|))?([0-9]{1,3}[.-](Red-|dynamic[.-])?){4}" "your mail server %s seems to have a generic name"; env_to {
--- a/src/dnsbl.cpp Thu Aug 30 14:40:03 2007 -0700 +++ b/src/dnsbl.cpp Thu Aug 30 18:50:00 2007 -0700 @@ -1039,6 +1039,7 @@ smfi_setreply(ctx, "550", "5.7.1", buf); return SMFIS_REJECT; } + if (st == oksofar) { char *msg = con.generic_match(priv.client_name); if (msg) { // reject the recipient based on generic reverse dns @@ -1047,6 +1048,7 @@ smfi_setreply(ctx, "550", "5.7.1", buf); return SMFIS_REJECT; } + } if (st == black) { // reject the recipient based on blacklisting either from or to smfi_setreply(ctx, "550", "5.7.1", "no such user");
--- a/xml/dnsbl.in Thu Aug 30 14:40:03 2007 -0700 +++ b/xml/dnsbl.in Thu Aug 30 18:50:00 2007 -0700 @@ -682,7 +682,7 @@ spamassassin 5; }; - generic "(^|[.-])(host)?([0-9]{1,3}[.-](Red-|dynamic[.-])?){4}" + generic "(^|[.-])(h(ost|))?([0-9]{1,3}[.-](Red-|dynamic[.-])?){4}" "your mail server %s seems to have a generic name"; env_to {