From 43f3348d77f31df4d9c324c6a51265acecfd1ff5 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sat, 30 Aug 2003 07:13:53 +0000
Subject: [PATCH] Use user!qwkid@hostname addresses for QWK netmail over SMTP.
---
src/sbbs3/mailsrvr.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 4e08ed464e..aa7b621f63 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -475,7 +475,7 @@ static ulong sockmsgtxt(SOCKET socket, smbmsg_t* msg, char* msgtxt, ulong maxlin
if(msg->from_net.type==NET_INTERNET && msg->from_net.addr!=NULL)
SAFECOPY(fromaddr,(char*)msg->from_net.addr);
else if(msg->from_net.type==NET_QWK && msg->from_net.addr!=NULL)
- sprintf(fromaddr,"\"%s@%s\"@%s"
+ sprintf(fromaddr,"%s!%s@%s"
,msg->from,(char*)msg->from_net.addr,scfg.sys_inetaddr);
else
usermailaddr(&scfg,fromaddr,msg->from);
@@ -2600,7 +2600,9 @@ static void smtp_thread(void* arg)
usernum=0; /* unknown user at this point */
- tp=strrchr(p,'@'); /* Double-@? Routed QWKnet mail? */
+ tp=strrchr(p,'@'); /* Double-@? Routed QWKnet mail? */
+ if(tp==NULL)
+ tp=strrchr(p,'!'); /* Or user!node@host format */
if(tp!=NULL) {
*tp=0;
SAFECOPY(rcpt_addr,p);
--
GitLab