X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_ssl_gnutls.c;h=40286294726f38a49f8ee587adf758224b3774b4;hp=932370cedbbf9f30012f6cfade4bc347cfe5e2f7;hb=4eaac5c4a87b84ea9ec0668b4e088ac27e2d1106;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258

diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index 932370c..4028629 100644
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -12,6 +12,8 @@
 # include "config.h"
 #endif
 
+#ifdef USE_GNUTLS
+
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #ifdef HAVE_GNUTLS_OPENSSL_H
@@ -65,7 +67,7 @@ static int tls_init (void)
   return 0;
 }
 
-int mutt_gnutls_socket_setup (CONNECTION * conn)
+int mutt_ssl_socket_setup (CONNECTION * conn)
 {
   if (tls_init () < 0)
     return -1;
@@ -131,7 +133,7 @@ static int tls_socket_open (CONNECTION * conn)
   return 0;
 }
 
-int mutt_gnutls_starttls (CONNECTION * conn)
+int mutt_ssl_starttls (CONNECTION * conn)
 {
   if (tls_init () < 0)
     return -1;
@@ -747,6 +749,7 @@ static int tls_check_certificate (CONNECTION * conn)
   menu->help = helpstr;
 
   done = 0;
+  set_option (OPTUNBUFFEREDINPUT);
   while (!done) {
     switch (mutt_menuLoop (menu)) {
     case -1:                   /* abort */
@@ -789,7 +792,10 @@ static int tls_check_certificate (CONNECTION * conn)
       break;
     }
   }
+  unset_option (OPTUNBUFFEREDINPUT);
   mutt_menuDestroy (&menu);
   gnutls_x509_crt_deinit (cert);
   return (done == 2);
 }
+
+#endif /* USE_GNUTLS */