File qmail-1.03-rfc2821-tls.patch of Package netqmail

Overview Repositories Revisions Requests Users Attributes Meta

File qmail-1.03-rfc2821-tls.patch of Package netqmail (Revision fbabb97d21254c48a2c30f3536c91729)

Currently displaying revision fbabb97d21254c48a2c30f3536c91729 , Show latest

(this is the 2nd edition of this patch and the 4th edition of the
introductory text)
(modified by Peter Conrad to work together with STARTTLS patch)

This patch changes qmail-remote to skip over MX servers that greet with
codes 400 to 499 and to bounce mail when any MX server that qmail tries
greets with a code 500 to 599.

If you want qmail-remote to skip over hosts greeting with 5XX-codes and
try the next MX for real RFC-2821 compliance (Sendmail and Postfix do
that), change the

if (code >= 500 && code < 600) quit("DConnected to "," but greeting failed");

if (code >= 500 && code < 600) return;

License:

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--- qmail-remote.c.orig	2011-05-24 15:29:15.000000000 +0200
+++ qmail-remote.c	2011-05-24 15:31:26.000000000 +0200
@@ -585,7 +585,10 @@
   if (!smtps)
 #endif
  
-  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
+  code = smtpcode();
+  if (code >= 500 && code < 600) quit("DConnected to "," but greeting failed");
+  if (code >= 400 && code < 500) return; /* try next MX, see RFC-2821 */
+  if (code != 220) quit("ZConnected to "," but greeting failed");
  
 #ifdef EHLO
 # ifdef TLS
@@ -810,7 +813,7 @@
 #ifdef TLS
       partner_fqdn = ip.ix[i].fqdn;
 #endif
-      smtp(); /* does not return */
+      smtp(); /* only returns when the next MX is to be tried */
     }
     tcpto_err(&ip.ix[i].ip,errno == error_timeout);
     close(smtpfd);

Places

File qmail-1.03-rfc2821-tls.patch of Package netqmail (Revision fbabb97d21254c48a2c30f3536c91729)

Places