Commit 1cc785b8 authored by rswindell's avatar rswindell
Browse files

*always* set the KILLSENT attribute flag on email/netmail received for relay...

*always* set the KILLSENT attribute flag on email/netmail received for relay via SMTP (regardless of the Internet/Fido netmail setting in SCFG).
The sender should already have a copy (e.g. in their outbox), if they want to keep it.
parent a84ae15a
......@@ -3811,7 +3811,6 @@ static void smtp_thread(void* arg)
i=savemsg(&scfg, &smb, &msg, &client, startup->host_name, msgbuf, /* remsg: */NULL);
if(smb_countattachments(&smb, &msg, msgbuf) > 0)
msg.hdr.auxattr |= MSG_MIMEATTACH;
if(scfg.inetmail_misc&NMAIL_KILL)
msg.hdr.netattr |= MSG_KILLSENT;
free(msgbuf);
if(i!=SMB_SUCCESS) {
......@@ -3879,9 +3878,7 @@ static void smtp_thread(void* arg)
smb_hfield_add_str(&newmsg, SMTPRECEIVED, hdrfield, /* insert: */TRUE);
if(nettype == NET_FIDO) {
newmsg.hdr.netattr |= MSG_LOCAL;
if(scfg.netmail_misc&NMAIL_KILL)
msg.hdr.netattr |= MSG_KILLSENT;
newmsg.hdr.netattr |= MSG_LOCAL | MSG_KILLSENT;
char* tp = strchr(rcpt_name, '@');
if(tp != NULL)
*tp = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment