Rocco Rutte:

- for libESMTP built with SSL but muttng _not_ build with it, do build fix by displaying SSL error code instead of nothing/error message

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@471 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/VERSION.svn b/VERSION.svn
index 5f476b6..c305aa5 100644 (file)
--- a/VERSION.svn
+++ b/VERSION.svn
@@ -1 +1 @@
-470
+471

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index a7f65ce..50a6f86 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,...)
 {