From 208dfc3a21f11eaac132a0d14877aecb54d0768f Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Mon, 25 Jun 2012 03:08:25 -0400 Subject: [PATCH] rename require_resolvable_fromhost to resolvable_fromhost --- Changes | 12 ++++++------ MANIFEST | 7 +++---- README | 8 +------- config.sample/plugins | 2 +- config.sample/require_resolvable_fromhost | 3 --- docs/config.pod | 4 ++-- docs/hooks.pod | 2 +- docs/plugins.pod | 2 +- ...quire_resolvable_fromhost => resolvable_fromhost} | 0 ...quire_resolvable_fromhost => resolvable_fromhost} | 0 ...quire_resolvable_fromhost => resolvable_fromhost} | 0 11 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 config.sample/require_resolvable_fromhost rename plugins/async/{require_resolvable_fromhost => resolvable_fromhost} (100%) rename plugins/{require_resolvable_fromhost => resolvable_fromhost} (100%) rename t/plugin_tests/{require_resolvable_fromhost => resolvable_fromhost} (100%) diff --git a/Changes b/Changes index 0945ba8..4cba6eb 100644 --- a/Changes +++ b/Changes @@ -17,7 +17,7 @@ Next Version p0f version 3 supported and new default. see UPGRADING (Matt Simerson) - require_resolvable_fromhost ignores DNS search path (i.e. it expects fully resolved domains) (Robert Spier, Charlie Brady) + resolvable_fromhost ignores DNS search path (i.e. it expects fully resolved domains) (Robert Spier, Charlie Brady) new plugin auth_vpopmaild (Robin Bowes) @@ -44,7 +44,7 @@ Next Version AUTH PLAIN bug with Alpine (Rick Richard) - require_resolvable_fromhost: Moved DENYSOFT for temp_resolver_failed + resolvable_fromhost: Moved DENYSOFT for temp_resolver_failed to the RCPT TO hook. (Larry Nedry) Note Net::IP dependency (Larry Nedry) @@ -163,7 +163,7 @@ Next Version plugins/queue/maildir: multi user / multi domain support added set the Return-Path header when queuing into maildir mailboxes - plugins/require_resolvable_fromhost: check all MX hosts, not just the first + plugins/resolvable_fromhost: check all MX hosts, not just the first remove outdated virus/check_for_hi_virus plugin @@ -191,7 +191,7 @@ Next Version async: Dereference the DATA deny message before sending it to the client - Change async/require_resolvable_fromhost to match the logic of + Change async/resolvable_fromhost to match the logic of the non-async version and other MTAs async: Handle End-of-data marker split across packets @@ -453,7 +453,7 @@ Next Version example patterns for badrcptto plugin - Gordon Rowell - Extend require_resolvable_fromhost to include a configurable list of + Extend resolvable_fromhost to include a configurable list of "impossible" addresses to combat spammer forging. (Hanno Hecker) Use qmail/control/smtpdgreeting if it exists, otherwise @@ -570,7 +570,7 @@ Next Version no longer exists for that sender (great for harassment cases). (John Peacock) - check_earlytalker and require_resolvable_fromhost - short circuit test if + check_earlytalker and resolvable_fromhost - short circuit test if whitelistclient is set. (Michael Toren) check_badmailfrom - Do not say why a given message is denied. diff --git a/MANIFEST b/MANIFEST index 0a02e1b..b9d30ca 100644 --- a/MANIFEST +++ b/MANIFEST @@ -15,7 +15,6 @@ config.sample/norelayclients config.sample/plugins config.sample/rcpthosts config.sample/relayclients -config.sample/require_resolvable_fromhost config.sample/rhsbl_zones config.sample/size_threshold config.sample/smtpauth-checkpassword @@ -64,7 +63,7 @@ plugins/async/check_earlytalker plugins/async/dns_whitelist_soft plugins/async/dnsbl plugins/async/queue/smtp-forward -plugins/async/require_resolvable_fromhost +plugins/async/resolvable_fromhost plugins/async/rhsbl plugins/async/uribl plugins/auth/auth_checkpassword @@ -122,7 +121,7 @@ plugins/rcpt_map plugins/rcpt_ok plugins/rcpt_regexp plugins/relay -plugins/require_resolvable_fromhost +plugins/resolvable_fromhost plugins/resolvable_fromhost plugins/rhsbl plugins/sender_permitted_from @@ -186,7 +185,7 @@ t/plugin_tests/ident/geoip t/plugin_tests/ident/p0f t/plugin_tests/rcpt_ok t/plugin_tests/relay -t/plugin_tests/require_resolvable_fromhost +t/plugin_tests/resolvable_fromhost t/plugin_tests/sender_permitted_from t/plugin_tests/spamassassin t/plugin_tests/virus/clamdscan diff --git a/README b/README index baf18b9..421e7d4 100644 --- a/README +++ b/README @@ -123,7 +123,7 @@ interest in various "hooks" provided by the qpsmtpd core engine. At least one plugin MUST allow or deny the RCPT command to enable receiving mail. The "rcpt_ok" is one basic plugin that does this. Other plugins provide extra functionality related to this; for -example the require_resolvable_fromhost plugin described above. +example the resolvable_fromhost plugin described above. =head1 Configuration files @@ -157,12 +157,6 @@ Normal ip based DNS blocking lists ("RBLs"). For example: spamsources.fabel.dk -=item require_resolvable_fromhost - -If this file contains anything but a 0 on the first line, envelope -senders will be checked against DNS. If an A or a MX record can't be -found the mail command will return a soft rejection (450). - =item spool_dir If this file contains a directory, it will be the spool directory diff --git a/config.sample/plugins b/config.sample/plugins index 9e6d9d2..887a022 100644 --- a/config.sample/plugins +++ b/config.sample/plugins @@ -34,7 +34,7 @@ check_earlytalker count_unrecognized_commands 4 relay -require_resolvable_fromhost +resolvable_fromhost rhsbl dnsbl diff --git a/config.sample/require_resolvable_fromhost b/config.sample/require_resolvable_fromhost deleted file mode 100644 index ce052b5..0000000 --- a/config.sample/require_resolvable_fromhost +++ /dev/null @@ -1,3 +0,0 @@ -1 - -# use 0 to disable; anything else to enable. \ No newline at end of file diff --git a/docs/config.pod b/docs/config.pod index 9693188..e2fbb28 100644 --- a/docs/config.pod +++ b/docs/config.pod @@ -144,9 +144,9 @@ evaluate the efficacy and listing policies of a DNSBL before using it. See also C and C in the documentation of the C plugin -=item require_resolvable_fromhost +=item resolvable_fromhost -Plugin: F +Plugin: F Reject sender addresses where the MX is unresolvable, i.e. a boolean value is the only value in this file. If the MX resolves to something, reject the diff --git a/docs/hooks.pod b/docs/hooks.pod index 0020613..6423fc6 100644 --- a/docs/hooks.pod +++ b/docs/hooks.pod @@ -235,7 +235,7 @@ Arguments for this hook are # $sender: an Qpsmtpd::Address object for # sender of the message -Example plugins for the C are F +Example plugins for the C are F and F. =head2 hook_rcpt_pre diff --git a/docs/plugins.pod b/docs/plugins.pod index 43a4c4e..586ebfa 100644 --- a/docs/plugins.pod +++ b/docs/plugins.pod @@ -25,7 +25,7 @@ various I provided by the qpsmtpd core engine. At least one plugin B allow or deny the B command to enable receiving mail. The F plugin is the standard plugin for this. Other plugins provide extra functionality related to this; for example the -F plugin. +F plugin. =head2 Loading Plugins diff --git a/plugins/async/require_resolvable_fromhost b/plugins/async/resolvable_fromhost similarity index 100% rename from plugins/async/require_resolvable_fromhost rename to plugins/async/resolvable_fromhost diff --git a/plugins/require_resolvable_fromhost b/plugins/resolvable_fromhost similarity index 100% rename from plugins/require_resolvable_fromhost rename to plugins/resolvable_fromhost diff --git a/t/plugin_tests/require_resolvable_fromhost b/t/plugin_tests/resolvable_fromhost similarity index 100% rename from t/plugin_tests/require_resolvable_fromhost rename to t/plugin_tests/resolvable_fromhost