pullup:

 785.   [bug]           A race condition in the resolver could cause
                        an assertion failure. [RT #673, #872, #1048]

diff --git a/CHANGES b/CHANGES
index d3fe7da73521dd574f329098efd55619f1d5bf02..ebd5cd4d719693af4cfe7b6af20ebdd21ab253c6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ 785.  [bug]           A race condition in the resolver could cause
+                       an assertion failure. [RT #673, #872, #1048]
 
  783.  [bug]           Following CNAMEs could cause an assertion failure
                        when either using an sdb database or under very

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index e30d0fd54dff41f3c590363b7f79fcb0349abe94..44067d8e7255b575c01cabea2aac5f4c571ea005 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.187.2.8 2001/02/28 21:20:31 bwelling Exp $ */
+/* $Id: resolver.c,v 1.187.2.9 2001/03/20 23:49:36 bwelling Exp $ */
 
 #include <config.h>
 
@@ -554,6 +554,7 @@ fctx_done(fetchctx_t *fctx, isc_result_t result) {
        LOCK(&res->buckets[fctx->bucketnum].lock);
 
        fctx->state = fetchstate_done;
+       fctx->attributes &= ~FCTX_ATTR_ADDRWAIT;
        fctx_sendevents(fctx, result);
 
        UNLOCK(&res->buckets[fctx->bucketnum].lock);