From 05a456499af940762d6658366abafb220c5053cc Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 28 Jul 2017 16:06:51 +1000 Subject: [PATCH] 4660. [bug] Remove spurious "peer" from Windows socket log messages. [RT #45617] (cherry picked from commit 5140501a0b0a741a456efe3a1a2a052c95041af6) --- CHANGES | 3 +++ lib/isc/win32/socket.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index eac1325801..7d07bb874a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4660. [bug] Remove spurious "peer" from Windows socket log + messages. [RT #45617] + 4659. [bug] Remove spurious log message about lmdb-mapsize not being supported when parsing builtin configuration file. [RT #45618] diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index 0237f473cc..8250f5289e 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -881,7 +881,7 @@ socket_log(int lineno, isc_socket_t *sock, isc_sockaddr_t *address, isc_sockaddr_format(address, peerbuf, sizeof(peerbuf)); isc_log_iwrite(isc_lctx, category, module, level, msgcat, msgset, message, - "socket %p line %d peer %s: %s", sock, lineno, + "socket %p line %d %s: %s", sock, lineno, peerbuf, msgbuf); }