#include <lib-lib/lib-lib.h>
#include <lib-ui/enter.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
-
+#include "mutt_libesmtp.h"
#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
#include <openssl/ssl.h>
static int
_mutt_libesmtp_auth_interact (auth_client_request_t request,
- char **result, int fields, void *arg)
+ char **result, int fields,
+ void *arg __attribute__ ((unused)))
{
int i;
char *p = strchr (*buf, '\0');
if (p[-1] == '\n' && p[-2] != '\r') {
- m_strcpy(p - 1, "\r\n");
+ m_strcpy(p - 1, (char *) *buf + BUFLEN - p + 1, "\r\n");
p++;
}
octets = p - (char *) *buf;
return 1; /* Accept the problem */
}
-static void event_cb (smtp_session_t session, int event_no, void *arg,...)
+static void event_cb (smtp_session_t session __attribute__ ((unused)),
+ int event_no, void *arg,...)
{
va_list alist;
int *ok;
SMTPFAIL ("smtp_add_message");
/* Initialize envelope sender */
- if (option (OPTENVFROM) && EnvFrom)
- envfrom = EnvFrom->mailbox;
+ if (MTransport.use_envelope_fromoption && MTransport.envelope_from_address)
+ envfrom = MTransport.envelope_from_address->mailbox;
if (!smtp_set_reverse_path (message, envfrom))
SMTPFAIL ("smtp_set_reverse_path");
do_dsn_ret (message);
/* set up 8bitmime flag */
- if (eightbit && option (OPTUSE8BITMIME))
+ if (eightbit && MTransport.use_8bitmime)
smtp_8bitmime_set_body (message, E8bitmime_8BITMIME);
if ((fp = fopen (msg, "r")) == NULL)