projects / packages / amavis-ng.git / blame
| Commit | Line | Data |
|---|---|---|
| 496903fa AA |
1 | diff -Nur old/AMAVIS/MTA/Courier.pm new/AMAVIS/MTA/Courier.pm |
| 2 | --- old/AMAVIS/MTA/Courier.pm 2003-03-17 23:04:11.000000000 +0000 | |
| 3 | +++ new/AMAVIS/MTA/Courier.pm 2004-07-15 16:22:43.000000000 +0000 | |
| 4 | @@ -97,7 +97,7 @@ | |
| 5 | my $message_id; | |
| 6 | while (1) { | |
| 7 | $message_id = sprintf("%.8x-%.4x",time,$$); | |
| 8 | - unless (defined mkpath ($prefix.$message_id, 0, 0770)) { | |
| 9 | + unless (defined mkpath ($prefix.$message_id, 0, 0775)) { | |
| 10 | if (++$i > 10) { | |
| 11 | return 0; | |
| 12 | } | |
| 13 | @@ -174,19 +174,16 @@ | |
| 14 | my $args = shift; | |
| 15 | writelog($args,LOG_INFO, __PACKAGE__.": Accepting message"); | |
| 16 | ||
| 17 | - #TODO Courier filters cannot rewrite MIME messages, we'd like | |
| 18 | - #to be able to add a header or something to this message but | |
| 19 | - #we can't.(yet). Sorry | |
| 20 | - | |
| 21 | ##Rewrite the message in the queue if we need to add a header | |
| 22 | - #if ($cfg_x_header) { | |
| 23 | - # my $queuefile = IO::File->new("+>$$args{'messagefile'}"); | |
| 24 | - # print $queuefile "$cfg_x_header_tag: $cfg_x_header_line\n"; | |
| 25 | - # while (my $line=$$args{'filehandle'}->getline()) { | |
| 26 | - # print $queuefile $line; | |
| 27 | - # } | |
| 28 | - # close($queuefile); | |
| 29 | - #} | |
| 30 | + if ($cfg_x_header) { | |
| 31 | + my $queuefile = IO::File->new("+>$$args{'messagefile'}"); | |
| 32 | + print $queuefile "$cfg_x_header_tag: $cfg_x_header_line\n"; | |
| 33 | + while (my $line=$$args{'filehandle'}->getline()) { | |
| 34 | + print $queuefile $line; | |
| 35 | + } | |
| 36 | + print STDOUT $queuefile; | |
| 37 | + close($queuefile); | |
| 38 | + } | |
| 39 | ||
| 40 | $$args{'status'} = 'accept'; | |
| 41 | ||
| 42 | diff -Nur old/etc/amavis.conf new/etc/amavis.conf | |
| 43 | --- old/etc/amavis.conf 2003-04-08 14:09:56.000000000 +0000 | |
| 44 | +++ new/etc/amavis.conf 2004-07-15 16:20:34.000000000 +0000 | |
| 45 | @@ -54,7 +54,7 @@ | |
| 46 | ; notifiers=Sender, Recipients, Admin | |
| 47 | ||
| 48 | ;; What should be inserted into the message's headers if it is let | |
| 49 | -;; through? This does not work for the Milter or Courier interfaces. | |
| 50 | +;; through? This does not work for the Milter interface. | |
| 51 | ||
| 52 | ; x-header = true | |
| 53 | ; x-header-tag = X-Scanned-By |