From 77d0a2e14c39a0c95ff7d146c30bee3482ffebc3 Mon Sep 17 00:00:00 2001
From: Rob Swindell <rob@synchro.net>
Date: Fri, 6 Nov 2020 19:54:28 -0800
Subject: [PATCH] Fix sendmail bug introduced in 48fada5.

The "MAIL FROM" command argument must always be enclosed in angle-brackets. Some mail servers (e.g. gmail, aol) would reject messages not delivered in this manner, e.g.:
mx-aol.mail.gm0.yahoodns.net replied with:
"501 Syntax error in parameters or arguments tnmpmscs"
instead of the expected reply:
"250 ..."
gmail-smtp-in.l.google.com replied with:
"555 5.5.2 Syntax error. o6si11103060plk.317 - gsmtp"
instead of the expected reply:
"250 ..."
---
 src/sbbs3/mailsrvr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 85d164212e..c4e01ca6de 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -5620,9 +5620,9 @@ static void sendmail_thread(void* arg)
 				continue;
 			}
 			if(msg.from_net.type==NET_INTERNET && msg.reverse_path!=NULL)
-				SAFECOPY(fromaddr, msg.reverse_path);
+				angle_bracket(fromaddr, sizeof(fromaddr), msg.reverse_path);
 			else 
-				SAFEPRINTF(fromaddr, "<%s>", usermailaddr(&scfg, str, msg.from));
+				angle_bracket(fromaddr, sizeof(fromaddr), usermailaddr(&scfg, str, msg.from));
 
 			char sender_info[512];
 			if(msg.from_ext != NULL)
-- 
GitLab