summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-09-22 15:44:32 +0000
committerJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-09-22 15:44:32 +0000
commita26270f48771941b7b0e6f9a868a2fe4efd44dba (patch)
treecd7b8e04fe6faa143c024578719c180abd75257c
parenteb24fb7b55a7a2825458c4e5cb927795482fcd09 (diff)
Make the error messages for failures at EHLO more precise by
distinguishing between unavailable extensions and those that are available but have failed.
-rw-r--r--usr.sbin/smtpd/client.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/client.c b/usr.sbin/smtpd/client.c
index 7e89f327902..b50ffa7445a 100644
--- a/usr.sbin/smtpd/client.c
+++ b/usr.sbin/smtpd/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.5 2009/09/22 12:24:06 jacekm Exp $ */
+/* $OpenBSD: client.c,v 1.6 2009/09/22 15:44:31 jacekm Exp $ */
/*
* Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -804,7 +804,8 @@ client_next_state(struct smtp_client *sp)
return (e->state);
else if (e->must) {
snprintf(sp->ebuf, sizeof(sp->ebuf),
- "150 Could not use %s", e->name);
+ "%s %s", e->name,
+ e->fail ? "failed" : "not available");
return (0);
}
}