Only check whether GNUTLS error is fatal when an error occurs (closes #2954).

The API for GNUTLS changed to require this in 1.7.18.

diff --git a/ChangeLog b/ChangeLog
index f56e57c79562cd26072c78d09f03473f5b9dda91..73c621806721a3b70588e0a0a6a4ebdc6f888c70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-08 15:30 -0700  Brendan Cully  <brendan@kublai.com>  (1e4a6efddc81)
+
+       * prepare: autoreconf --include doesn't pass its argument to aclocal.
+       Let ACLOCAL_AMFLAGS in Makefile.am handle that.
+
+       * configure.ac: Attempt to clean up DB back-end selection
+
 2007-09-06 20:13 +0200  Rocco Rutte  <pdmef@gmx.net>  (648ad3832e82)
 
        * muttlib.c: Rewrite padding logic for mutt_FormatString()

diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index 92cae5401a2f6f208e97b4952ce252d3f4abeaeb..873498e8c92b0c08aa3faf6d2a3a5f2614c16b68 100644 (file)
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -99,7 +99,7 @@ static int tls_socket_read (CONNECTION* conn, char* buf, size_t len)
   }
 
   ret = gnutls_record_recv (data->state, buf, len);
-  if (gnutls_error_is_fatal(ret) == 1)
+  if (ret < 0 && gnutls_error_is_fatal(ret) == 1)
   {
     mutt_error ("tls_socket_read (%s)", gnutls_strerror (ret));
     mutt_sleep (4);
@@ -121,7 +121,7 @@ static int tls_socket_write (CONNECTION* conn, const char* buf, size_t len)
   }
 
   ret = gnutls_record_send (data->state, buf, len);
-  if (gnutls_error_is_fatal(ret) == 1)
+  if (ret < 0 && gnutls_error_is_fatal(ret) == 1)
   {
     mutt_error ("tls_socket_write (%s)", gnutls_strerror (ret));
     mutt_sleep (4);