PATCH: Return 421 if we are going to disconnect

[Peter J. Holzer]

RFC 2821 says we should return 421, if we disconnect, not 450 or 451.

        hp

-- 
   _  | Peter J. Holzer    | Ich sehe nun ein, dass Computer wenig
|_|_) | Sysadmin WSR       | geeignet sind, um sich was zu merken.
| |   | [EMAIL PROTECTED]         |
__/   | http://www.hjp.at/ |    -- Holger Lembke in dan-am

--- lib/Qpsmtpd/SMTP.pm.421     Thu May 19 13:54:44 2005
+++ lib/Qpsmtpd/SMTP.pm Tue May 31 20:48:52 2005
@@ -276,7 +276,7 @@
     elsif ($rc == DENYSOFT_DISCONNECT) {
       $msg ||= $from->format . ', temporarily denied';
       $self->log(LOGINFO, "denysoft mail from " . $from->format . " ($msg)");
-      $self->respond(450, $msg);
+      $self->respond(421, $msg);
       $self->disconnect;
     }
     else { # includes OK
@@ -320,7 +320,7 @@
   elsif ($rc == DENYSOFT_DISCONNECT) {
     $msg ||= 'relaying denied';
     $self->log(LOGINFO, "delivery denied ($msg)");
-    $self->respond(450, $msg);
+    $self->respond(421, $msg);
     $self->disconnect;
   }
   elsif ($rc == OK) {
@@ -417,7 +417,7 @@
     return 1;
   }
   elsif ($rc == DENYSOFT_DISCONNECT) {
-    $self->respond(451, $msg || "Message denied temporarily");
+    $self->respond(421, $msg || "Message denied temporarily");
     $self->disconnect;
     return 1;
   }

pgpgjTGsB1bId.pgp
Description: PGP signature