#include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
#include <openssl/ssl.h>
* Very similar to sendlib.c::add_args
*/
static int
-_mutt_libesmtp_add_recipients (smtp_message_t message, ADDRESS * addr)
+_mutt_libesmtp_add_recipients (smtp_message_t message, address_t * addr)
{
int ret = 0;
return *buf;
}
-#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
static int handle_invalid_peer_certificate (long vfy_result) {
+#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
mutt_error (_("Error verifying certificate: %s"),
NONULL (X509_verify_cert_error_string (vfy_result)));
+#else
+ mutt_error (_("Error verifying certificate. Error Code: %lu"), vfy_result);
+#endif
sleep(2);
return 1; /* Accept the problem */
}
-#endif
static void event_cb (smtp_session_t session, int event_no, void *arg,...)
{
char* val = (char*) p;
if (!val || !*val)
return (1);
- if (str_ncmp (val, "enabled", 7) != 0 &&
- str_ncmp (val, "required", 8) != 0) {
+ if (m_strncmp(val, "enabled", 7) != 0 &&
+ m_strncmp(val, "required", 8) != 0) {
if (errbuf)
snprintf (errbuf, errlen, _("'%s' is invalid for %s"), val, option);
return (0);
* Returns 0 upon success, -1 upon failure (and prints an error
* message).
*/
-int mutt_libesmtp_invoke (ADDRESS * from, /* the sender */
- ADDRESS * to, ADDRESS * cc, ADDRESS * bcc, /* recips */
+int mutt_libesmtp_invoke (address_t * from, /* the sender */
+ address_t * to, address_t * cc, address_t * bcc, /* recips */
const char *msg, /* file containing message */
int eightbit)
{ /* message contains 8bit chars */
/* Create hostname:port string and tell libesmtp */
/* len = SmtpHost len + colon + max port (65536 => 5 chars) + terminator */
- hostportlen = str_len (SmtpHost) + 7;
- hostportstr = mem_malloc (hostportlen);
+ hostportlen = m_strlen(SmtpHost) + 7;
+ hostportstr = p_new(char, hostportlen);
snprintf (hostportstr, hostportlen, "%s:%d", SmtpHost, SmtpPort);
if (!smtp_set_server (session, hostportstr))
SMTPFAIL ("smtp_set_server");
SMTPFAIL ("smtp_add_message");
/* Initialize envelope sender */
- if (SmtpEnvFrom && *SmtpEnvFrom)
- envfrom = SmtpEnvFrom;
+ if (option (OPTENVFROM) && EnvFrom)
+ envfrom = EnvFrom->mailbox;
if (!smtp_set_reverse_path (message, envfrom))
SMTPFAIL ("smtp_set_reverse_path");
if (fp != NULL)
fclose (fp);
if (hostportstr != NULL)
- free (hostportstr);
+ p_delete(&hostportstr);
if (session != NULL)
smtp_destroy_session (session);
if (authctx != NULL)