resolv.conf parsing: Rename OPTION_IS etc. to WORD_IS

[adns.git] / src / setup.c

diff --git a/src/setup.c b/src/setup.c
index fd20c434210c2e210a9db4a592b24618cfe3db3f..c52966d22547089cd9226fa080a391b537734625 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -260,65 +260,93 @@ static void ccf_sortlist(adns_state ads, const char *fn,
 
 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);
+                        (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,
@@ -355,8 +383,9 @@ static void ccf_lookup(adns_state ads, const char *fn, int lno,
       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;
     }
   }
@@ -364,6 +393,10 @@ static void ccf_lookup(adns_state ads, const char *fn, int lno,
     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);
@@ -376,6 +409,7 @@ static const struct configcommandinfo {
   { "clearnameservers",  ccf_clearnss    },
   { "include",           ccf_include     },
   { "lookup",            ccf_lookup      }, /* OpenBSD */
+  { "lwserver",          ccf_ignore      }, /* BIND9 lwresd */
   {  0                                   }
 };
 
@@ -481,8 +515,9 @@ static void readconfiggeneric(adns_state ads, const char *filename,
           !(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++;
@@ -594,6 +629,7 @@ static int init_begin(adns_state *ads_r, adns_initflags flags,
   ads->tcpstate= server_disconnected;
   timerclear(&ads->tcptimeout);
   ads->searchlist= 0;
+  ads->config_report_unknown=1;
 
   pid= getpid();
   ads->rand48xsubi[0]= pid;