1 |
diff -Nur -x '*.orig' -x '*.rej' qpsmtpd-0.31.1/plugins/queue/smtp-forward mezzanine_patched_qpsmtpd-0.31.1/plugins/queue/smtp-forward |
2 |
--- qpsmtpd-0.31.1/plugins/queue/smtp-forward 2006-02-12 17:47:02.000000000 -0500 |
3 |
+++ mezzanine_patched_qpsmtpd-0.31.1/plugins/queue/smtp-forward 2006-02-12 17:46:33.000000000 -0500 |
4 |
@@ -78,7 +78,7 @@ |
5 |
|
6 |
$smtp->data(); |
7 |
$rc = $smtp->code; |
8 |
- #$message = $smtp->message; |
9 |
+ $message = $smtp->message; |
10 |
chomp($message); |
11 |
|
12 |
if ($rc =~ m/^4\d{2}$/ ) { |
13 |
@@ -92,12 +92,6 @@ |
14 |
$message = $smtp->message; |
15 |
chomp($message); |
16 |
|
17 |
- |
18 |
- if ($message =~ m/^End data with/ ) { |
19 |
- (undef, $message) = split(/:/, $message); |
20 |
- if ($message) { $message =~ s/^\s//; } |
21 |
- } |
22 |
- |
23 |
if ($rc =~ m/^4\d{2}$/ ) { |
24 |
return(DENYSOFT, "Unable to queue message ($message)"); |
25 |
} elsif ($rc =~ m/^5\d{2}$/ ) { |
26 |
@@ -113,11 +107,6 @@ |
27 |
$message = $smtp->message; |
28 |
chomp($message); |
29 |
|
30 |
- if ($message =~ m/^End data with/ ) { |
31 |
- (undef, $message) = split(/:/, $message); |
32 |
- if ($message) { $message =~ s/^\s//; } |
33 |
- } |
34 |
- |
35 |
if ($rc =~ m/^4\d{2}$/ ) { |
36 |
return(DENYSOFT, "Unable to queue message ($message)"); |
37 |
} elsif ($rc =~ m/^5\d{2}$/ ) { |
38 |
@@ -131,11 +120,6 @@ |
39 |
my $queue_message; |
40 |
chomp($message); |
41 |
|
42 |
- if ($message =~ m/^End data with/ ) { |
43 |
- (undef, $message) = split(/\n/, $message); |
44 |
- if ($message) { $message =~ s/^\s//; } |
45 |
- } |
46 |
- |
47 |
if ($rc =~ m/^4\d{2}$/ ) { |
48 |
return(DENYSOFT, "Unable to queue message ($message)"); |
49 |
} elsif ($rc =~ m/^5\d{2}$/ ) { |