From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 8 Dec 2014 19:57:40 +0000 (+0100)
Subject: Fatal GnuTLS errors are now silent by default
X-Git-Tag: emacs-25.0.90~2635^2~153
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e0e2f363e86f8581191640324296fdebd2520d7c;p=emacs.git

Fatal GnuTLS errors are now silent by default

Fixes: debbugs:16253

(emacs_gnutls_handle_error): Fatal errors should be on level 1, so
that they are not messaged by default.
---

diff --git a/etc/NEWS b/etc/NEWS
index 2cd41dfc564..56036f8e533 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -310,6 +310,10 @@ plain text parts, if display of HTML email is possible; customize the
 ** In sh-mode, you can now use `sh-shell' as a file-local variable to
 specify the type of shell in use (bash, csh, etc).
 
+** TLS
+---
+*** Fatal TLS errors are now silent by default.
+
 ** URL
 
 *** The URL package accepts now the protocols "ssh", "scp" and "rsync".
diff --git a/src/ChangeLog b/src/ChangeLog
index 64d8052014f..314c653326b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,8 @@
 	the connection.
 	(gnutls_certificate_details): Put :signature-algorithm back again,
 	which was removed by mistake.
+	(emacs_gnutls_handle_error): Fatal errors should be on level 1, so
+	that they are not messaged by default (bug#16253).
 
 	* gnutls.c: Add Windows specs for gnutls_dh_get_prime_bits.
 
diff --git a/src/gnutls.c b/src/gnutls.c
index 9ddc8e1e201..16f2f6c8f96 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -571,7 +571,7 @@ emacs_gnutls_handle_error (gnutls_session_t session, int err)
   if (fn_gnutls_error_is_fatal (err))
     {
       ret = 0;
-      GNUTLS_LOG2 (0, max_log_level, "fatal error:", str);
+      GNUTLS_LOG2 (1, max_log_level, "fatal error:", str);
     }
   else
     {