From 77e63e92ae1ba572206f7d4ffe717f7d8ff00b95 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Wed, 27 Jun 2012 19:17:01 -0400 Subject: [PATCH] drop the check_ prefix from the last 3 plugins --- Changes | 8 ++++---- MANIFEST | 12 ++++++------ config.sample/plugins | 2 +- docs/hooks.pod | 2 +- plugins/async/{check_earlytalker => earlytalker} | 2 +- plugins/{check_bogus_bounce => bogus_bounce} | 2 +- plugins/{check_earlytalker => earlytalker} | 6 +++--- plugins/{check_loop => loop} | 2 +- t/config/plugins | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) rename plugins/async/{check_earlytalker => earlytalker} (97%) rename plugins/{check_bogus_bounce => bogus_bounce} (97%) rename plugins/{check_earlytalker => earlytalker} (97%) rename plugins/{check_loop => loop} (97%) diff --git a/Changes b/Changes index 4cba6eb..be8d88f 100644 --- a/Changes +++ b/Changes @@ -570,7 +570,7 @@ Next Version no longer exists for that sender (great for harassment cases). (John Peacock) - check_earlytalker and resolvable_fromhost - short circuit test if + earlytalker and resolvable_fromhost - short circuit test if whitelistclient is set. (Michael Toren) check_badmailfrom - Do not say why a given message is denied. @@ -642,7 +642,7 @@ Next Version Add a plugin hook for the DATA command - check_earlytalker - + earlytalker - + optionally react to an earlytalker by denying all MAIL-FROM commands rather than issuing a 4xx/5xx greeting and disconnecting. (Mark Powell) @@ -728,7 +728,7 @@ Next Version Use $ENV{QMAIL} to override /var/qmail for where to find the control/ directory. - Enable "check_earlytalker" in the default plugins config + Enable "earlytalker" in the default plugins config Added a milter plugin to allow use of sendmail milters @@ -792,7 +792,7 @@ Next Version unrecognized_command hook and a count_unrecognized_commands plugin. (Rasjid Wilcox) - check_earlytalker plugin. Deny the connection if the client talks + earlytalker plugin. Deny the connection if the client talks before we show our SMTP banner. (From Devin Carraway) Patch Qpsmtpd::SMTP to allow connect plugins to give DENY and diff --git a/MANIFEST b/MANIFEST index b9d30ca..991ffdd 100644 --- a/MANIFEST +++ b/MANIFEST @@ -59,7 +59,7 @@ Makefile.PL MANIFEST This list of files MANIFEST.SKIP META.yml Module meta-data (added by MakeMaker) -plugins/async/check_earlytalker +plugins/async/earlytalker plugins/async/dns_whitelist_soft plugins/async/dnsbl plugins/async/queue/smtp-forward @@ -77,9 +77,9 @@ plugins/auth/authdeny plugins/badmailfrom plugins/badmailfromto plugins/badrcptto -plugins/check_bogus_bounce -plugins/check_earlytalker -plugins/check_loop +plugins/bogus_bounce +plugins/earlytalker +plugins/loop plugins/connection_time plugins/content_log plugins/count_unrecognized_commands @@ -172,9 +172,9 @@ t/plugin_tests/auth/auth_vpopmaild t/plugin_tests/auth/authdeny t/plugin_tests/auth/authnull t/plugin_tests/badmailfrom -t/plugin_tests/check_badmailfromto +t/plugin_tests/badmailfromto t/plugin_tests/badrcptto -t/plugin_tests/check_earlytalker +t/plugin_tests/earlytalker t/plugin_tests/count_unrecognized_commands t/plugin_tests/dnsbl t/plugin_tests/dspam diff --git a/config.sample/plugins b/config.sample/plugins index 887a022..5fb03f8 100644 --- a/config.sample/plugins +++ b/config.sample/plugins @@ -30,7 +30,7 @@ dont_require_anglebrackets quit_fortune # tls should load before count_unrecognized_commands #tls -check_earlytalker +earlytalker count_unrecognized_commands 4 relay diff --git a/docs/hooks.pod b/docs/hooks.pod index 6423fc6..3dd7b5a 100644 --- a/docs/hooks.pod +++ b/docs/hooks.pod @@ -293,7 +293,7 @@ was sent, this hook is called. B This hook, like B, B, B, B, is an endpoint of a pipelined command group (see RFC 1854) and may be used to -detect ``early talkers''. Since svn revision 758 the F +detect ``early talkers''. Since svn revision 758 the F plugin may be configured to check at this hook for ``early talkers''. Allowed return codes are diff --git a/plugins/async/check_earlytalker b/plugins/async/earlytalker similarity index 97% rename from plugins/async/check_earlytalker rename to plugins/async/earlytalker index fa0266d..9e3fb22 100644 --- a/plugins/async/check_earlytalker +++ b/plugins/async/earlytalker @@ -2,7 +2,7 @@ =head1 NAME -check_earlytalker - Check that the client doesn't talk before we send the SMTP banner +earlytalker - Check that the client doesn't talk before we send the SMTP banner =head1 DESCRIPTION diff --git a/plugins/check_bogus_bounce b/plugins/bogus_bounce similarity index 97% rename from plugins/check_bogus_bounce rename to plugins/bogus_bounce index 70e5de0..2a97472 100644 --- a/plugins/check_bogus_bounce +++ b/plugins/bogus_bounce @@ -2,7 +2,7 @@ =head1 NAME -check_bogus_bounce - Check that a bounce message isn't bogus +bogus_bounce - Check that a bounce message isn't bogus =head1 DESCRIPTION diff --git a/plugins/check_earlytalker b/plugins/earlytalker similarity index 97% rename from plugins/check_earlytalker rename to plugins/earlytalker index 5a8ef3d..f75c8fe 100644 --- a/plugins/check_earlytalker +++ b/plugins/earlytalker @@ -2,7 +2,7 @@ =head1 NAME -check_earlytalker - Check that the client doesn't talk before we send the SMTP banner +earlytalker - Check that the client doesn't talk before we send the SMTP banner =head1 DESCRIPTION @@ -30,7 +30,7 @@ must also be allowed for. Do we reject/deny connections to early talkers? - check_earlytalker reject [ 0 | 1 ] + earlytalker reject [ 0 | 1 ] Default: I @@ -48,7 +48,7 @@ issued a deny or denysoft (depending on the value of I). The defaul is to react at the SMTP greeting stage by issuing the apropriate response code and terminating the SMTP connection. - check_earlytalker defer-reject [ 0 | 1 ] + earlytalker defer-reject [ 0 | 1 ] =head2 check-at [ CONNECT | DATA ] diff --git a/plugins/check_loop b/plugins/loop similarity index 97% rename from plugins/check_loop rename to plugins/loop index 634c126..1a3d264 100644 --- a/plugins/check_loop +++ b/plugins/loop @@ -2,7 +2,7 @@ =head1 NAME -check_loop - Detect mail loops +loop - Detect mail loops =head1 DESCRIPTION diff --git a/t/config/plugins b/t/config/plugins index 44bbe28..c4f25d6 100644 --- a/t/config/plugins +++ b/t/config/plugins @@ -30,7 +30,7 @@ parse_addr_withhelo quit_fortune # tls should load before count_unrecognized_commands #tls -check_earlytalker +earlytalker count_unrecognized_commands 4 relay