X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/0872e2895aa60a446cc7d2b2b2b71e0784ade074..f4df21486b969e20422f7f4b658793b5b3665b04:/src/setup.c diff --git a/src/setup.c b/src/setup.c index d1bdb04..8604f8e 100644 --- a/src/setup.c +++ b/src/setup.c @@ -4,7 +4,12 @@ * - management of global state */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -226,6 +231,21 @@ static void ccf_options(adns_state ads, const char *fn, int lno, const char *buf ads->searchndots= v; continue; } + if (l>=12 && !memcmp(word,"adns_checkc:",12)) { + if (!strcmp(word+12,"none")) { + ads->iflags &= ~adns_if_checkc_freq; + ads->iflags |= adns_if_checkc_entex; + } else if (!strcmp(word+12,"entex")) { + ads->iflags &= ~adns_if_checkc_freq; + ads->iflags |= adns_if_checkc_entex; + } else if (!strcmp(word+12,"freq")) { + ads->iflags |= adns_if_checkc_freq; + } else { + configparseerr(ads,fn,lno, "option adns_checkc has bad value `%s' " + "(must be none, entex or freq", word+12); + } + continue; + } adns__diag(ads,-1,0,"%s:%d: unknown option `%.*s'", fn,lno, l,word); } } @@ -530,6 +550,7 @@ int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) { r= init_finish(ads); if (r) return r; + adns__consistency(ads,0,cc_entex); *ads_r= ads; return 0; } @@ -549,11 +570,14 @@ int adns_init_strcfg(adns_state *ads_r, adns_initflags flags, } r= init_finish(ads); if (r) return r; + adns__consistency(ads,0,cc_entex); *ads_r= ads; return 0; } + void adns_finish(adns_state ads) { + adns__consistency(ads,0,cc_entex); for (;;) { if (ads->timew.head) adns_cancel(ads->timew.head); else if (ads->childw.head) adns_cancel(ads->childw.head); @@ -568,6 +592,7 @@ void adns_finish(adns_state ads) { } void adns_forallqueries_begin(adns_state ads) { + adns__consistency(ads,0,cc_entex); ads->forallnext= ads->timew.head ? ads->timew.head : ads->childw.head ? ads->childw.head : @@ -577,6 +602,7 @@ void adns_forallqueries_begin(adns_state ads) { adns_query adns_forallqueries_next(adns_state ads, void **context_r) { adns_query qu, nqu; + adns__consistency(ads,0,cc_entex); nqu= ads->forallnext; for (;;) { qu= nqu;