From c4f9292be2820445cc4dadac30f54876e24210e3 Mon Sep 17 00:00:00 2001
Message-Id: <c4f9292be2820445cc4dadac30f54876e24210e3.1715519817.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Tue, 3 Jun 2008 18:42:25 +0100
Subject: [PATCH] Don't report failure just because MTA is being over-picky
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 lib/sendmail.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/sendmail.c b/lib/sendmail.c
index 12291b8..2dc82d0 100644
--- a/lib/sendmail.c
+++ b/lib/sendmail.c
@@ -271,11 +271,11 @@ int sendmail(const char *sender,
       ;
     if(w < 0)
       fatal(errno, "error calling waitpid");
-    if(w) {
-      error(0, "%s -bs: %s", config->sendmail, wstat(w));
-      if(!rc)
-        rc = -1;
-    }
+    if(w)
+      info("warning: %s -bs: %s", config->sendmail, wstat(w));
+    /* Not fatal - we determine success/failure from the SMTP conversation.
+     * Some MTAs exit nonzero if you don't QUIT, which is just stupidly
+     * picky. */
   }
   return rc;
 }
-- 
[mdw]