+ * Give ESRCH, not EAGAIN, if _check called with no queries outstanding.

@@ -19,6 +19,7 @@
+  * Give ESRCH, not EAGAIN, if _check called with no queries outstanding.

diff --git a/changelog b/changelog
index 6b6340987d3be0820f43da9515f94b0702980a51..71d75b4f19f0b78fa55ae6bba6e4293bb04caa5b 100644 (file)
--- a/changelog
+++ b/changelog
@@ -5,7 +5,7 @@ adns (0.5) unstable; urgency=medium
     Thanks to Tony Finch for the program and the performance figure.
   * New internal consistency checking with assert if right options set.
   * New adns_wait_poll function like adns_wait but uses poll, not select.
     Thanks to Tony Finch for the program and the performance figure.
   * New internal consistency checking with assert if right options set.
   * New adns_wait_poll function like adns_wait but uses poll, not select.

-  * New adnshost utility - very alpha.
+  * New adnshost utility - currently only a usage message :-).

 
   Incompatible changes:
   * RRs with mailboxes never rejected due to strange chars if _raw.
 
   Incompatible changes:
   * RRs with mailboxes never rejected due to strange chars if _raw.

diff --git a/src/event.c b/src/event.c
index b2da291e0856ee77669393638b8dd1c409ca6573..9384085256eb392baf017ee1678001700d8c4b76 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -565,8 +565,13 @@ int adns__internal_check(adns_state ads,
 
   qu= *query_io;
   if (!qu) {
 
   qu= *query_io;
   if (!qu) {

-    if (!ads->output.head) return EAGAIN;
-    qu= ads->output.head;
+    if (ads->output.head) {
+      qu= ads->output.head;
+    } else if (ads->timew.head) {
+      return EAGAIN;
+    } else {
+      return ESRCH;
+    }

   } else {
     if (qu->id>=0) return EAGAIN;
   }
   } else {
     if (qu->id>=0) return EAGAIN;
   }