From 38240f1a0177b513d006f4f66d866f65fa6d8223 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Fri, 26 Jul 2002 22:16:23 +0000
Subject: [PATCH] Undeliverable messages from local user #0 can't be bounced
(e.g. smbutil).
---
src/sbbs3/mailsrvr.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 6d8ed582d7..717983a83a 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -2328,8 +2328,6 @@ BOOL bounce(smb_t* smb, smbmsg_t* msg, char* err, BOOL immediate)
smb_unlockmsghdr(smb,msg);
return(TRUE);
}
-
- lprintf("0000 !Bouncing message back to %s", msg->from);
newmsg=*msg;
/* Mark original message as deleted */
@@ -2345,6 +2343,13 @@ BOOL bounce(smb_t* smb, smbmsg_t* msg, char* err, BOOL immediate)
delfattach(&scfg,msg);
smb_unlockmsghdr(smb,msg);
+ if(!msg->idx.from && !msg->from_net.type) {
+ lprintf("0000 !Deleted undeliverable local message from %s", msg->from);
+ return(TRUE);
+ }
+
+ lprintf("0000 !Bouncing message back to %s", msg->from);
+
newmsg.hfield=NULL;
newmsg.hfield_dat=NULL;
newmsg.total_hfields=0;
--
GitLab