From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 6 Feb 2009 10:49:09 +0000 (+0000)
Subject: fix cancel test more.
X-Git-Tag: release-1.3.0~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c53328dd071dc0ba1e1f04e7f0900641c9a80595;p=thirdparty%2Funbound.git

fix cancel test more.


git-svn-id: file:///svn/unbound/trunk@1463 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/doc/Changelog b/doc/Changelog
index e8e0b2567..4193c6db3 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,6 +7,7 @@
 	  occurred. Does not enforce a space after keyword anymore.
 	  Does not allow literal newlines inside quoted strings anymore.
 	- verbosity level 5 logs customer IP for new requestlist entries.
+	- test fix, lexer and cancel test.
 
 5 February 2009: Wouter
 	- ldns 1.5.0 rc as tarball included.
diff --git a/testcode/asynclook.c b/testcode/asynclook.c
index 10e34fc1c..dd7eaec4d 100644
--- a/testcode/asynclook.c
+++ b/testcode/asynclook.c
@@ -300,7 +300,8 @@ ext_thread(void* arg)
 			if(i > 100) {
 				lock_basic_lock(&async_ids[i-100].lock);
 				r = ub_cancel(inf->ctx, async_ids[i-100].id);
-				async_ids[i-100].cancel=1;
+				if(r != UB_NOID)
+					async_ids[i-100].cancel=1;
 				lock_basic_unlock(&async_ids[i-100].lock);
 				if(r != UB_NOID) 
 					checkerr("ub_cancel", r);