aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTed Zlatanov2014-11-25 09:48:37 -0500
committerTed Zlatanov2014-11-25 09:48:37 -0500
commit2428e38d763614280679ca15b52b8c5076b792f1 (patch)
treee5e08043f69aeb9977248496e5bb604244ab70e0 /src
parent59bf524c77cfc84b41b9b6085b08126495bc5d0e (diff)
downloademacs-2428e38d763614280679ca15b52b8c5076b792f1.tar.gz
emacs-2428e38d763614280679ca15b52b8c5076b792f1.zip
* gnutls.c (Fgnutls_boot): Minor logging fixes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/gnutls.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 922b61a92e3..d78e1cd49eb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,7 +4,7 @@
4 (Fgnutls_peer_status_warning_describe): Add function to describe a 4 (Fgnutls_peer_status_warning_describe): Add function to describe a
5 peer verification warning symbol. 5 peer verification warning symbol.
6 (Fgnutls_peer_status): Use it. 6 (Fgnutls_peer_status): Use it.
7 (Fgnutls_boot): Use it. 7 (Fgnutls_boot): Use it. Minor logging fixes.
8 8
92014-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org> 92014-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org>
10 10
diff --git a/src/gnutls.c b/src/gnutls.c
index 604c595622d..8268901265b 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1218,6 +1218,8 @@ one trustfile (usually a CA bundle). */)
1218 XPROCESS (proc)->gnutls_log_level = max_log_level; 1218 XPROCESS (proc)->gnutls_log_level = max_log_level;
1219 } 1219 }
1220 1220
1221 GNUTLS_LOG2 (1, max_log_level, "connecting to host:", c_hostname);
1222
1221 /* always initialize globals. */ 1223 /* always initialize globals. */
1222 global_init = emacs_gnutls_global_init (); 1224 global_init = emacs_gnutls_global_init ();
1223 if (! NILP (Fgnutls_errorp (global_init))) 1225 if (! NILP (Fgnutls_errorp (global_init)))
@@ -1420,13 +1422,12 @@ one trustfile (usually a CA bundle). */)
1420 if ( !NILP (warnings) ) 1422 if ( !NILP (warnings) )
1421 { 1423 {
1422 Lisp_Object tail; 1424 Lisp_Object tail;
1423
1424 for (tail = warnings; CONSP (tail); tail = XCDR (tail)) 1425 for (tail = warnings; CONSP (tail); tail = XCDR (tail))
1425 { 1426 {
1426 Lisp_Object warning = XCAR (tail); 1427 Lisp_Object warning = XCAR (tail);
1427 Lisp_Object message = Fgnutls_peer_status_warning_describe (warning); 1428 Lisp_Object message = Fgnutls_peer_status_warning_describe (warning);
1428 if ( !NILP (message) ) 1429 if ( !NILP (message) )
1429 GNUTLS_LOG2 (1, max_log_level, "verification: %s", SDATA(message)); 1430 GNUTLS_LOG2 (1, max_log_level, "verification:", SDATA(message));
1430 } 1431 }
1431 } 1432 }
1432 1433