1 diff -urN mutt-1.4.1.org/configure.in mutt-1.4.1/configure.in
2 --- mutt-1.4.1.org/configure.in 2003-08-21 15:30:19.000000000 +0200
3 +++ mutt-1.4.1/configure.in 2003-08-21 15:31:08.962016232 +0200
5 AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have <langinfo.h> and nl_langinfo(YESEXPR). ])
10 +if test x$use_libesmtp = xyes; then
11 + CFLAGS="$CFLAGS $mutt_libesmtp_cflags"
12 + MUTTLIBS="$MUTTLIBS $mutt_libesmtp_libs"
13 + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_libesmtp.o -lpthread"
15 + AC_DEFINE(USE_LIBESMTP,
17 + [Define to enable the use of libesmtp])
19 +dnl -- end libesmtp --
21 AC_OUTPUT(Makefile intl/Makefile m4/Makefile
22 po/Makefile.in doc/Makefile contrib/Makefile
24 diff -urN mutt-1.4.1.org/globals.h mutt-1.4.1/globals.h
25 --- mutt-1.4.1.org/globals.h 2003-08-21 15:30:19.000000000 +0200
26 +++ mutt-1.4.1/globals.h 2003-08-21 15:31:08.964015928 +0200
28 WHERE char *Signature;
29 WHERE char *SigDirectory;
30 WHERE char *SimpleSearch;
31 +#if defined(USE_LIBESMTP)
32 +WHERE char *SmtpAuthUser;
33 +WHERE char *SmtpAuthPass;
34 +WHERE char *SmtpHost;
35 +WHERE unsigned short SmtpPort;
37 WHERE char *Spoolfile;
38 #if defined(USE_SSL) || defined(USE_NSS)
39 WHERE char *SslCertFile INITVAL (NULL);
40 diff -urN mutt-1.4.1.org/init.h mutt-1.4.1/init.h
41 --- mutt-1.4.1.org/init.h 2003-08-21 15:30:19.000000000 +0200
42 +++ mutt-1.4.1/init.h 2003-08-21 15:31:08.976014104 +0200
47 +# ifndef USE_LIBESMTP
48 +# define USE_LIBESMTP
52 struct option_t MuttVars[] = {
53 @@ -1468,6 +1471,38 @@
58 +#if defined(USE_LIBESMTP)
59 + { "smtp_auth_username", DT_STR, R_NONE, UL &SmtpAuthUser, 0 },
62 + ** Defines the username to use with SMTP AUTH. Setting this variable will
63 + ** cause mutt to attempt to use SMTP AUTH when sending.
65 + { "smtp_auth_password", DT_STR, R_NONE, UL &SmtpAuthPass, 0 },
68 + ** Defines the password to use with SMTP AUTH. If ``$$smtp_auth_username''
69 + ** is set, but this variable is not, you will be prompted for a password
72 + { "smtp_host", DT_STR, R_NONE, UL &SmtpHost, 0 },
75 + ** Defines the SMTP host which will be used to deliver mail, as opposed
76 + ** to invoking the sendmail binary. Setting this variable overrides the
77 + ** value of ``$$sendmail'', and any associated variables.
79 + { "smtp_port", DT_NUM, R_NONE, UL &SmtpPort, 25 },
82 + ** Defines the port that the SMTP host is listening on for mail delivery.
83 + ** Must be specified as a number.
85 + ** Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP
86 + ** servers will probably desire 587, the mail submission port.
90 #if defined(USE_SSL)||defined(USE_NSS)
92 diff -urN mutt-1.4.1.org/m4/libesmtp.m4 mutt-1.4.1/m4/libesmtp.m4
93 --- mutt-1.4.1.org/m4/libesmtp.m4 1970-01-01 01:00:00.000000000 +0100
94 +++ mutt-1.4.1/m4/libesmtp.m4 2003-08-21 15:31:08.978013800 +0200
98 +dnl Search for libesmtp, by Steven Engelhardt <sengelha@yahoo.com>
100 +dnl libesmtp often requires linking against -lpthread or -lc_r (BSD).
101 +dnl This macro attempts to centralize this code.
103 +AC_DEFUN([MUTT_AM_LIBESMTP],
107 + [ --with-libesmtp=DIR Compile in support for libesmtp for the MTA],
108 + [ if test "$with_libesmtp" != "no"
110 + mutt_libesmtp_check_path="$PATH"
112 + if test "$with_libesmtp" != "yes"
114 + mutt_libesmtp_check_path="$tmp_path:$withval/bin"
117 + dnl 1. Find libesmtp-config
118 + mutt_libesmtp_config_path=`which libesmtp-config || echo no`
120 + if test "$mutt_libesmtp_config_path" = "no"
122 + AC_MSG_ERROR([libesmtp-config binary not found.])
125 + dnl 2. Get CFLAGS and LIBS from libesmtp-config
126 + mutt_libesmtp_cflags=`$mutt_libesmtp_config_path --cflags`
127 + mutt_libesmtp_libs=`$mutt_libesmtp_config_path --libs`
129 + dnl 3. Verify libesmtp.h can be found with these settings
130 + temp_CFLAGS="$CFLAGS"
131 + CFLAGS="$CFLAGS $mutt_libesmtp_cflags"
132 + AC_CHECK_HEADER([libesmtp.h],
134 + AC_MSG_ERROR([Could not find libesmtp.h]))
135 + CFLAGS="$temp_CFLAGS"
137 + dnl 4. Verify the libesmtp library can be linked in
138 + temp_CFLAGS="$CFLAGS"
140 + CFLAGS="$CFLAGS $mutt_libesmtp_cflags"
141 + LIBS="$LIBS $mutt_libesmtp_libs"
142 + AC_CHECK_LIB([esmtp],
143 + [smtp_create_session],
145 + AC_MSG_ERROR([Could not find libesmtp]))
146 + CFLAGS="$temp_CFLAGS"
149 + dnl 5. Export use_libesmtp variable so configure.in can
150 + dnl act accordingly.
156 diff -urN mutt-1.4.1.org/main.c mutt-1.4.1/main.c
157 --- mutt-1.4.1.org/main.c 2003-08-21 15:30:19.000000000 +0200
158 +++ mutt-1.4.1/main.c 2003-08-21 15:31:08.982013192 +0200
172 diff -urN mutt-1.4.1.org/Makefile.am mutt-1.4.1/Makefile.am
173 --- mutt-1.4.1.org/Makefile.am 2003-08-21 15:30:18.000000000 +0200
174 +++ mutt-1.4.1/Makefile.am 2003-08-21 15:31:08.984012888 +0200
176 EXTRA_mutt_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
177 mutt_tunnel.c pop.c pop_auth.c pop_lib.c pgp.c pgpinvoke.c pgpkey.c \
178 pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
179 - browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c pgppacket.c
180 + browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c pgppacket.c \
183 EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP TODO configure acconfig.h account.h \
184 attach.h buffy.h charset.h compress.h copy.h dotlock.h functions.h \
186 mbyte.h lib.h extlib.c pgpewrap.c pgplib.h Muttrc.head Muttrc \
187 makedoc.c stamp-doc-rc README.SSL \
188 muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
190 + snprintf.c regex.c mutt_libesmtp.h
192 mutt_dotlock_SOURCES = mutt_dotlock.c
193 mutt_dotlock_LDADD = @LIBOBJS@
194 diff -urN mutt-1.4.1.org/mutt_libesmtp.c mutt-1.4.1/mutt_libesmtp.c
195 --- mutt-1.4.1.org/mutt_libesmtp.c 1970-01-01 01:00:00.000000000 +0100
196 +++ mutt-1.4.1/mutt_libesmtp.c 2003-08-21 15:31:08.987012432 +0200
199 +#include <auth-client.h>
200 +#include <libesmtp.h>
203 +static char authpass[STRING] = "";
210 +#define MSGFAIL(msg) \
212 + mutt_error("%s", msg); \
215 +#define LIBCFAIL(msg) \
217 + mutt_error("%s: %s", msg, strerror(errno)); \
220 +#define SMTPFAIL(msg) \
222 + _mutt_libesmtp_perror(msg); \
227 + * _mutt_libesmtp_ensure_init
228 + * Make sure the libESMTP support in mutt is initialized at some time.
231 +_mutt_libesmtp_ensure_init()
233 + static int libesmtp_init = 0;
235 + if (!libesmtp_init) {
237 + auth_client_init();
243 + * _mutt_libesmtp_perror
244 + * Prints 'msg', a colon, and then a string representation of the
245 + * libesmtp errno as a mutt error.
248 +_mutt_libesmtp_perror(const char* msg)
252 + mutt_error("%s: %s", msg, smtp_strerror(smtp_errno(), buf, sizeof(buf)));
256 + * _mutt_libesmtp_add_recipients
257 + * Adds every address in 'addr' as a recipient to the smtp message
258 + * 'message'. Note that this does not mean that they will necessarily
259 + * show up in the mail headers (e.g., when bcc'ing). Returns 0 upon
260 + * success, -1 upon failure (and prints an error message).
262 + * Very similar to sendlib.c::add_args
265 +_mutt_libesmtp_add_recipients(smtp_message_t message, ADDRESS *addr)
269 + for (; addr; addr = addr->next) {
270 + /* weed out group mailboxes, since those are for display only */
271 + if (addr->mailbox && !addr->group) {
272 + if (!smtp_add_recipient(message, addr->mailbox))
273 + SMTPFAIL("smtp_add_recipient");
282 +_mutt_libesmtp_auth_interact(auth_client_request_t request,
283 + char **result, int fields, void *arg)
287 + for (i = 0; i < fields; i++) {
288 + if (request[i].flags & AUTH_USER) {
289 + result[i] = SmtpAuthUser;
290 + } else if (request[i].flags & AUTH_PASS) {
291 + if (SmtpAuthPass) {
292 + result[i] = SmtpAuthPass;
294 + if (authpass[0] == '\0') {
295 + char prompt[STRING];
297 + snprintf(prompt, sizeof(prompt), "%s%s: ", request[i].prompt,
298 + (request[i].flags & AUTH_CLEARTEXT) ? " (not encrypted)" : "");
299 + mutt_get_password(prompt, authpass, sizeof(authpass));
301 + result[i] = authpass;
312 +_mutt_libesmtp_messagefp_cb(void **buf, int *len, void *arg)
317 + *buf = malloc(BUFLEN);
320 + rewind((FILE*) arg);
324 + if (fgets(*buf, BUFLEN - 2, (FILE*) arg) == NULL) {
327 + char* p = strchr(*buf, '\0');
329 + if (p[-1] == '\n' && p[-2] != '\r') {
330 + strcpy(p - 1, "\r\n");
333 + octets = p - (char*) *buf;
341 + * mutt_invoke_libesmtp
342 + * Sends a mail message to the provided recipients using libesmtp.
343 + * Returns 0 upon success, -1 upon failure (and prints an error
347 +mutt_invoke_libesmtp(ADDRESS *from, /* the sender */
348 + ADDRESS *to, ADDRESS *cc, ADDRESS *bcc, /* recips */
349 + const char *msg, /* file containing message */
350 + int eightbit) /* message contains 8bit chars */
352 + int ret = 0; /* return value, default = success */
353 + smtp_session_t session;
354 + smtp_message_t message;
355 + char* hostportstr = NULL;
356 + size_t hostportlen;
358 + auth_context_t authctx = NULL;
359 + const smtp_status_t* status;
361 + _mutt_libesmtp_ensure_init();
363 + if ((session = smtp_create_session()) == NULL)
364 + SMTPFAIL("smtp_create_session");
365 + if ((message = smtp_add_message(session)) == NULL)
366 + SMTPFAIL("smtp_add_message");
368 + /* Create hostname:port string and tell libesmtp */
369 + /* len = SmtpHost len + colon + max port (65536 => 5 chars) + terminator */
370 + hostportlen = strlen(SmtpHost) + 7;
371 + hostportstr = safe_malloc(hostportlen);
372 + snprintf(hostportstr, hostportlen, "%s:%d", SmtpHost, SmtpPort);
373 + if (!smtp_set_server(session, hostportstr))
374 + SMTPFAIL("smtp_set_server");
376 + if (SmtpAuthUser) {
377 + if ((authctx = auth_create_context()) == NULL)
378 + MSGFAIL("auth_create_context failed");
379 + auth_set_mechanism_flags(authctx, AUTH_PLUGIN_PLAIN, 0);
380 + auth_set_interact_cb(authctx, _mutt_libesmtp_auth_interact, NULL);
382 + if (!smtp_auth_set_context(session, authctx))
383 + SMTPFAIL("smtp_auth_set_context");
386 + if ((fp = fopen(msg, "r")) == NULL)
388 + if (!smtp_set_messagecb(message, _mutt_libesmtp_messagefp_cb, fp))
389 + SMTPFAIL("smtp_set_messagecb");
390 + if (_mutt_libesmtp_add_recipients(message, to))
392 + if (_mutt_libesmtp_add_recipients(message, cc))
394 + if (_mutt_libesmtp_add_recipients(message, bcc))
396 + if (!smtp_start_session(session))
397 + SMTPFAIL("smtp_start_session");
399 + status = smtp_message_transfer_status(message);
400 + if (status->code < 200 || status->code > 299) {
402 + snprintf(buf, sizeof(buf), "SMTP error while sending: %d %s", status->code, status->text);
409 + if (hostportstr != NULL)
411 + if (session != NULL)
412 + smtp_destroy_session(session);
413 + if (authctx != NULL)
414 + auth_destroy_context(authctx);
416 + /* Forget user-entered SMTP AUTH password if send fails */
418 + authpass[0] = '\0';
422 diff -urN mutt-1.4.1.org/mutt_libesmtp.h mutt-1.4.1/mutt_libesmtp.h
423 --- mutt-1.4.1.org/mutt_libesmtp.h 1970-01-01 01:00:00.000000000 +0100
424 +++ mutt-1.4.1/mutt_libesmtp.h 2003-08-21 15:31:08.988012280 +0200
426 +#if !defined(LIBESMTP_H)
430 +mutt_invoke_libesmtp (ADDRESS *from, /* the sender */
431 + ADDRESS *to, ADDRESS *cc, ADDRESS *bcc, /* recips */
432 + const char *msg, /* file containing message */
433 + int eightbit); /* message contains 8bit chars */
435 +#endif /* !defined(LIBESMTP_H) */
436 diff -urN mutt-1.4.1.org/Muttrc.esmtp mutt-1.4.1/Muttrc.esmtp
437 --- mutt-1.4.1.org/Muttrc.esmtp 1970-01-01 01:00:00.000000000 +0100
438 +++ mutt-1.4.1/Muttrc.esmtp 2003-08-21 14:57:35.000000000 +0200
440 +# enable minimalistic smtp support builtin to Mutt
441 +set sendmail = "builtin"
443 +# The name or address of your SMTP server.
444 +set smtp_serv = "fastmail.fm"
446 +# Your login name on the SMTP server. Mutt presents you
447 +# as ``smtp_user''@``smtp_host'', unless ``envelope_from''
448 +# is set, this will then be the message's envelope sender.
449 +# Defaults to your login name on the local system.
450 +set smtp_user = "ulferikson"
452 +# If set, Mutt will try to use ESMPT and ``AUTH LOGIN'' to
453 +# authenticate your user.
456 +# This variable specifies which port your SMTP server is
460 diff -urN mutt-1.4.1.org/protos.h mutt-1.4.1/protos.h
461 --- mutt-1.4.1.org/protos.h 2003-08-21 15:30:19.000000000 +0200
462 +++ mutt-1.4.1/protos.h 2003-08-21 15:31:08.991011824 +0200
464 int mutt_get_postponed (CONTEXT *, HEADER *, HEADER **, char *, size_t);
465 int mutt_get_tmp_attachment (BODY *);
466 int mutt_index_menu (void);
467 -int mutt_invoke_sendmail (ADDRESS *, ADDRESS *, ADDRESS *, ADDRESS *, const char *, int);
468 +int mutt_invoke_mta (ADDRESS *, ADDRESS *, ADDRESS *, ADDRESS *, const char *, int);
469 int mutt_is_autoview (BODY *, const char *);
470 int mutt_is_mail_list (ADDRESS *);
471 int mutt_is_message_type(int, const char *);
472 diff -urN mutt-1.4.1.org/send.c mutt-1.4.1/send.c
473 --- mutt-1.4.1.org/send.c 2002-01-30 23:50:59.000000000 +0100
474 +++ mutt-1.4.1/send.c 2003-08-21 15:31:08.996011064 +0200
476 return mix_send_message (msg->chain, tempfile);
479 - i = mutt_invoke_sendmail (msg->env->from, msg->env->to, msg->env->cc,
480 + i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc,
481 msg->env->bcc, tempfile, (msg->content->encoding == ENC8BIT));
484 diff -urN mutt-1.4.1.org/sendlib.c mutt-1.4.1/sendlib.c
485 --- mutt-1.4.1.org/sendlib.c 2003-08-21 15:30:19.000000000 +0200
486 +++ mutt-1.4.1/sendlib.c 2003-08-21 15:31:09.003010000 +0200
488 #endif /* HAVE_PGP */
492 +# include "mutt_libesmtp.h"
493 +#endif /* USE_LIBESMTP */
495 #define DISPOSITION(X) X==DISPATTACH?"attachment":"inline"
497 @@ -1970,7 +1973,7 @@
503 mutt_invoke_sendmail (ADDRESS *from, /* the sender */
504 ADDRESS *to, ADDRESS *cc, ADDRESS *bcc, /* recips */
505 const char *msg, /* file containing message */
506 @@ -2066,6 +2069,20 @@
511 +mutt_invoke_mta (ADDRESS *from, /* the sender */
512 + ADDRESS *to, ADDRESS *cc, ADDRESS *bcc, /* recips */
513 + const char *msg, /* file containing message */
514 + int eightbit) /* message contains 8bit chars */
518 + return mutt_invoke_libesmtp(from, to, cc, bcc, msg, eightbit);
521 + return mutt_invoke_sendmail(from, to, cc, bcc, msg, eightbit);
524 /* appends string 'b' to string 'a', and returns the pointer to the new
526 char *mutt_append_string (char *a, const char *b)
527 @@ -2219,8 +2236,8 @@
528 mutt_copy_bytes (fp, f, h->content->length);
531 - mutt_invoke_sendmail (env_from, to, NULL, NULL, tempfile,
532 - h->content->encoding == ENC8BIT);
533 + mutt_invoke_mta (env_from, to, NULL, NULL, tempfile,
534 + h->content->encoding == ENC8BIT);