comparison 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
comparison
equal deleted inserted replaced
442:9578def11298 443:0df77bbb7fc2
1662 1662
1663 // other headers are only needed for content filtering 1663 // other headers are only needed for content filtering
1664 if (priv.authenticated) return SMFIS_CONTINUE; 1664 if (priv.authenticated) return SMFIS_CONTINUE;
1665 if (priv.only_whites) return SMFIS_CONTINUE; 1665 if (priv.only_whites) return SMFIS_CONTINUE;
1666 if (priv.want_spamassassin) priv.assassin->mlfi_header(headerf, headerv); 1666 if (priv.want_spamassassin) priv.assassin->mlfi_header(headerf, headerv);
1667 if (priv.want_dccgrey || priv.want_dccbulk) priv.dccifd->mlfi_header(ctx, headerf, headerv); 1667 if (priv.dccifd) priv.dccifd->mlfi_header(ctx, headerf, headerv);
1668 return SMFIS_CONTINUE; 1668 return SMFIS_CONTINUE;
1669 } 1669 }
1670 1670
1671 sfsistat mlfi_eoh(SMFICTX* ctx) 1671 sfsistat mlfi_eoh(SMFICTX* ctx)
1672 { 1672 {
1699 } 1699 }
1700 // content filtering 1700 // content filtering
1701 if (priv.authenticated) return SMFIS_CONTINUE; 1701 if (priv.authenticated) return SMFIS_CONTINUE;
1702 if (priv.only_whites) return SMFIS_CONTINUE; 1702 if (priv.only_whites) return SMFIS_CONTINUE;
1703 if (priv.want_spamassassin) priv.assassin->mlfi_eoh(); 1703 if (priv.want_spamassassin) priv.assassin->mlfi_eoh();
1704 if (priv.want_dccgrey || priv.want_dccbulk) priv.dccifd->mlfi_eoh(); 1704 if (priv.dccifd) priv.dccifd->mlfi_eoh();
1705 return SMFIS_CONTINUE; 1705 return SMFIS_CONTINUE;
1706 } 1706 }
1707 1707
1708 sfsistat mlfi_body(SMFICTX *ctx, u_char *data, size_t len) 1708 sfsistat mlfi_body(SMFICTX *ctx, u_char *data, size_t len)
1709 { 1709 {
1710 mlfiPriv &priv = *MLFIPRIV; 1710 mlfiPriv &priv = *MLFIPRIV;
1711 if (priv.authenticated) return SMFIS_CONTINUE; 1711 if (priv.authenticated) return SMFIS_CONTINUE;
1712 if (priv.only_whites) return SMFIS_CONTINUE; 1712 if (priv.only_whites) return SMFIS_CONTINUE;
1713 if (priv.want_spamassassin) priv.assassin->mlfi_body(data, len); 1713 if (priv.want_spamassassin) priv.assassin->mlfi_body(data, len);
1714 if (priv.want_dccgrey || priv.want_dccbulk) priv.dccifd->mlfi_body(data, len); 1714 if (priv.dccifd) priv.dccifd->mlfi_body(data, len);
1715 priv.scanner->scan(data, len); 1715 priv.scanner->scan(data, len);
1716 return SMFIS_CONTINUE; 1716 return SMFIS_CONTINUE;
1717 } 1717 }
1718 1718
1719 sfsistat mlfi_eom(SMFICTX *ctx) 1719 sfsistat mlfi_eom(SMFICTX *ctx)
1731 const u_char *src = (const u_char *)&priv.ip; 1731 const u_char *src = (const u_char *)&priv.ip;
1732 bool local_source = (src[0] == 127); 1732 bool local_source = (src[0] == 127);
1733 int score = (priv.want_spamassassin) ? priv.assassin->mlfi_eom() : 0; 1733 int score = (priv.want_spamassassin) ? priv.assassin->mlfi_eom() : 0;
1734 bool grey = false; 1734 bool grey = false;
1735 int bulk = 0; 1735 int bulk = 0;
1736 if (priv.want_dccgrey || priv.want_dccbulk) priv.dccifd->mlfi_eom(grey, bulk); 1736 if (priv.dccifd) priv.dccifd->mlfi_eom(grey, bulk);
1737 if (!priv.want_dccgrey) grey = false;
1738 if (!priv.want_dccbulk) bulk = 0;
1737 1739
1738 char buf[maxlen]; 1740 char buf[maxlen];
1739 string msg; 1741 string msg;
1740 string_set unknowns; 1742 string_set unknowns;
1741 bool random = false; 1743 bool random = false;