From 20cbbad9e82c648169ee46c9b4b15870048360a4 Mon Sep 17 00:00:00 2001 From: Jared Johnson Date: Mon, 24 Nov 2014 18:18:21 -0600 Subject: [PATCH 1/3] Drop support for per-recipient greylist dbm files This does not drop support for including the recipient in the greylist key. Note that this was already broken for an indeterminate (long) amount of time --- plugins/greylisting | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/plugins/greylisting b/plugins/greylisting index f4dcc42..3af6a5f 100644 --- a/plugins/greylisting +++ b/plugins/greylisting @@ -436,18 +436,13 @@ sub get_dbm_location { $config->{db_dir} = $1; } - # Setup database location - my $dbdir; - if ($config->{per_recipient_db}) { - $dbdir = $transaction->notes('per_rcpt_configdir'); - } - my @candidate_dirs = ( - $dbdir, $config->{db_dir}, + $config->{db_dir}, "/var/lib/qpsmtpd/greylisting", "$QPHOME/var/db", "$QPHOME/config", '.' ); + my $dbdir; for my $d (@candidate_dirs) { next if !$d || !-d $d; # impossible $dbdir = $d; From 0c1498d44df9d5a1228967a0ee422618df4d6717 Mon Sep 17 00:00:00 2001 From: Jared Johnson Date: Mon, 24 Nov 2014 18:48:40 -0600 Subject: [PATCH 2/3] Drop documentation too --- plugins/greylisting | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plugins/greylisting b/plugins/greylisting index 3af6a5f..f9327f6 100644 --- a/plugins/greylisting +++ b/plugins/greylisting @@ -116,12 +116,6 @@ usable directory from the following list will be used: Flag to indicate whether to use per-recipient configs. -=head2 per_recipient_db - -Flag to indicate whether to use per-recipient greylisting -databases (default is to use a shared database). Per-recipient configuration -directories, if determined, supercede I. - =head2 nfslock Flag to indicate the database is stored on NFS. Uses File::NFSLock From a0c8baae8dbe04c2ea14568255c4a61e0f66d6e7 Mon Sep 17 00:00:00 2001 From: Jared Johnson Date: Tue, 25 Nov 2014 10:42:47 -0600 Subject: [PATCH 3/3] Add POD section pointing to per-recip db support --- plugins/greylisting | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/greylisting b/plugins/greylisting index f9327f6..755cacf 100644 --- a/plugins/greylisting +++ b/plugins/greylisting @@ -148,6 +148,14 @@ Prior to adding GeoIP support, I greylisted all connections from windows compute Adjust the quantity of logging for this plugin. See docs/logging.pod +=head1 CHANGES + +The per_recipient_db configuration option has been removed. +It relied on a note that was not set anywhere in upstream QP. +The latest version of this plugin that supported this configuration +option can be found here: + +https://github.com/smtpd/qpsmtpd/blob/ea2f1e89dd6b72f1c06191425e2bd8d98bea2ac6/plugins/greylisting =head1 AUTHOR