From 8e6561f48bb9d7896d01703b7bd26bfd9337848d Mon Sep 17 00:00:00 2001
From: Andrzej Augustynowicz <andrzej@augustynowicz.eu.org>
Date: Wed, 14 Jul 2004 21:00:02 +0000
Subject: [PATCH] - fix adding x-header in courier

Changed files:
    amavis-ng-header.patch -> 1.1
---
 amavis-ng-header.patch | 44 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 amavis-ng-header.patch

diff --git a/amavis-ng-header.patch b/amavis-ng-header.patch
new file mode 100644
index 0000000..3bfff29
--- /dev/null
+++ b/amavis-ng-header.patch
@@ -0,0 +1,44 @@
+diff -Nur old/AMAVIS/MTA/Courier.pm new/AMAVIS/MTA/Courier.pm
+--- old/AMAVIS/MTA/Courier.pm	2003-03-17 23:04:11.000000000 +0000
++++ new/AMAVIS/MTA/Courier.pm	2004-07-14 20:24:55.000000000 +0000
+@@ -174,19 +174,16 @@
+   my $args = shift;
+   writelog($args,LOG_INFO, __PACKAGE__.": Accepting message");
+ 
+-  #TODO Courier filters cannot rewrite MIME messages, we'd like
+-  #to be able to add a header or something to this message but
+-  #we can't.(yet). Sorry
+-  
+   ##Rewrite the message in the queue if we need to add a header
+-  #if ($cfg_x_header) {
+-  #  my $queuefile = IO::File->new("+>$$args{'messagefile'}");
+-  #  print $queuefile "$cfg_x_header_tag: $cfg_x_header_line\n";
+-  #  while (my $line=$$args{'filehandle'}->getline()) {
+-  #    print $queuefile $line;
+-  #  }
+-  #  close($queuefile);
+-  #}
++  if ($cfg_x_header) {
++    my $queuefile = IO::File->new("+>$$args{'messagefile'}");
++    print $queuefile "$cfg_x_header_tag: $cfg_x_header_line\n";
++    while (my $line=$$args{'filehandle'}->getline()) {
++      print $queuefile $line;
++    }
++    print STDOUT $queuefile;
++    close($queuefile);
++  }
+ 
+   $$args{'status'} = 'accept';
+   
+diff -Nur old/etc/amavis.conf new/etc/amavis.conf
+--- old/etc/amavis.conf	2003-04-08 14:09:56.000000000 +0000
++++ new/etc/amavis.conf	2004-07-14 20:26:45.000000000 +0000
+@@ -54,7 +54,7 @@
+ ; notifiers=Sender, Recipients, Admin
+ 
+ ;; What should be inserted into the message's headers if it is let
+-;; through? This does not work for the Milter or Courier interfaces.
++;; through? This does not work for the Milter interfaces.
+ 
+ ; x-header = true
+ ; x-header-tag = X-Scanned-By
-- 
2.44.0