From 41956f5306f0e24a9663441e4301ba1c5267cb4f Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 26 Nov 2003 11:18:37 +0000
Subject: [PATCH] Use the authenticated relay user's information in the client
 display rather than the mail sender's e-mail address.

---
 src/sbbs3/mailsrvr.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index ebcf53474d..b984567adc 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -2480,6 +2480,10 @@ static void smtp_thread(void* arg)
 				relay_user.number=0;
 				break;
 			}
+			/* Update client display */
+			client.user=relay_user.alias;
+			client_on(socket,&client,TRUE /* update */);
+
 			lprintf(LOG_INFO,"%04d SMTP %s authenticated using %s authentication"
 				,socket,relay_user.alias,auth_login ? "LOGIN" : "PLAIN");
 			sockprintf(socket,auth_ok);
@@ -2560,6 +2564,10 @@ static void smtp_thread(void* arg)
 				relay_user.number=0;
 				continue;
 			}
+			/* Update client display */
+			client.user=relay_user.alias;
+			client_on(socket,&client,TRUE /* update */);
+
 			lprintf(LOG_INFO,"%04d SMTP %s authenticated using CRAM-MD5 authentication"
 				,socket,relay_user.alias);
 			sockprintf(socket,auth_ok);
@@ -2624,8 +2632,10 @@ static void smtp_thread(void* arg)
 			SAFECOPY(reverse_path,p);
 
 			/* Update client display */
-			client.user=reverse_path;
-			client_on(socket,&client,TRUE /* update */);
+			if(relay_user.number==0) {
+				client.user=reverse_path;
+				client_on(socket,&client,TRUE /* update */);
+			}
 
 			/* Setup state */
 			state=SMTP_STATE_MAIL_FROM;
-- 
GitLab