Mercurial > dnsbl
diff src/dnsbl.cpp @ 443:0df77bbb7fc2 stable-6-0-67
always call dcc code so we get log entries
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Fri, 05 Jan 2018 17:23:19 -0800 |
| parents | 1686cb639269 |
| children | f2bc221240e8 |
line wrap: on
line diff
--- a/src/dnsbl.cpp Thu Dec 07 08:16:52 2017 -0800 +++ b/src/dnsbl.cpp Fri Jan 05 17:23:19 2018 -0800 @@ -1664,7 +1664,7 @@ if (priv.authenticated) return SMFIS_CONTINUE; if (priv.only_whites) return SMFIS_CONTINUE; if (priv.want_spamassassin) priv.assassin->mlfi_header(headerf, headerv); - if (priv.want_dccgrey || priv.want_dccbulk) priv.dccifd->mlfi_header(ctx, headerf, headerv); + if (priv.dccifd) priv.dccifd->mlfi_header(ctx, headerf, headerv); return SMFIS_CONTINUE; } @@ -1701,7 +1701,7 @@ if (priv.authenticated) return SMFIS_CONTINUE; if (priv.only_whites) return SMFIS_CONTINUE; if (priv.want_spamassassin) priv.assassin->mlfi_eoh(); - if (priv.want_dccgrey || priv.want_dccbulk) priv.dccifd->mlfi_eoh(); + if (priv.dccifd) priv.dccifd->mlfi_eoh(); return SMFIS_CONTINUE; } @@ -1711,7 +1711,7 @@ if (priv.authenticated) return SMFIS_CONTINUE; if (priv.only_whites) return SMFIS_CONTINUE; if (priv.want_spamassassin) priv.assassin->mlfi_body(data, len); - if (priv.want_dccgrey || priv.want_dccbulk) priv.dccifd->mlfi_body(data, len); + if (priv.dccifd) priv.dccifd->mlfi_body(data, len); priv.scanner->scan(data, len); return SMFIS_CONTINUE; } @@ -1733,7 +1733,9 @@ int score = (priv.want_spamassassin) ? priv.assassin->mlfi_eom() : 0; bool grey = false; int bulk = 0; - if (priv.want_dccgrey || priv.want_dccbulk) priv.dccifd->mlfi_eom(grey, bulk); + if (priv.dccifd) priv.dccifd->mlfi_eom(grey, bulk); + if (!priv.want_dccgrey) grey = false; + if (!priv.want_dccbulk) bulk = 0; char buf[maxlen]; string msg;