Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

In SpamAssassin version 4.0.0 all rules, configuration directives, rulenames, eval-functions, command line options and modules that contain "whitelist" or "blacklist" have been renamed to contain "welcomelist" and "blocklist" terms. This allows acronyms like WL and BL to remain the same. Previous options will continue work at least until version 4.1.0 is released.

...

  • Rule USER_IN_WHITELIST is now named USER_IN_WELCOMELIST
  • Configuration directive auto_whitelist_path is now auto_welcomelist_path
  • Spamassassin spamassassin command line option --add-to-blacklist is now --add-to-blocklist

...

If there are any meta-rules referring to rulenames like USER_IN_WHITELIST or you have set local scores for rules like USER_IN_WHITELIST or use commands directives like "auto_whitelist_path", rename all by replacing white→welcome and black→block.

...

Old functionNew function
check_for_def_dkim_whitelist_fromcheck_for_def_dkim_welcomelist_from
check_for_dkim_whitelist_fromcheck_for_dkim_welcomelist_from
check_forged_in_default_whitelistcheck_forged_in_default_welcomelist
check_forged_in_whitelistcheck_forged_in_welcomelist
check_from_in_auto_whitelistcheck_from_in_auto_welcomelist
check_from_in_blacklistcheck_from_in_blocklist
check_from_in_default_whitelistcheck_from_in_default_welcomelist
check_from_in_whitelistcheck_from_in_welcomelist
check_to_in_blacklistcheck_to_in_blocklist
check_to_in_whitelistcheck_to_in_welcomelist
check_uri_host_in_blacklistcheck_uri_host_in_blocklist
check_uri_host_in_whitelistcheck_uri_host_in_welcomelist
check_whitelist_bounce_relayscheck_welcomelist_bounce_relays

List of changed configuration

...

directives in core:

Old commanddirectiveNew commanddirective
blacklist_fromblocklist_from
blacklist_toblocklist_to
blacklist_uri_hostblocklist_uri_host
def_whitelist_authdef_welcomelist_auth
def_whitelist_from_rcvddef_welcomelist_from_rcvd
unblacklist_fromunblocklist_from
unwhitelist_authunwelcomelist_auth
unwhitelist_fromunwelcomelist_from
unwhitelist_from_rcvdunwelcomelist_from_rcvd
whitelist_allows_relayswelcomelist_allows_relays
whitelist_authwelcomelist_auth
whitelist_fromwelcomelist_from
whitelist_from_rcvdwelcomelist_from_rcvd
whitelist_towelcomelist_to
whitelist_uri_hostwelcomelist_uri_host

List of changed configuration

...

directives in all plugins:

Old commanddirectiveNew commanddirective
auto_whitelist_db_modulesauto_welcomelist_db_modules
auto_whitelist_distinguish_signedauto_welcomelist_distinguish_signed
auto_whitelist_factorauto_welcomelist_factor
auto_whitelist_factoryauto_welcomelist_factory
auto_whitelist_file_modeauto_welcomelist_file_mode
auto_whitelist_ipv4_mask_lenauto_welcomelist_ipv4_mask_len
auto_whitelist_ipv6_mask_lenauto_welcomelist_ipv6_mask_len
auto_whitelist_pathauto_welcomelist_path
blacklist_subjectblocklist_subject
def_whitelist_from_dkimdef_welcomelist_from_dkim
def_whitelist_from_spfdef_welcomelist_from_spf
freemail_import_def_whitelist_authfreemail_import_def_welcomelist_auth
freemail_import_whitelist_authfreemail_import_welcomelist_auth
hashbl_email_whitelisthashbl_email_welcomelist
pyzor_whitelist_factorpyzor_welcomelist_factor
pyzor_whitelist_minpyzor_welcomelist_min
txrep_whitelist_outtxrep_welcomelist_out
unwhitelist_from_dkimunwelcomelist_from_dkim
unwhitelist_from_spfunwelcomelist_from_spf
use_auto_whitelistuse_auto_welcomelist
whitelist_bounce_relayswelcomelist_bounce_relays
whitelist_from_dkimwelcomelist_from_dkim
whitelist_from_spfwelcomelist_from_spf
whitelist_subjectwelcomelist_subject

...