aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2014-12-08 20:57:40 +0100
committerLars Magne Ingebrigtsen2014-12-08 20:57:49 +0100
commite0e2f363e86f8581191640324296fdebd2520d7c (patch)
treeb704784901d70a909c0c42470a9a9ac630f37927 /src
parent28057ef3b598529cb15afcee57ef16ef6aa3bf2f (diff)
downloademacs-e0e2f363e86f8581191640324296fdebd2520d7c.tar.gz
emacs-e0e2f363e86f8581191640324296fdebd2520d7c.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/gnutls.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 64d8052014f..314c653326b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,8 @@
7 the connection. 7 the connection.
8 (gnutls_certificate_details): Put :signature-algorithm back again, 8 (gnutls_certificate_details): Put :signature-algorithm back again,
9 which was removed by mistake. 9 which was removed by mistake.
10 (emacs_gnutls_handle_error): Fatal errors should be on level 1, so
11 that they are not messaged by default (bug#16253).
10 12
11 * gnutls.c: Add Windows specs for gnutls_dh_get_prime_bits. 13 * gnutls.c: Add Windows specs for gnutls_dh_get_prime_bits.
12 14
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)
571 if (fn_gnutls_error_is_fatal (err)) 571 if (fn_gnutls_error_is_fatal (err))
572 { 572 {
573 ret = 0; 573 ret = 0;
574 GNUTLS_LOG2 (0, max_log_level, "fatal error:", str); 574 GNUTLS_LOG2 (1, max_log_level, "fatal error:", str);
575 } 575 }
576 else 576 else
577 { 577 {