X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=script%2Fpublic-inbox-mda;h=71c5d93714de0b77802b4f00cba8410f7c33e01f;hb=420fddb8b683637cc1fd39727896cac4a459c3b6;hp=3ff318c916007f2f19751b51a241ecb22fca2819;hpb=84d811cfb3a0c8724c52ce485402e4586d5c9e04;p=public-inbox.git diff --git a/script/public-inbox-mda b/script/public-inbox-mda index 3ff318c9..71c5d937 100755 --- a/script/public-inbox-mda +++ b/script/public-inbox-mda @@ -75,13 +75,19 @@ if ($spamc) { my $mime = PublicInbox::MIME->new(\$str); do_exit(0) unless $spam_ok; -my $fcfg = $dst->{filter} || ''; -# -mda defaults to the strict base filter -if ($fcfg eq '') { - $dst->{filter} = 'PublicInbox::Filter::Base'; -} elsif ($fcfg eq 'scrub') { # legacy alias, undocumented, remove? - $dst->{filter} = 'PublicInbox::Filter::Mirror'; +# -mda defaults to the strict base filter which we won't use anywhere else +sub mda_filter_adjust ($) { + my ($ibx) = @_; + my $fcfg = $ibx->{filter} || ''; + if ($fcfg eq '') { + $ibx->{filter} = 'PublicInbox::Filter::Base'; + } elsif ($fcfg eq 'scrub') { # legacy alias, undocumented, remove? + $ibx->{filter} = 'PublicInbox::Filter::Mirror'; + } } + +mda_filter_adjust($dst); + my $filter = $dst->filter; my $ret = $filter->delivery($mime); if (ref($ret) && $ret->isa('Email::MIME')) { # filter altered message