From a26270f48771941b7b0e6f9a868a2fe4efd44dba Mon Sep 17 00:00:00 2001 From: Jacek Masiulaniec Date: Tue, 22 Sep 2009 15:44:32 +0000 Subject: Make the error messages for failures at EHLO more precise by distinguishing between unavailable extensions and those that are available but have failed. --- usr.sbin/smtpd/client.c | 5 +++-- 1 file 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 @@ -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); } } -- cgit v1.2.3