X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=resolver.c;h=b7c56e3bdc4cd6ea87a16eae3636bde459e8cd35;hp=9e0530cd840b04c12534279aee8a60995edf1b45;hb=389070fed67552c613ce5afd3cdb436f8f8c538f;hpb=2fe58dfd10216a37f1ece081f926971882de112e

diff --git a/resolver.c b/resolver.c
index 9e0530c..b7c56e3 100644
--- a/resolver.c
+++ b/resolver.c
@@ -2,8 +2,12 @@
 
 #include <errno.h>
 #include "secnet.h"
+#ifndef HAVE_LIBADNS
+#error secnet requires ADNS version 1.0 or above
+#endif
 #include <adns.h>
 
+
 struct adns {
     closure_t cl;
     struct resolver_if ops;
@@ -17,7 +21,8 @@ struct query {
     adns_query query;
 };
 
-static bool_t resolve_request(void *sst, string_t name,
+static resolve_request_fn resolve_request;
+static bool_t resolve_request(void *sst, cstring_t name,
 			      resolve_answer_fn *cb, void *cst)
 {
     struct adns *st=sst;
@@ -70,7 +75,7 @@ static void resolver_afterpoll(void *sst, struct pollfd *fds, int nfds,
 	} else if (rv==EAGAIN || rv==ESRCH) {
 	    break;
 	} else {
-	    fatal("resolver_afterpoll: adns_check() returned %d\n",rv);
+	    fatal("resolver_afterpoll: adns_check() returned %d",rv);
 	}
     }
 
@@ -118,7 +123,6 @@ static list_t *adnsresolver_apply(closure_t *self, struct cloc loc,
     return new_closure(&st->cl);
 }
 
-init_module resolver_module;
 void resolver_module(dict_t *dict)
 {
     add_closure(dict,"adns",adnsresolver_apply);