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
This commit is contained in:
Jared Johnson 2014-11-24 18:18:21 -06:00
parent c1e4ab1a95
commit 20cbbad9e8

View File

@ -436,18 +436,13 @@ sub get_dbm_location {
$config->{db_dir} = $1; $config->{db_dir} = $1;
} }
# Setup database location
my $dbdir;
if ($config->{per_recipient_db}) {
$dbdir = $transaction->notes('per_rcpt_configdir');
}
my @candidate_dirs = ( my @candidate_dirs = (
$dbdir, $config->{db_dir}, $config->{db_dir},
"/var/lib/qpsmtpd/greylisting", "/var/lib/qpsmtpd/greylisting",
"$QPHOME/var/db", "$QPHOME/config", '.' "$QPHOME/var/db", "$QPHOME/config", '.'
); );
my $dbdir;
for my $d (@candidate_dirs) { for my $d (@candidate_dirs) {
next if !$d || !-d $d; # impossible next if !$d || !-d $d; # impossible
$dbdir = $d; $dbdir = $d;