[Emacs-diffs] master e0e2f36: Fatal GnuTLS errors are now silent by default

[Lars Ingebrigtsen]

branch: master
commit e0e2f363e86f8581191640324296fdebd2520d7c
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>

    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.
---
 etc/NEWS      |    4 ++++
 src/ChangeLog |    2 ++
 src/gnutls.c  |    2 +-
 3 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 2cd41df..56036f8 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 64d8052..314c653 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 9ddc8e1..16f2f6c 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
     {