projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
mutt_libesmtp.c
diff --git
a/mutt_libesmtp.c
b/mutt_libesmtp.c
index
7b3ada3
..
6263662
100644
(file)
--- a/
mutt_libesmtp.c
+++ b/
mutt_libesmtp.c
@@
-174,14
+174,16
@@
static const char *_mutt_libesmtp_messagefp_cb (void **buf, int *len,
return *buf;
}
return *buf;
}
-#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
static int handle_invalid_peer_certificate (long vfy_result) {
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)));
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 */
}
sleep(2);
return 1; /* Accept the problem */
}
-#endif
static void event_cb (smtp_session_t session, int event_no, void *arg,...)
{
static void event_cb (smtp_session_t session, int event_no, void *arg,...)
{
@@
-280,10
+282,17
@@
static void do_dsn_ret (smtp_message_t message) {
}
#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
}
#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 &&
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 (0);
+ }
return (1);
}
#endif
return (1);
}
#endif
@@
-349,8
+358,8
@@
int mutt_libesmtp_invoke (ADDRESS * from, /* the sender */
SMTPFAIL ("smtp_add_message");
/* Initialize envelope sender */
SMTPFAIL ("smtp_add_message");
/* Initialize envelope sender */
- if (
SmtpEnvFrom && *Smtp
EnvFrom)
- envfrom =
SmtpEnvFrom
;
+ if (
option (OPTENVFROM) &&
EnvFrom)
+ envfrom =
EnvFrom->mailbox
;
if (!smtp_set_reverse_path (message, envfrom))
SMTPFAIL ("smtp_set_reverse_path");
if (!smtp_set_reverse_path (message, envfrom))
SMTPFAIL ("smtp_set_reverse_path");
@@
-388,7
+397,7
@@
Done:
if (fp != NULL)
fclose (fp);
if (hostportstr != NULL)
if (fp != NULL)
fclose (fp);
if (hostportstr != NULL)
-
free (
hostportstr);
+
mem_free (&
hostportstr);
if (session != NULL)
smtp_destroy_session (session);
if (authctx != NULL)
if (session != NULL)
smtp_destroy_session (session);
if (authctx != NULL)