1345. [bug] If the tcpquota was exhausted it was possible to

                        to trigger a INSIST() failure.

diff --git a/CHANGES b/CHANGES
index e9741d2dd21e42ffaa3619feb631420c137c725a..93f8a40927d4e838a5ca6e6d6d6fe55c986f9543 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1345.  [bug]           If the tcpquota was exhausted it was possible to
+                       to trigger a INSIST() failure.
+
 1344.  [port]          darwin: ifconfig.sh now supports darwin.
 
 1343.  [port]          linux: Slackware 4.0 needs <asm/unistd.h>. [RT #3205]

diff --git a/bin/named/query.c b/bin/named/query.c
index af2d20a3c84b48b56590fd6f7e4239241d867ebf..6faa28058b3fb9956ac2d313043832fcc275d78d 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.221 2002/06/25 04:12:51 marka Exp $ */
+/* $Id: query.c,v 1.222 2002/07/09 02:41:36 marka Exp $ */
 
 #include <config.h>
 
@@ -2198,7 +2198,7 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qdomain,
         * because those have already been replaced when the
         * connection was accepted (if allowed by the TCP quota).
         */
-       if (! client->mortal) {
+       if (! client->mortal && client->recursionquota == NULL) {
                isc_boolean_t killoldest = ISC_FALSE;
                result = isc_quota_attach(&ns_g_server->recursionquota,
                                          &client->recursionquota);