Treat ECONNREFUSED the same as ETIMEDOUT

After an SMTP connection attempt times out, qmail-remote records
the relevant IP address.  If the same address fails again (after
at least two minutes with no intervening successful connections),
qmail-remote assumes that further attempts will fail for at least
another hour.

3 files changed, 9 insertions, 1 deletions

diff --git a/error.c b/error.c
index d51304f..e705cf4 100644
--- a/error.c
+++ b/error.c
@@ -93,3 +93,10 @@ EACCES;
 #else
 -13;
 #endif
+
+int error_refused =
+#ifdef ECONNREFUSED
+ECONNREFUSED;
+#else
+-14;
+#endif
diff --git a/error.h b/error.h
index 5d98c6b..7c64e24 100644
--- a/error.h
+++ b/error.h
@@ -16,6 +16,7 @@ extern int error_again;
 extern int error_pipe;
 extern int error_perm;
 extern int error_acces;
+extern int error_refused;
 
 extern char *error_str();
 extern int error_temp();
diff --git a/qmail-remote.c b/qmail-remote.c
index dc00d08..b865b4d 100644
--- a/qmail-remote.c
+++ b/qmail-remote.c
@@ -951,7 +951,7 @@ char **argv;
 #endif
       smtp(); /* only returns when the next MX is to be tried */
     }
-    tcpto_err(&ip.ix[i].ip,errno == error_timeout);
+    tcpto_err(&ip.ix[i].ip,errno == error_timeout || errno == error_refused);
     close(smtpfd);
   }