fix define and enhanced status code reason for 5.5.0

diff --git a/usr.sbin/smtpd/esc.c b/usr.sbin/smtpd/esc.c
index d3517eb..f311b8e 100644 (file)
--- a/usr.sbin/smtpd/esc.c
+++ b/usr.sbin/smtpd/esc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esc.c,v 1.3 2015/01/20 17:37:54 deraadt Exp $      */
+/* $OpenBSD: esc.c,v 1.4 2015/10/14 21:02:11 gilles Exp $       */
 
 /*
  * Copyright (c) 2014 Gilles Chehade <gilles@poolp.org>
@@ -72,7 +72,7 @@ static struct escode {
        { ESC_DELIVERY_TIME_EXPIRED,                    "Delivery time expired" },
 
        /* 5.x */
-       { ESC_OTHER_PROTOCOL_STATUS,                    "Other/Undefined protocol status" },
+       { ESC_INVALID_RECIPIENT,                        "Invalid recipient" },
        { ESC_INVALID_COMMAND,                          "Invalid command" },
        { ESC_SYNTAX_ERROR,                             "Syntax error" },
        { ESC_TOO_MANY_RECIPIENTS,                      "Too many recipients" },

diff --git a/usr.sbin/smtpd/smtpd-api.h b/usr.sbin/smtpd/smtpd-api.h
index f1aa06d..6cb1a10 100644 (file)
--- a/usr.sbin/smtpd/smtpd-api.h
+++ b/usr.sbin/smtpd/smtpd-api.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: smtpd-api.h,v 1.21 2015/01/20 17:37:54 deraadt Exp $  */
+/*     $OpenBSD: smtpd-api.h,v 1.22 2015/10/14 21:02:11 gilles Exp $   */
 
 /*
  * Copyright (c) 2013 Eric Faurot <eric@openbsd.org>
@@ -254,7 +254,7 @@ enum enhanced_status_code {
        ESC_DELIVERY_TIME_EXPIRED                       = 47,
 
        /* 5.x */
-       ESC_OTHER_PROTOCOL_STATUS                       = 50,
+       ESC_INVALID_RECIPIENT                           = 50,
        ESC_INVALID_COMMAND                             = 51,
        ESC_SYNTAX_ERROR                                = 52,
        ESC_TOO_MANY_RECIPIENTS                         = 53,