add a -R option to set/unset resolver flags.libressl-v2.9.0

use strcasecmp for reading args.

9 files changed, 101 insertions, 20 deletions

diff --git a/src/regress/lib/libc/asr/bin/common.c b/src/regress/lib/libc/asr/bin/common.c
index c808c86d61..08a7bccbb7 100644
--- a/src/regress/lib/libc/asr/bin/common.c
+++ b/src/regress/lib/libc/asr/bin/common.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: common.c,v 1.3 2014/08/10 07:31:58 guenther Exp $     */
+/*      $OpenBSD: common.c,v 1.4 2018/12/15 15:16:12 eric Exp $ */
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -86,8 +86,8 @@ kv_lookup_name(struct kv *kv, int code, char *buf, size_t sz)
 }
 
 struct keyval {
-        const char      *key;
-        uint16_t         value;   
+        const char *key;
+        int         value;   
 };
 
 static struct keyval kv_class[] = {
@@ -135,6 +135,24 @@ static struct keyval kv_rcode[] = {
         { NULL,         0 },
 };
 
+static struct keyval kv_resopt[] = {
+        { "DEBUG",      RES_DEBUG },
+        { "AAONLY",     RES_AAONLY },
+        { "USEVC",      RES_USEVC },
+        { "PRIMARY",    RES_PRIMARY },
+        { "IGNTC",      RES_IGNTC },
+        { "RECURSE",    RES_RECURSE },
+        { "DEFNAMES",   RES_DEFNAMES },
+        { "STAYOPEN",   RES_STAYOPEN },
+        { "DNSRCH",     RES_DNSRCH },
+        { "INSECURE1",  RES_INSECURE1 },
+        { "INSECURE2",  RES_INSECURE2 },
+        { "NOALIASES",  RES_NOALIASES },
+        { "USE_INET6",  RES_USE_INET6 },
+        { "USE_EDNS0",  RES_USE_EDNS0 },
+        { "USE_DNSSEC", RES_USE_DNSSEC },
+        { NULL,         0 },
+};
 
 const char *
 rcodetostr(uint16_t v)
@@ -187,7 +205,7 @@ strtotype(const char *name)
         size_t  i;
 
         for(i = 0; kv_type[i].key; i++)
-                if (!strcmp(kv_type[i].key, name))
+                if (!strcasecmp(kv_type[i].key, name))
                         return (kv_type[i].value);
 
         return (0);
@@ -199,12 +217,52 @@ strtoclass(const char *name)
         size_t  i;
 
         for(i = 0; kv_class[i].key; i++)
-                if (!strcmp(kv_class[i].key, name))
+                if (!strcasecmp(kv_class[i].key, name))
                         return (kv_class[i].value);
 
         return (0);
 }
 
