From: gilles <gilles@openbsd.org>
Date: Wed, 14 Oct 2015 20:57:17 +0000 (+0000)
Subject: we dump esc_code if we have an esc_class, code may be (and actually was)
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d6921fea0c2c84d244afb0958c52bbdf399b9101;p=openbsd

we dump esc_code if we have an esc_class, code may be (and actually was)
confused as a pasto, so add a comment to make it clear that this is not
an error
---

diff --git a/usr.sbin/smtpd/envelope.c b/usr.sbin/smtpd/envelope.c
index ed8b28b49f3..7faf7c7899b 100644
--- a/usr.sbin/smtpd/envelope.c
+++ b/usr.sbin/smtpd/envelope.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: envelope.c,v 1.31 2015/10/09 09:56:28 gilles Exp $	*/
+/*	$OpenBSD: envelope.c,v 1.32 2015/10/14 20:57:17 gilles Exp $	*/
 
 /*
  * Copyright (c) 2013 Eric Faurot <eric@openbsd.org>
@@ -893,7 +893,8 @@ ascii_dump_field(const char *field, const struct envelope *ep,
 	}
 
 	if (strcasecmp(field, "esc-code") == 0) {
-		if (ep->esc_code)
+		/* this is not a pasto, we dump esc_code if esc_class is !0 */
+		if (ep->esc_class)
 			return ascii_dump_uint8(ep->esc_code, buf, len);
 		return 1;
 	}