From 20cbbad9e82c648169ee46c9b4b15870048360a4 Mon Sep 17 00:00:00 2001 From: Jared Johnson Date: Mon, 24 Nov 2014 18:18:21 -0600 Subject: [PATCH] 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;