X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send_smtp.c;h=532319527c463408a4b55d0b01980c54b5746426;hp=32f4ba0492ee948edc45011a55577ed484a45d9f;hb=8fac066483c9ae3176984527c037190fca9dc7f0;hpb=afb1dae68aefe935a16a27dbbc11df86d2e31613

diff --git a/send_smtp.c b/send_smtp.c
index 32f4ba0..5323195 100644
--- a/send_smtp.c
+++ b/send_smtp.c
@@ -13,7 +13,7 @@
 
 #include <lib-lib/lib-lib.h>
 
-#if defined(USE_SSL) || (defined(USE_GNUTLS) && defined(HAVE_GNUTLS_OPENSSL_H))
+#if defined(HAVE_GNUTLS_OPENSSL_H)
 #include <openssl/ssl.h>
 #endif
 
@@ -168,7 +168,7 @@ _send_smtp_messagefp_cb(void **buf, int *len, void *arg)
 }
 
 static int handle_invalid_peer_certificate (long vfy_result) {
-#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
+#if defined (HAVE_GNUTLS_OPENSSL_H)
   mutt_error (_("Error verifying certificate: %s"),
               NONULL (X509_verify_cert_error_string (vfy_result)));
 #else
@@ -275,7 +275,7 @@ static void do_dsn_ret (smtp_message_t message) {
     smtp_dsn_set_ret (message, Ret_FULL);
 }
 
-#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
+#ifdef USE_LIBESMTP
 int send_smtp_check_usetls (const char* option, unsigned long p,
                                 char* errbuf, ssize_t errlen) {
   char* val = (char*) p;
@@ -317,7 +317,7 @@ int send_smtp_invoke (address_t * from,       /* the sender */
   if ((session = smtp_create_session ()) == NULL)
     SMTPFAIL ("smtp_create_session");
 
-#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
+#ifdef HAVE_GNUTLS_OPENSSL_H
   if (SmtpUseTLS != NULL && ascii_strncasecmp("enabled", SmtpUseTLS, 7) == 0) {
     smtp_starttls_enable(session, Starttls_ENABLED);
   } else if (SmtpUseTLS != NULL && ascii_strncasecmp("required", SmtpUseTLS, 8) == 0) {
@@ -343,7 +343,7 @@ int send_smtp_invoke (address_t * from,       /* the sender */
       SMTPFAIL ("smtp_auth_set_context");
   }
 
-#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
+#ifdef HAVE_GNUTLS_OPENSSL_H
   smtp_starttls_set_ctx (session, NULL);
 #endif
   smtp_set_eventcb (session, event_cb, NULL);