diff options
| author | John Denker <jsd@av8n.com> | 2016-01-01 11:48:52 -0700 |
|---|---|---|
| committer | John Denker <jsd@av8n.com> | 2016-01-01 16:33:35 -0800 |
| commit | 07951838e1eab0d61fc733f3cc5a043f564a970c (patch) | |
| tree | 2d18535680e640352fdb51ce7082c47c28fb418a | |
| parent | a16bea1ca0aa3ef44919fbe045b9040874fd8628 (diff) | |
unrevert other
| -rw-r--r-- | qmail-remote.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qmail-remote.c b/qmail-remote.c index 24ee375..0fdadf6 100644 --- a/qmail-remote.c +++ b/qmail-remote.c @@ -543,7 +543,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 @@ -570,7 +572,10 @@ 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 } |