byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

greylisting: fix db_dir configuration option so it actually works

Browse Source 
(kitno455, issue #6)

  http://code.google.com/p/smtpd/issues/detail?id=6



git-svn-id: https://svn.perl.org/qpsmtpd/trunk@724 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Ask Bjørn Hansen 2007-03-15 06:51:37 +00:00
parent cc00c1d9ff
commit 5c9e3d6004
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changes
View File

@ -1,6 +1,9 @@
0.33 (to be) 0.33 (to be)
Correct header parsing of "space only" lines (Joerg Meyer) greylisting: fix db_dir configuration option so it actually works
(kitno455, issue #6)
Correct header parsing of "space only" lines (Joerg Meyer, issue #11)
Update the sample configuration to use zen.spamhaus.org Update the sample configuration to use zen.spamhaus.org

6
plugins/greylisting
View File

@ -129,7 +129,7 @@ my $DENYMSG = "This mail is temporarily denied";
my ($QPHOME) = ($0 =~ m!(.*?)/([^/]+)$!); my ($QPHOME) = ($0 =~ m!(.*?)/([^/]+)$!);
my $DB = "denysoft_greylist.dbm"; my $DB = "denysoft_greylist.dbm";
my %PERMITTED_ARGS = map { $_ => 1 } qw(per_recipient remote_ip sender recipient my %PERMITTED_ARGS = map { $_ => 1 } qw(per_recipient remote_ip sender recipient
black_timeout grey_timeout white_timeout deny_late mode); black_timeout grey_timeout white_timeout deny_late mode db_dir);
my %DEFAULTS = ( my %DEFAULTS = (
remote_ip => 1, remote_ip => 1,
@ -206,6 +206,10 @@ sub denysoft_greylist {
return DECLINED if $self->qp->connection->notes('whitelisthost'); return DECLINED if $self->qp->connection->notes('whitelisthost');
return DECLINED if $transaction->notes('whitelistsender'); return DECLINED if $transaction->notes('whitelistsender');
if ($config->{db_dir} =~ m{^([-a-zA-Z0-9./_]+)$}) {
$config->{db_dir} = $1;
}
# Setup database location # Setup database location
my $dbdir = $transaction->notes('per_rcpt_configdir') my $dbdir = $transaction->notes('per_rcpt_configdir')
if $config->{per_recipient_db}; if $config->{per_recipient_db};