search

spamhaus / spamassassin-dqs

Spamhaus code for the Spamassassin plugin. See https://docs.spamhaustech.com/40-real-world-usage/SpamAssassin/000-intro.html
Apache License 2.0
54 stars 15 forks source link

Change "check_rbl_sub()" to "check_rbl()" to make RCVD_IN_SBL, RCVD_IN_SBL_CSS, and RCVD_IN_SBL_DROP work #25

Closed robertmathews closed 4 years ago

robertmathews commented 4 years ago

Change "check_rbl_sub()" to "check_rbl()" to make RCVD_IN_SBL, RCVD_IN_SBL_CSS, and RCVD_IN_SBL_DROP work:

While examining logs, I noticed that none of these rules have triggered since I switched to DQS: RCVD_IN_SBL, RCVD_IN_SBL_CSS, RCVD_IN_SBL_DROP.

This is because the code uses check_rbl_sub() with three parameters (including a zone parameter) for these rules, instead of the correct check_rbl() with three parameters or check_rbl_sub() with two parameters (check_rbl_sub should not include a zone).

This commit fixes that, using check_rbl() with three parameters for consistency with other rules in the file.

ricalfieri commented 4 years ago

Thanks for spotting this. I'll test and merge