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,...)
{
}
#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
-int mutt_libesmtp_check_usetls (const char* val) {
+int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
+ char* errbuf, size_t errlen) {
+ char* val = (char*) p;
+ if (!val || !*val)
+ return (1);
if (str_ncmp (val, "enabled", 7) != 0 &&
- str_ncmp (val, "required", 8) != 0)
+ str_ncmp (val, "required", 8) != 0) {
+ if (errbuf)
+ snprintf (errbuf, errlen, _("'%s' is invalid for %s"), val, option);
return (0);
+ }
return (1);
}
#endif
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);
+ mem_free (&hostportstr);
if (session != NULL)
smtp_destroy_session (session);
if (authctx != NULL)