From 834c4ef23ac06aea709956834eb6bdd7c9a6c8c9 Mon Sep 17 00:00:00 2001
From: millert <millert@openbsd.org>
Date: Mon, 1 Apr 2024 21:09:44 +0000
Subject: [PATCH] Advertise SMTPUTF8 and 8BITMIME extensions in EHLO. Fixes
 potential interoperability issues when the real MTA supports those
 extensions.  From Arnt Gulbrandsen, OK benno@

---
 libexec/spamd/spamd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libexec/spamd/spamd.c b/libexec/spamd/spamd.c
index f2f19b35136..1be4c4b5527 100644
--- a/libexec/spamd/spamd.c
+++ b/libexec/spamd/spamd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spamd.c,v 1.161 2023/09/05 16:01:58 jca Exp $	*/
+/*	$OpenBSD: spamd.c,v 1.162 2024/04/01 21:09:44 millert Exp $	*/
 
 /*
  * Copyright (c) 2015 Henning Brauer <henning@openbsd.org>
@@ -845,6 +845,8 @@ nextstate(struct con *cp)
 				    match(cp->ibuf, "EHLO")) {
 					snprintf(cp->obuf, cp->osize,
 					    "250-%s\r\n"
+					    "250-8BITMIME\r\n"
+					    "250-SMTPUTF8\r\n"
 					    "250 STARTTLS\r\n",
 					    hostname);
 					nextstate = 7;
-- 
2.20.1