On Fri, 17 Feb 2006, [ISO-8859-1] Ask Bj?rn Hansen wrote:
Unless something comes up ...
...
Changes:
[snip]
Are you going to replace the smtp-forward queue plugin? I don't think it's
really usable as is, because it doesn't relay response codes.
See http://nowhere.dk/~alj/qpsmtpd/smtp-forward-new, but with this patch:
--- qpsmtpd-0.31.1/plugins/queue/smtp-forward 2006-02-12 17:47:02.000000000
-0500
+++ mezzanine_patched_qpsmtpd-0.31.1/plugins/queue/smtp-forward 2006-02-12
17:46:33.000000000 -0500
@@ -78,7 +78,7 @@
$smtp->data();
$rc = $smtp->code;
- #$message = $smtp->message;
+ $message = $smtp->message;
chomp($message);
if ($rc =~ m/^4\d{2}$/ ) {
@@ -92,12 +92,6 @@
$message = $smtp->message;
chomp($message);
-
- if ($message =~ m/^End data with/ ) {
- (undef, $message) = split(/:/, $message);
- if ($message) { $message =~ s/^\s//; }
- }
-
if ($rc =~ m/^4\d{2}$/ ) {
return(DENYSOFT, "Unable to queue message ($message)");
} elsif ($rc =~ m/^5\d{2}$/ ) {
@@ -113,11 +107,6 @@
$message = $smtp->message;
chomp($message);
- if ($message =~ m/^End data with/ ) {
- (undef, $message) = split(/:/, $message);
- if ($message) { $message =~ s/^\s//; }
- }
-
if ($rc =~ m/^4\d{2}$/ ) {
return(DENYSOFT, "Unable to queue message ($message)");
} elsif ($rc =~ m/^5\d{2}$/ ) {
@@ -131,11 +120,6 @@
my $queue_message;
chomp($message);
- if ($message =~ m/^End data with/ ) {
- (undef, $message) = split(/\n/, $message);
- if ($message) { $message =~ s/^\s//; }
- }
-
if ($rc =~ m/^4\d{2}$/ ) {
return(DENYSOFT, "Unable to queue message ($message)");
} elsif ($rc =~ m/^5\d{2}$/ ) {
---
Charlie
