1 files changed, 6 insertions, 2 deletions

diff --git a/qmail-remote.c b/qmail-remote.c
index 4161a7b..49bd5c4 100644
--- a/qmail-remote.c
+++ b/qmail-remote.c
@@ -568,7 +568,9 @@ void smtp()
   if (!smtps)
 #endif
  
-  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
+  code = smtpcode();
+  if (code >= 500) quit("DConnected to "," but greeting failed");
+  if (code != 220) quit("ZConnected to "," but greeting failed");
  
 #ifdef EHLO
 # ifdef TLS
@@ -595,7 +597,9 @@ void smtp()
   substdio_put(&smtpto,helohost.s,helohost.len);
   substdio_puts(&smtpto,"\r\n");
   substdio_flush(&smtpto);
-  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
+  code = smtpcode();
+  if (code >= 500) quit("DConnected to "," but my name was rejected");
+  if (code != 250) quit("ZConnected to "," but my name was rejected");
  
 #ifdef EHLO
   }