int flags = Notify_NOTSET;
smtp_recipient_t self = NULL;
- if (m_strisempty(DsnNotify) || !message || m_strisempty(from) ||
- strstr (DsnNotify, "never") != NULL)
+ if (m_strisempty(MTransport.dsn_notify) || !message || m_strisempty(from) ||
+ strstr (MTransport.dsn_notify, "never") != NULL)
return;
- if (strstr (DsnNotify, "failure") != NULL)
+ if (strstr (MTransport.dsn_notify, "failure") != NULL)
flags |= Notify_FAILURE;
- if (strstr (DsnNotify, "delay") != NULL)
+ if (strstr (MTransport.dsn_notify, "delay") != NULL)
flags |= Notify_DELAY;
- if (strstr (DsnNotify, "success") != NULL)
+ if (strstr (MTransport.dsn_notify, "success") != NULL)
flags |= Notify_SUCCESS;
if (flags != Notify_NOTSET) {
}
static void do_dsn_ret (smtp_message_t message) {
- if (m_strisempty(DsnReturn) || !message)
+ if (m_strisempty(MTransport.dsn_return) || !message)
return;
- if (ascii_strncasecmp (DsnReturn, "hdrs", 4) == 0)
+ if (ascii_strncasecmp (MTransport.dsn_return, "hdrs", 4) == 0)
smtp_dsn_set_ret (message, Ret_HDRS);
- else if (ascii_strncasecmp (DsnReturn, "full", 4) == 0)
+ else if (ascii_strncasecmp (MTransport.dsn_return, "full", 4) == 0)
smtp_dsn_set_ret (message, Ret_FULL);
}
#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
char* val = (char*) p;
if (m_strisempty(val))
return (1);
SMTPFAIL ("smtp_add_message");
/* Initialize envelope sender */
- if (MTransport.use_envelope_fromoption && MTransport.envelope_from_address)
+ if (MTransport.use_envelope_from && MTransport.envelope_from_address)
envfrom = MTransport.envelope_from_address->mailbox;
if (!smtp_set_reverse_path (message, envfrom))
SMTPFAIL ("smtp_set_reverse_path");