From c5b2623666551bd21975523fd56b39869d46ef9f Mon Sep 17 00:00:00 2001
From: cjwatson <>
Date: Tue, 13 Jan 2004 20:17:57 -0800
Subject: [PATCH] [project @ 2004-01-13 20:17:57 by cjwatson] Switch around
 From_ and Received: headers so that bugreport.cgi likes them. (Oops.)

---
 scripts/spamscan.in | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/spamscan.in b/scripts/spamscan.in
index 2dfa260d..3c0408bd 100755
--- a/scripts/spamscan.in
+++ b/scripts/spamscan.in
@@ -1,5 +1,5 @@
 #! /usr/bin/perl -T
-# $Id: spamscan.in,v 1.3 2004/01/13 19:25:57 cjwatson Exp $
+# $Id: spamscan.in,v 1.4 2004/01/13 20:17:57 cjwatson Exp $
 #
 # Usage: spamscan
 #
@@ -126,7 +126,15 @@ for (;;) {
 	    or die "printf log: $!";
     } else {
 	open OUT, "> incoming/I$id" or die "open incoming/I$id: $!";
-	print OUT $mail->as_string() or die "print incoming/I$id: $!";
+	my @headers = $mail->get_all_headers();
+	if ($headers[0] =~ /^From /) {
+	    my $from = $headers[0];
+	    $headers[0] = $headers[1];
+	    $headers[1] = $from;
+	}
+	print OUT join '', @headers or die "print incoming/I$id: $!";
+	print OUT "\n" or die "print incoming/I$id: $!";
+	print OUT @{$mail->get_body()} or die "print incoming/I$id: $!";
 	close OUT or die "close incoming/I$id: $!";
 	unlink "incoming/R$id" or warn "unlink incoming/R$id: $!";
 	printf "  ok %.1f/%.1f\n",
-- 
2.39.5