Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit c1c78bb4 authored by rswindell's avatar rswindell
Browse files

Don't store the original RCPT TO argument (forward-path) when the message

is being forwarded to an external email address. Introduced in rev 1.690,
user-forwarded emails wouldn't work because sending envelope would contain
the original forward-path. Thanks again to Alterego (ALTERANT) for testing
this stuff and reporting issues with detail!
parent efa403e9
...@@ -4834,7 +4834,6 @@ static void smtp_thread(void* arg) ...@@ -4834,7 +4834,6 @@ static void smtp_thread(void* arg)
fprintf(rcptlst,"[%u]\n",rcpt_count++); fprintf(rcptlst,"[%u]\n",rcpt_count++);
fprintf(rcptlst,"%s=%s\n",smb_hfieldtype(RECIPIENT),rcpt_addr); fprintf(rcptlst,"%s=%s\n",smb_hfieldtype(RECIPIENT),rcpt_addr);
fprintf(rcptlst,"%s=%u\n",smb_hfieldtype(RECIPIENTEXT),user.number); fprintf(rcptlst,"%s=%u\n",smb_hfieldtype(RECIPIENTEXT),user.number);
fprintf(rcptlst,"%s=%s\n",smb_hfieldtype(SMTPFORWARDPATH),rcpt_to);
/* Forward to Internet */ /* Forward to Internet */
tp=strrchr(user.netmail,'@'); tp=strrchr(user.netmail,'@');
...@@ -4855,6 +4854,7 @@ static void smtp_thread(void* arg) ...@@ -4855,6 +4854,7 @@ static void smtp_thread(void* arg)
fprintf(rcptlst,"%s=%u\n",smb_hfieldtype(RECIPIENTNETTYPE),NET_QWK); fprintf(rcptlst,"%s=%u\n",smb_hfieldtype(RECIPIENTNETTYPE),NET_QWK);
fprintf(rcptlst,"%s=%s\n",smb_hfieldtype(RECIPIENTNETADDR),user.alias); fprintf(rcptlst,"%s=%s\n",smb_hfieldtype(RECIPIENTNETADDR),user.alias);
} }
fprintf(rcptlst,"%s=%s\n",smb_hfieldtype(SMTPFORWARDPATH),rcpt_to);
sockprintf(socket,client.protocol,session,ok_rsp); sockprintf(socket,client.protocol,session,ok_rsp);
} }
state=SMTP_STATE_RCPT_TO; state=SMTP_STATE_RCPT_TO;
......
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