*/
/*
* This file is part of adns, which is
- * Copyright (C) 1997-2000,2003,2006,2014 Ian Jackson
+ * Copyright (C) 1997-2000,2003,2006,2014-2016 Ian Jackson
* Copyright (C) 2014 Mark Wooding
* Copyright (C) 1999-2000,2003,2006 Tony Finch
* Copyright (C) 1991 Massachusetts Institute of Technology
adns_rr_addr a;
char addrbuf[ADNS_ADDR2TEXT_BUFLEN];
int err;
+ socklen_t salen;
- a.len= sizeof(a.addr);
- err= adns_text2addr(buf,DNS_PORT, 0, &a.addr.sa,&a.len);
+ salen= sizeof(a.addr);
+ err= adns_text2addr(buf,DNS_PORT, 0, &a.addr.sa,&salen);
+ a.len= salen;
switch (err) {
case 0:
break;
}
adns__debug(ads,-1,0,"using nameserver %s",
adns__sockaddr_ntoa(&a.addr.sa, addrbuf));
- addserver(ads,&a.addr.sa,a.len);
+ addserver(ads,&a.addr.sa,salen);
}
static void ccf_search(adns_state ads, const char *fn,
static int gen_pton(const char *text, int want_af, adns_sockaddr *a) {
int err;
- int len;
+ socklen_t len;
len= sizeof(*a);
err= adns_text2addr(text,0, adns_qf_addrlit_scope_forbid,
static void ccf_options(adns_state ads, const char *fn,
int lno, const char *buf) {
- const char *word;
+ const char *opt, *word, *endword, *endopt;
char *ep;
unsigned long v;
- int i,l;
+ int l;
if (!buf) return;
+#define WORD__IS(s,op) ((endword-word) op (sizeof(s)-1) && \
+ !memcmp(word,s,(sizeof(s)-1)))
+#define WORD_IS(s) (WORD__IS(s,==))
+#define WORD_STARTS(s) (WORD__IS(s,>=) ? ((word+=sizeof(s)-1)) : 0)
+
while (nextword(&buf,&word,&l)) {
- if (l==5 && !memcmp(word,"debug",5)) {
+ opt=word;
+ endopt=endword=word+l;
+ if (WORD_IS("debug")) {
ads->iflags |= adns_if_debug;
continue;
}
- if (l>=6 && !memcmp(word,"ndots:",6)) {
- v= strtoul(word+6,&ep,10);
- if (l==6 || ep != word+l || v > INT_MAX) {
+ if (WORD_STARTS("ndots:")) {
+ v= strtoul(word,&ep,10);
+ if (ep==word || ep != endword || v > INT_MAX) {
configparseerr(ads,fn,lno,"option `%.*s' malformed"
- " or has bad value",l,word);
+ " or has bad value",l,opt);
continue;
}
ads->searchndots= v;
continue;
}
- if (l>=12 && !memcmp(word,"adns_checkc:",12)) {
- if (!strcmp(word+12,"none")) {
+ if (WORD_STARTS("adns_checkc:")) {
+ if (WORD_IS("none")) {
ads->iflags &= ~adns_if_checkc_freq;
ads->iflags |= adns_if_checkc_entex;
- } else if (!strcmp(word+12,"entex")) {
+ } else if (WORD_IS("entex")) {
ads->iflags &= ~adns_if_checkc_freq;
ads->iflags |= adns_if_checkc_entex;
- } else if (!strcmp(word+12,"freq")) {
+ } else if (WORD_IS("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);
+ "(must be none, entex or freq", word);
}
continue;
}
- if (l>=8 && !memcmp(word,"adns_af:",8)) {
- word += 8;
+ if (WORD_STARTS("adns_af:")) {
ads->iflags &= ~adns_if_afmask;
- if (strcmp(word,"any")) for (;;) {
- i= strcspn(word,",");
- if (i>=4 && !memcmp(word,"ipv4",4))
+ if (!WORD_IS("any")) for (;;) {
+ const char *comma= memchr(word,',',endopt-word);
+ endword=comma?comma:endopt;
+ if (WORD_IS("ipv4"))
ads->iflags |= adns_if_permit_ipv4;
- else if (i>=4 && !memcmp(word,"ipv6",4))
+ else if (WORD_IS("ipv6"))
ads->iflags |= adns_if_permit_ipv6;
else {
- configparseerr(ads,fn,lno, "option adns_af has bad value `%.*s' "
- "(must be `any' or list {`ipv4',`ipv6'},...)",
- i, word);
+ if (ads->config_report_unknown)
+ adns__diag(ads,-1,0,"%s:%d: "
+ "option adns_af has bad value or entry `%.*s' "
+ "(option must be `any', or list of `ipv4',`ipv6')",
+ fn,lno, (int)(endword-word),word);
break;
}
- if (!word[i]) break;
- word= word + i + 1;
+ if (!comma) break;
+ word= comma+1;
}
continue;
}
- adns__diag(ads,-1,0,"%s:%d: unknown option `%.*s'", fn,lno, l,word);
+ if (WORD_IS("adns_ignoreunkcfg")) {
+ ads->config_report_unknown=0;
+ continue;
+ }
+ if (/* adns's query strategy is not configurable */
+ WORD_STARTS("timeout:") ||
+ WORD_STARTS("attempts:") ||
+ WORD_IS("rotate") ||
+ /* adns provides the application with knob for this */
+ WORD_IS("no-check-names") ||
+ /* adns normally does IPv6 if the application wants it; control
+ * this with the adns_af: option if you like */
+ WORD_IS("inet6") ||
+ /* adns does not do edns0 and this is not a problem */
+ WORD_IS("edns0"))
+ continue;
+ if (ads->config_report_unknown)
+ adns__diag(ads,-1,0,"%s:%d: unknown option `%.*s'", fn,lno, l,opt);
}
+
+#undef WORD__IS
+#undef WORD_IS
+#undef WORD_STARTS
}
static void ccf_clearnss(adns_state ads, const char *fn,
adns__diag(ads,-1,0,"%s:%d: yp lookups not supported by adns", fn,lno);
found_bind=-1;
} else {
- adns__diag(ads,-1,0,"%s:%d: unknown `lookup' database `%.*s'",
- fn,lno, l,word);
+ if (ads->config_report_unknown)
+ adns__diag(ads,-1,0,"%s:%d: unknown `lookup' database `%.*s'",
+ fn,lno, l,word);
found_bind=-1;
}
}
adns__diag(ads,-1,0,"%s:%d: `lookup' specified, but not `bind'", fn,lno);
}
+static void ccf_ignore(adns_state ads, const char *fn, int lno,
+ const char *buf) {
+}
+
static const struct configcommandinfo {
const char *name;
void (*fn)(adns_state ads, const char *fn, int lno, const char *buf);
{ "clearnameservers", ccf_clearnss },
{ "include", ccf_include },
{ "lookup", ccf_lookup }, /* OpenBSD */
+ { "lwserver", ccf_ignore }, /* BIND9 lwresd */
{ 0 }
};
!(strlen(ccip->name)==dirl && !memcmp(ccip->name,p,q-p));
ccip++);
if (!ccip->name) {
- adns__diag(ads,-1,0,"%s:%d: unknown configuration directive `%.*s'",
- filename,lno,(int)(q-p),p);
+ if (ads->config_report_unknown)
+ adns__diag(ads,-1,0,"%s:%d: unknown configuration directive `%.*s'",
+ filename,lno,(int)(q-p),p);
continue;
}
while (ctype_whitespace(*q)) q++;
adns_state ads;
pid_t pid;
+ if (flags & ~(adns_initflags)(0x4fff))
+ /* 0x4000 is reserved for `harmless' future expansion */
+ return ENOSYS;
+
ads= malloc(sizeof(*ads)); if (!ads) return errno;
ads->iflags= flags;
ads->tcpstate= server_disconnected;
timerclear(&ads->tcptimeout);
ads->searchlist= 0;
+ ads->config_report_unknown=1;
pid= getpid();
ads->rand48xsubi[0]= pid;
~ianmdlvl / adns.git / blobdiff