summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-11-17 09:22:20 +0000
committerJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-11-17 09:22:20 +0000
commit70ae6732cdf101c52bbc6453ab689242959afa39 (patch)
tree64ad24b01af757bc24c257f63f1b1125c153e1c8
parenta47bf0d32ca2eb11c5b9a6637028f1303a2054aa (diff)
Fix handling of 5yz response to EHLO, ie. fallback to HELO.
-rw-r--r--usr.sbin/smtpd/client.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/client.c b/usr.sbin/smtpd/client.c
index 3759b918031..1c64a3dd519 100644
--- a/usr.sbin/smtpd/client.c
+++ b/usr.sbin/smtpd/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.16 2009/11/11 15:36:10 jacekm Exp $ */
+/* $OpenBSD: client.c,v 1.17 2009/11/17 09:22:19 jacekm Exp $ */
/*
* Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -460,6 +460,7 @@ client_read(struct smtp_client *sp)
* the caller from dropping mail for trifle reason.
*/
if (*sp->reply == '5' &&
+ sp->state != CLIENT_EHLO &&
sp->state != CLIENT_AUTH &&
sp->state != CLIENT_MAILFROM &&
sp->state != CLIENT_RCPTTO &&