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

                        information to be useful. [RT #20205]

diff --git a/CHANGES b/CHANGES
index 1b9d21a26112677475645e2a16d43a82ea5a7fd0..328564762ab1c93d6500bfa966c71a2acd6f3788 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.4.4b1 released ---
 
 2649.  [bug]           Set the domain for forward only zones. [RT #19944]

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index e5034f4270751e7afb21ad48ef9e0e8741566a56..023f71a86fcfc711ff763a21254e10f081beed6d 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.237.18.67 2009/08/13 02:19:39 marka Exp $ */
+/* $Id: socket.c,v 1.237.18.68 2009/09/07 02:17:09 marka Exp $ */
 
 /*! \file */
 
@@ -4482,6 +4482,7 @@ isc_socket_connect(isc_socket_t *sock, 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);
@@ -4550,7 +4551,9 @@ isc_socket_connect(isc_socket_t *sock, 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);
                isc_event_free(ISC_EVENT_PTR(&dev));