about summary refs log tree commit homepage
path: root/public-inbox-mda
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2014-04-05 03:17:35 +0000
committerEric Wong <normalperson@yhbt.net>2014-04-05 06:55:35 +0000
commite6c85810fc1536676fb72b4bf050aca72f0e9b10 (patch)
tree21b007a07101166e40c0cd8cef0d9aff42538d37 /public-inbox-mda
parent5b5c69db66d6b33d1d53129c75800526c97b4a32 (diff)
downloadpublic-inbox-e6c85810fc1536676fb72b4bf050aca72f0e9b10.tar.gz
We will just use the fallback in Email::Filter to
reduce configuration knobs.  Failed messages are failed
messages, do not classify them beyond that.
Diffstat (limited to 'public-inbox-mda')
-rwxr-xr-xpublic-inbox-mda12
1 files changed, 1 insertions, 11 deletions
diff --git a/public-inbox-mda b/public-inbox-mda
index 8f63fa7e..aabc37eb 100755
--- a/public-inbox-mda
+++ b/public-inbox-mda
@@ -29,7 +29,6 @@ defined $recipient or die "RECIPIENT not defined in ENV\n";
 my $dst = $config->lookup($recipient);
 defined $dst or exit(1);
 my $main_repo = $dst->{mainrepo} or exit(1);
-my $fail_repo = $dst->{failrepo} or exit(1);
 my $filtered; # string dest
 
 if (PublicInbox->precheck($filter, $recipient) &&
@@ -44,19 +43,10 @@ if (PublicInbox->precheck($filter, $recipient) &&
                 if (do_spamc($simple, \$filtered)) {
                         $filter->simple(Email::Simple->new($filtered));
                         $filter->pipe(MDA, $main_repo);
-                } else {
-                        $filter->pipe(MDA, $fail_repo);
                 }
-        } else {
-                # PublicInbox::Filter nuked everything, oops :x
-                $filter->pipe(MDA, $fail_repo);
         }
-} else {
-        # if SA thinks it's spam or there's an error:
-        # don't bother with our own filtering
-        $filter->pipe(MDA, $fail_repo);
 }
-die "Email::Filter failed to exit\n";
+exit 0; # goes to failbox
 
 # we depend on "report_safe 0" in /etc/spamassassin/*.cf with --headers
 # not using Email::Filter->pipe here since we want the stdout of