X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=50a6f867882803ad240045e97141151ec11b9356;hp=7b3ada3b1da89cd622cbec5b31b395a74717b9d1;hb=4f61fa445bff564984acf29fc91858af0ed2725e;hpb=07449b789713bd8716a02214f536dfd72f3549b1

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 7b3ada3..50a6f86 100644
--- 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;
 }
 
-#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,...)
 { 
@@ -280,10 +282,17 @@ static void do_dsn_ret (smtp_message_t message) {
 }
 
 #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