On 1999-12-10 10:28:07 +0100, Thomas Roessler wrote:
> It would be fairly easy to bloat up mutt_invoke_sendmail (in
> sendlib.c) a bit - depending on a suitable option (say,
> set_envelope_from), mutt could just pass "-f<address>" to sendmail.
> Note that at least sendmail and the sendmail emulation of postfix
> can handle this.
diff -u .bak/init.h ./init.h
--- .bak/init.h Fri Dec 10 11:14:22 1999
+++ ./init.h Fri Dec 10 11:31:01 1999
@@ -410,6 +410,16 @@
** Useful to avoid the tampering certain mail delivery and transport
** agents tend to do with messages.
*/
+ { "envelope_from", DT_BOOL, R_NONE, OPTENVFROM, 0 },
+ /*
+ ** .pp
+ ** When \fIset\fP, mutt will try to derive the message's \fIenvelope\fP
+ ** sender from the "From:" header. Note that this information is passed
+ ** to sendmail command using the "-f" command line switch, so don't set this
+ ** option if you are using that switch in $$sendmail yourself,
+ ** or if the sendmail on your machine doesn't support that command
+ ** line switch.
+ */
{ "escape", DT_STR, R_NONE, UL &EscChar, UL "~" },
/*
** .pp
diff -u .bak/mutt.h ./mutt.h
--- .bak/mutt.h Fri Dec 10 11:14:24 1999
+++ ./mutt.h Fri Dec 10 11:23:51 1999
@@ -284,6 +284,7 @@
OPTDELETEUNTAG,
OPTEDITHDRS,
OPTENCODEFROM,
+ OPTENVFROM,
OPTFASTREPLY,
OPTFCCATTACH,
OPTFCCCLEAR,
diff -u .bak/protos.h ./protos.h
--- .bak/protos.h Fri Dec 10 11:14:25 1999
+++ ./protos.h Fri Dec 10 11:16:04 1999
@@ -241,7 +241,7 @@
int mutt_get_postponed (CONTEXT *, HEADER *, HEADER **, char *, size_t);
int mutt_get_tmp_attachment (BODY *);
int mutt_index_menu (void);
-int mutt_invoke_sendmail (ADDRESS *, ADDRESS *, ADDRESS *, const char *, int);
+int mutt_invoke_sendmail (ADDRESS *, ADDRESS *, ADDRESS *, ADDRESS *, const char *,
+int);
int mutt_is_autoview (BODY *, const char *);
int mutt_is_mail_list (ADDRESS *);
int mutt_is_message_type(int, const char *);
diff -u .bak/send.c ./send.c
--- .bak/send.c Fri Dec 10 11:14:27 1999
+++ ./send.c Fri Dec 10 11:15:17 1999
@@ -898,8 +898,8 @@
return mix_send_message (msg->chain, tempfile);
#endif
- i = mutt_invoke_sendmail (msg->env->to, msg->env->cc, msg->env->bcc,
- tempfile, (msg->content->encoding == ENC8BIT));
+ i = mutt_invoke_sendmail (msg->env->from, msg->env->to, msg->env->cc,
+ msg->env->bcc, tempfile, (msg->content->encoding ==
+ENC8BIT));
return (i);
}
diff -u .bak/sendlib.c ./sendlib.c
--- .bak/sendlib.c Fri Dec 10 11:14:28 1999
+++ ./sendlib.c Fri Dec 10 11:20:28 1999
@@ -1629,7 +1629,8 @@
int
-mutt_invoke_sendmail (ADDRESS *to, ADDRESS *cc, ADDRESS *bcc, /* recips */
+mutt_invoke_sendmail (ADDRESS *from, /* the sender */
+ ADDRESS *to, ADDRESS *cc, ADDRESS *bcc, /* recips */
const char *msg, /* file containing message */
int eightbit) /* message contains 8bit chars */
{
@@ -1660,8 +1661,15 @@
ps = NULL;
i++;
}
+
if (eightbit && option (OPTUSE8BITMIME))
args = add_option (args, &argslen, &argsmax, "-B8BITMIME");
+
+ if (option (OPTENVFROM) && from && !from->next)
+ {
+ args = add_option (args, &argslen, &argsmax, "-f");
+ args = add_args (args, &argslen, &argsmax, from);
+ }
if (DsnNotify)
{
args = add_option (args, &argslen, &argsmax, "-N");
@@ -1850,7 +1858,8 @@
mutt_copy_bytes (fp, f, h->content->length);
fclose (f);
- mutt_invoke_sendmail (to, NULL, NULL, tempfile, h->content->encoding == ENC8BIT);
+ mutt_invoke_sendmail (NULL, to, NULL, NULL, tempfile,
+ h->content->encoding == ENC8BIT);
}
if (msg)