+int
+strtoresopt(const char *name)
+{
+        size_t  i;
+
+        for(i = 0; kv_resopt[i].key; i++)
+                if (!strcasecmp(kv_resopt[i].key, name))
+                        return (kv_resopt[i].value);
+
+        return (0);
+}
+
+void
+parseresopt(const char *name)
+{
+        static int init = 0;
+        int flag, neg = 0;
+
+        if (init == 0) {
+                res_init();
+                init = 1;
+        }
+
+        if (name[0] == '-') {
+                neg = 1;
+                name++;
+        }
+        else if (name[0] == '+')
+                name++;
+
+        flag = strtoresopt(name);
+        if (flag == 0)
+                errx(1, "unknown reslover option %s", name);
+        
+        if (neg)
+                _res.options &= ~flag;
+        else
+                _res.options |= flag;
+}
+
 void
 print_hostent(struct hostent *e)
 {
diff --git a/src/regress/lib/libc/asr/bin/common.h b/src/regress/lib/libc/asr/bin/common.h
index 87df4ae4a2..6a6b90a34f 100644
--- a/src/regress/lib/libc/asr/bin/common.h
+++ b/src/regress/lib/libc/asr/bin/common.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: common.h,v 1.1.1.1 2012/07/13 17:49:53 eric Exp $     */
+/*      $OpenBSD: common.h,v 1.2 2018/12/15 15:16:12 eric Exp $ */
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -41,6 +41,8 @@ const char *rcodetostr(uint16_t);
 
 uint16_t strtotype(const char*);
 uint16_t strtoclass(const char*);
+int strtoresopt(const char*);
+void parseresopt(const char*);
 
 void    print_rrsetinfo(struct rrsetinfo *);
 void    print_addrinfo(struct addrinfo *);
diff --git a/src/regress/lib/libc/asr/bin/getaddrinfo.c b/src/regress/lib/libc/asr/bin/getaddrinfo.c
index 7b8674aea9..6605a00c1b 100644
--- a/src/regress/lib/libc/asr/bin/getaddrinfo.c
+++ b/src/regress/lib/libc/asr/bin/getaddrinfo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getaddrinfo.c,v 1.2 2013/03/28 09:36:03 eric Exp $    */
+/*      $OpenBSD: getaddrinfo.c,v 1.3 2018/12/15 15:16:12 eric Exp $    */
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -48,7 +48,7 @@ main(int argc, char *argv[])
 
         memset(&hints, 0, sizeof hints);
 
-        while((ch = getopt(argc, argv, "CFHPSef:p:s:t:")) !=  -1) {
+        while((ch = getopt(argc, argv, "CFHPR:Sef:p:s:t:")) !=  -1) {
                 switch(ch) {
                 case 'C':
                         hints.ai_flags |= AI_CANONNAME;
@@ -62,6 +62,9 @@ main(int argc, char *argv[])
                 case 'P':
                         hints.ai_flags |= AI_PASSIVE;
                         break;
+                case 'R':
+                        parseresopt(optarg);
+                        break;
                 case 'S':
                         hints.ai_flags |= AI_NUMERICSERV;
                         break;
diff --git a/src/regress/lib/libc/asr/bin/gethostnamadr.c b/src/regress/lib/libc/asr/bin/gethostnamadr.c
index b1b3e331a7..9cdf7ed448 100644
--- a/src/regress/lib/libc/asr/bin/gethostnamadr.c
+++ b/src/regress/lib/libc/asr/bin/gethostnamadr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: gethostnamadr.c,v 1.2 2012/07/29 19:51:36 eric Exp $  */
+/*      $OpenBSD: gethostnamadr.c,v 1.3 2018/12/15 15:16:12 eric Exp $  */
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -47,7 +47,7 @@ main(int argc, char *argv[])
         int                      addrlen;
 
         aflag = 0;
-        while((ch = getopt(argc, argv, "46ae")) !=  -1) {
+        while((ch = getopt(argc, argv, "46R:ae")) !=  -1) {
                 switch(ch) {
                 case '4':
                         family = AF_INET;
@@ -55,6 +55,9 @@ main(int argc, char *argv[])
                 case '6':
                         family = AF_INET6;
                         break;
+                case 'R':
+                        parseresopt(optarg);
+                        break;
                 case 'a':
                         aflag = 1;
                         break;
diff --git a/src/regress/lib/libc/asr/bin/getnameinfo.c b/src/regress/lib/libc/asr/bin/getnameinfo.c
index 8702937a47..bd0fbe224f 100644
--- a/src/regress/lib/libc/asr/bin/getnameinfo.c
+++ b/src/regress/lib/libc/asr/bin/getnameinfo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getnameinfo.c,v 1.1.1.1 2012/07/13 17:49:54 eric Exp $        */
+/*      $OpenBSD: getnameinfo.c,v 1.2 2018/12/15 15:16:12 eric Exp $    */
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -45,7 +45,7 @@ main(int argc, char *argv[])
 
         sa = (struct sockaddr*)&ss;
 
-        while((ch = getopt(argc, argv, "DFHNSaep:")) !=  -1) {
+        while((ch = getopt(argc, argv, "DFHNR:Saep:")) !=  -1) {
                 switch(ch) {
                 case 'D':
                         flags |= NI_DGRAM;
@@ -59,6 +59,9 @@ main(int argc, char *argv[])
                 case 'N':
                         flags |= NI_NAMEREQD;
                         break;
+                case 'R':
+                        parseresopt(optarg);
+                        break;
                 case 'S':
                         flags |= NI_NUMERICSERV;
                         break;
diff --git a/src/regress/lib/libc/asr/bin/getnetnamadr.c b/src/regress/lib/libc/asr/bin/getnetnamadr.c
index 4b7414264b..e615e8663f 100644
--- a/src/regress/lib/libc/asr/bin/getnetnamadr.c
+++ b/src/regress/lib/libc/asr/bin/getnetnamadr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getnetnamadr.c,v 1.1.1.1 2012/07/13 17:49:54 eric Exp $       */
+/*      $OpenBSD: getnetnamadr.c,v 1.2 2018/12/15 15:16:12 eric Exp $   */
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -44,8 +44,11 @@ main(int argc, char *argv[])
         struct netent           *n;
         char                    *host;
 
-        while((ch = getopt(argc, argv, "en")) !=  -1) {
+        while((ch = getopt(argc, argv, "R:en")) !=  -1) {
                 switch(ch) {
+                case 'R':
+                        parseresopt(optarg);
+                        break;
                 case 'e':
                         long_err += 1;
                         break;
diff --git a/src/regress/lib/libc/asr/bin/getrrsetbyname.c b/src/regress/lib/libc/asr/bin/getrrsetbyname.c
index 4a5aa57209..8f48501a3f 100644
--- a/src/regress/lib/libc/asr/bin/getrrsetbyname.c
+++ b/src/regress/lib/libc/asr/bin/getrrsetbyname.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getrrsetbyname.c,v 1.1.1.1 2012/07/13 17:49:54 eric Exp $     */
+/*      $OpenBSD: getrrsetbyname.c,v 1.2 2018/12/15 15:16:12 eric Exp $ */
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -48,8 +48,11 @@ main(int argc, char *argv[])
         char                    *host;
         struct rrsetinfo        *rrset;
 
-        while((ch = getopt(argc, argv, "et:")) !=  -1) {
+        while((ch = getopt(argc, argv, "R:et:")) !=  -1) {
                 switch(ch) {
+                case 'R':
+                        parseresopt(optarg);
+                        break;
                 case 'e':
                         long_err += 1;
                         break;
diff --git a/src/regress/lib/libc/asr/bin/res_mkquery.c b/src/regress/lib/libc/asr/bin/res_mkquery.c
index a52023c5c0..b32f471cdf 100644
--- a/src/regress/lib/libc/asr/bin/res_mkquery.c
+++ b/src/regress/lib/libc/asr/bin/res_mkquery.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: res_mkquery.c,v 1.1.1.1 2012/07/13 17:49:53 eric Exp $        */
+/*      $OpenBSD: res_mkquery.c,v 1.2 2018/12/15 15:16:12 eric Exp $    */
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -59,8 +59,11 @@ main(int argc, char *argv[])
         uint16_t                 type = T_A;
         char                     buf[1024], *host;
 
-        while((ch = getopt(argc, argv, "et:")) !=  -1) {
+        while((ch = getopt(argc, argv, "R:et:")) !=  -1) {
                 switch(ch) {
+                case 'R':
+                        parseresopt(optarg);
+                        break;
                 case 'e':
                         long_err += 1;
                         break;
diff --git a/src/regress/lib/libc/asr/bin/res_query.c b/src/regress/lib/libc/asr/bin/res_query.c
index 3565eeebed..ca95a89a7c 100644
--- a/src/regress/lib/libc/asr/bin/res_query.c
+++ b/src/regress/lib/libc/asr/bin/res_query.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: res_query.c,v 1.2 2017/03/09 07:56:38 eric Exp $      */
+/*      $OpenBSD: res_query.c,v 1.3 2018/12/15 15:16:12 eric Exp $      */
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -72,8 +72,11 @@ main(int argc, char *argv[])
         dflag = 0;
         qflag = 0;
 
-        while((ch = getopt(argc, argv, "deqt:")) !=  -1) {
+        while((ch = getopt(argc, argv, "R:deqt:")) !=  -1) {
                 switch(ch) {
+                case 'R':
+                        parseresopt(optarg);
+                        break;
                 case 'd':
                         dflag = 1;
                         break;