# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: henrik@henriknordstrom.net-20081002134554-\
#   kt0uvz3ppaaha0ec
# target_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 769449c1f371c8b83146476d2a90d3feb10cbb4c
# timestamp: 2008-10-02 15:51:16 +0200
# source_branch: http://www.henriknordstrom.net/bzr/squid3/hno\
#   /bug2447-trunk/
# base_revision_id: squid3@treenet.co.nz-20081002122409-\
#   j0c2nyvxm6ql4oqe
# 
# Begin patch
=== modified file 'src/dns_internal.cc'
--- src/dns_internal.cc	2008-10-02 11:28:58 +0000
+++ src/dns_internal.cc	2008-10-02 13:45:54 +0000
@@ -718,6 +718,8 @@
     nsvc * vc = (nsvc *)data;
 
     if (status != COMM_OK) {
+        char buf[MAX_IPSTRLEN];
+        debugs(78, 1, "idnsInitVCConnected: Failed to connect to nameserver " << nameservers[vc->ns].S.NtoA(buf,MAX_IPSTRLEN) << " using TCP!");
         comm_close(fd);
         return;
     }
@@ -744,6 +746,7 @@
 
     nsvc *vc = cbdataAlloc(nsvc);
     nameservers[ns].vc = vc;
+    vc->ns = ns;
 
     IPAddress addr;
 
@@ -780,6 +783,13 @@
 
     nsvc *vc = nameservers[ns].vc;
 
+    if (!vc) {
+        char buf[MAX_IPSTRLEN];
+        debugs(78, 1, "idnsSendQuery: Failed to initiate TCP connection to nameserver " << nameservers[ns].S.NtoA(buf,MAX_IPSTRLEN) << "!");
+
+        return;
+    }
+
     vc->queue->reset();
 
     short head = htons(q->sz);

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYHcQ/wAAe5fgEQQeWf//39n
f0q////6UASlm8aGtsab126mu4SSJpGkzU2kzVPaT1T9TNKfqaaIyND0gaP1I0GjepqDVT1PKaaH
pMg000yaGjTQaAAGmgBoGgSiNBNUejQmox6mhk9QTIwIwGgjJkaaA2pI9Roppp6m1AZqDQ0AGQAA
AAASSBNGgTQnpMSaNqjyZNqQZqPU0/Sg0aGRoPQb9GWjzjy/+J/gZ7qdF+Pe4ko4FGMntVnkfklj
EU1TPe+p039nSFGg8Cs5C39d3dm0lMrDMv3b3rHC9hGc0TVKlMAqQwqA49Qp7CTXhCRDvIbWXgIK
VYHklWQLHOnbMcSjVarekoRMgvJoXikcF5Vcmi6NbFkLHkJXxntjWnFboZTeuty70me9XxPoY0Rt
i16JAUWxTEcw4pnKvTEbZA0yCuN4YRTREbl6xenXOdVNMfmNJ/DapQ9SVgZyavZX2Iu0NUJzF7Du
cQwh4j1duZ1QEOJreMT+StO8XHUK8W0Y6BHdYejjpeXBpIwT+3RXhOSVvuMSBUTrBwxrsMF66VlD
xUHnYbyZGc30hQsThGwJKJts98AcypxdFKC1Sm0rEYPiVo6tsL0SNJzCRMcekVVaTE0wZmu0ziaB
ZYSaT8ysvDq4K2023wVzhTnaK92TMZG6RDd86jqalkqg1U5lks8JxJTImTL7BpNYRH2Jw6ltJcw7
MQ3oIENJ/ts8SS6S915aWc+EdthJVD1lt6SzXWSJlbzZZMmPNpAitZElhQ/BG2SZRJ8xiShznVs2
lBzB7ltbjBkbmHY7qL4z9rjXawdHIzxfJxJnP9JglwDifAJaGGZv10/L4o9/Mj9y9QeX/cMHsHge
5ePVBSfMVoynsFtgd6ETOE8TC7QyO1WhuIwkLg0aVegng91tcD24YgOsY7D6juFytHDUO4JCx/sY
5Yr9HOFjVcToKSaqeJ7u/vMAykdfkbT1SDMVHLyyeOH+B96/E3EinvOCzMjy27tnxJOaoNQYhyGU
WNV48ORYoJowQ6ws3kDZ4ro6YHRtZTDteEW/r7TAOyOFyFMVx+COYvVMHiV5yJxloqBPHe4poOBV
JHrMA+d4lDrTCYLtNOZlA3g9HA7fMbAsZP1JHwggsUZGDTO42DjzLd2G4iVFtl44WXfgfW6wUrjx
1KIU4OOJSeGw2JrkodmNDqGaq2LuFQnX1Wr6iBnFwUyfU0ksfKltGLPeV4sHpVTDWBidk62rkOjA
tfLqqOeR6UJ4ZgiSvikguhcCgdLAxise7NN9wFP8kqayUEzW1GOkLhniqSURUqEgyWB8tLiCRKVW
+uFydK+FM4HJDVUO+BM8RhmEx4K0PPwFV0A4y52AfO5gPO8/JvrkjqVYcs0rlKBJk2rrogWWWEjq
ZLQn4EXqKE1c58FPHSldS00zMTB90HAUr0B1zFYeN/e/Bk+6rUkrVbBUQRyB4RYgwnDNJ1xv9pCE
hnG0ZD9A7OJew4tLqARfNHRjxqK5HBsALLSW/fjkFRC4RdwwwmTs3TCw6mMViTZTubSPKmF0lAmv
tBnAXuKmU8HnhxWrj/3IHzZPFZPJLlzcXxFiu3dOVYChllA+q1C4TjLPeo1eKm7Gg2MDojeMEa6v
8XckU4UJCB3EP8A=