diff options
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/providers/sendmail/camel-sendmail-transport.c | 21 |
2 files changed, 17 insertions, 10 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 31bf3b213c..8020ffea6e 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2001-03-13 Dan Winship <danw@ximian.com> + + * providers/sendmail/camel-sendmail-transport.c (sendmail_send_to, + sendmail_send): More fixing for exim: It can't deal with "-tif", + you need to say "-t -i -f". + 2001-03-12 Jeffrey Stedfast <fejj@ximian.com> * camel-store.c (init_trash): Rename the folder to "Trash" and diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c index 577dcc4610..71595ca218 100644 --- a/camel/providers/sendmail/camel-sendmail-transport.c +++ b/camel/providers/sendmail/camel-sendmail-transport.c @@ -209,15 +209,16 @@ sendmail_send_to (CamelTransport *transport, CamelMedium *message, return FALSE; len = g_list_length (recipients); - argv = g_malloc ((len + 5) * sizeof (char *)); + argv = g_malloc ((len + 6) * sizeof (char *)); argv[0] = "sendmail"; - argv[1] = "-if"; - argv[2] = from; - argv[3] = "--"; + argv[1] = "-i"; + argv[2] = "-f"; + argv[3] = from; + argv[4] = "--"; for (i = 1, r = recipients; i <= len; i++, r = r->next) - argv[i + 3] = r->data; - argv[i + 3] = NULL; + argv[i + 4] = r->data; + argv[i + 4] = NULL; status = sendmail_send_internal (message, argv, ex); g_free (argv); @@ -228,10 +229,10 @@ static gboolean sendmail_send (CamelTransport *transport, CamelMedium *message, CamelException *ex) { - const char *argv[4] = { "sendmail", "-tif", NULL, NULL }; - - argv[2] = get_from (message, ex); - if (!argv[2]) + const char *argv[6] = { "sendmail", "-t", "-i", "-f", NULL, NULL }; + + argv[4] = get_from (message, ex); + if (!argv[4]) return FALSE; return sendmail_send_internal (message, argv, ex); |