2670. [bug] Unexpected connect failures failed to log enough

                        information to be useful. [RT #20205]

diff --git a/CHANGES b/CHANGES
index b1a55506f77a75664bc29dcc7fe360585fc877d7..a02274925a83c7098d9384bd9a306f4ae38bf668 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2670.  [bug]           Unexpected connect failures failed to log enough
+                       information to be useful. [RT #20205]
+
        --- 9.7.0a3 released ---
 
 2669.  [func]          Update PKCS#11 support to support Keyper HSM.

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index ccd495a856a17e52e5f643532781144cad485851..e2e06934ee0830b777d1c6ff9e1d3a29231b7426 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.323 2009/09/02 04:25:19 jinmei Exp $ */
+/* $Id: socket.c,v 1.324 2009/09/07 02:08:51 marka Exp $ */
 
 /*! \file */
 
@@ -5065,6 +5065,7 @@ isc__socket_connect(isc_socket_t *sock0, isc_sockaddr_t *addr,
        isc__socketmgr_t *manager;
        int cc;
        char strbuf[ISC_STRERRORSIZE];
+       char addrbuf[ISC_SOCKADDR_FORMATSIZE];
 
        REQUIRE(VALID_SOCKET(sock));
        REQUIRE(addr != NULL);
@@ -5133,7 +5134,9 @@ isc__socket_connect(isc_socket_t *sock0, isc_sockaddr_t *addr,
                sock->connected = 0;
 
                isc__strerror(errno, strbuf, sizeof(strbuf));
-               UNEXPECTED_ERROR(__FILE__, __LINE__, "%d/%s", errno, strbuf);
+               isc_sockaddr_format(addr, addrbuf, sizeof(addrbuf));
+               UNEXPECTED_ERROR(__FILE__, __LINE__, "connect(%s) %d/%s",
+                                addrbuf, errno, strbuf);
 
                UNLOCK(&sock->lock);
                inc_stats(sock->manager->stats,