1 files changed, 182 insertions, 77 deletions

diff --git a/src/lib/libc/net/res_init.c b/src/lib/libc/net/res_init.c
index 6f4f39ef9f..46b9361126 100644
--- a/src/lib/libc/net/res_init.c
+++ b/src/lib/libc/net/res_init.c
@@ -1,7 +1,11 @@
-/*-
+/*      $OpenBSD: res_init.c,v 1.11 1997/03/13 19:07:38 downsj Exp $    */
+
+/*
+ * ++Copyright++ 1985, 1989, 1993
+ * -
  * Copyright (c) 1985, 1989, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
+ *    The Regents of the University of California.  All rights reserved.
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -12,12 +16,12 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -52,33 +56,69 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: res_init.c,v 1.10 1996/09/22 11:52:07 deraadt Exp $";
+#if 0
+static char sccsid[] = "@(#)res_init.c  8.1 (Berkeley) 6/7/93";
+static char rcsid[] = "$From: res_init.c,v 8.7 1996/09/28 06:51:07 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: res_init.c,v 1.11 1997/03/13 19:07:38 downsj Exp $";
+#endif
 #endif /* LIBC_SCCS and not lint */
 
+#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
+
+#include <stdio.h>
+#include <ctype.h>
 #include <resolv.h>
 #include <unistd.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+/*-------------------------------------- info about "sortlist" --------------
+ * Marc Majka           1994/04/16
+ * Allan Nathanson      1994/10/29 (BIND 4.9.3.x)
+ *
+ * NetInfo resolver configuration directory support.
+ *
+ * Allow a NetInfo directory to be created in the hierarchy which
+ * contains the same information as the resolver configuration file.
+ *
+ * - The local domain name is stored as the value of the "domain" property.
+ * - The Internet address(es) of the name server(s) are stored as values
+ *   of the "nameserver" property.
+ * - The name server addresses are stored as values of the "nameserver"
+ *   property.
+ * - The search list for host-name lookup is stored as values of the
+ *   "search" property.
+ * - The sortlist comprised of IP address netmask pairs are stored as
+ *   values of the "sortlist" property. The IP address and optional netmask
+ *   should be seperated by a slash (/) or ampersand (&) character.
+ * - Internal resolver variables can be set from the value of the "options"
+ *   property.
+ */
+
 static void res_setoptions __P((char *, char *));
+
+#ifdef RESOLVSORT
+static const char sort_mask[] = "/&";
+#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
 static u_int32_t net_mask __P((struct in_addr));
+#endif
 
 /*
- * Resolver state default settings
+ * Resolver state default settings.
  */
 
-struct __res_state _res = {
-        RES_TIMEOUT,                    /* retransmition time interval */
-        4,                              /* number of times to retransmit */
-        RES_DEFAULT,                    /* options flags */
-        1,                              /* number of name servers */
-};
+struct __res_state _res
+# if defined(__BIND_RES_TEXT)
+        = { RES_TIMEOUT, }      /* Motorola, et al. */
+# endif
+        ;
 
 /*
  * Set up default settings.  If the configuration file exist, the values
@@ -105,25 +145,60 @@ int
 res_init()
 {
         register FILE *fp;
-        register char *cp, **pp, *net;
+        register char *cp, **pp;
         register int n;
-        char buf[BUFSIZ], buf2[BUFSIZ];
+        char buf[BUFSIZ];
         int nserv = 0;    /* number of nameserver records read from file */
         int haveenv = 0;
         int havesearch = 0;
+#ifdef RESOLVSORT
         int nsort = 0;
+        char *net;
+#endif
+#ifndef RFC1535
+        int dots;
+#endif
 
-        if (_res.id == 0)
+        /*
+         * These three fields used to be statically initialized.  This made
+         * it hard to use this code in a shared library.  It is necessary,
+         * now that we're doing dynamic initialization here, that we preserve
+         * the old semantics: if an application modifies one of these three
+         * fields of _res before res_init() is called, res_init() will not
+         * alter them.  Of course, if an application is setting them to
+         * _zero_ before calling res_init(), hoping to override what used
+         * to be the static default, we can't detect it and unexpected results
+         * will follow.  Zero for any of these fields would make no sense,
+         * so one can safely assume that the applications were already getting
+         * unexpected results.
+         *
+         * _res.options is tricky since some apps were known to diddle the bits
+         * before res_init() was first called. We can't replicate that semantic
+         * with dynamic initialization (they may have turned bits off that are
+         * set in RES_DEFAULT).  Our solution is to declare such applications
+         * "broken".  They could fool us by setting RES_INIT but none do (yet).
+         */
+        if (!_res.retrans)
+                _res.retrans = RES_TIMEOUT;
+        if (!_res.retry)
+                _res.retry = 4;
+        if (!(_res.options & RES_INIT))
+                _res.options = RES_DEFAULT;
+
+        /*
+         * This one used to initialize implicitly to zero, so unless the app
+         * has set it to something in particular, we can randomize it now.
+         */
+        if (!_res.id)
                 _res.id = res_randomid();
 
-        _res.nsaddr.sin_len = sizeof(struct sockaddr_in);
-        _res.nsaddr.sin_family = AF_INET;
-        _res.nsaddr.sin_port = htons(NAMESERVER_PORT);
 #ifdef USELOOPBACK
         _res.nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
 #else
         _res.nsaddr.sin_addr.s_addr = INADDR_ANY;
 #endif
+        _res.nsaddr.sin_family = AF_INET;
+        _res.nsaddr.sin_port = htons(NAMESERVER_PORT);
         _res.nscount = 1;
         _res.ndots = 1;
         _res.pfcode = 0;
@@ -133,8 +208,6 @@ res_init()
         if (issetugid() == 0 && (cp = getenv("LOCALDOMAIN")) != NULL) {
                 (void)strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
                 _res.defdname[sizeof(_res.defdname) - 1] = '\0';
-                if ((cp = strpbrk(_res.defdname, " \t\n")) != NULL)
-                        *cp = '\0';
                 haveenv++;
 
                 /*
@@ -148,7 +221,7 @@ res_init()
                 pp = _res.dnsrch;
                 *pp++ = cp;
                 for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
-                        if (*cp == '\n')        /* silly backwards compat */
+                        if (*cp == '\n')        /* silly backwards compat */
                                 break;
                         else if (*cp == ' ' || *cp == '\t') {
                                 *cp = 0;
@@ -166,16 +239,21 @@ res_init()
                 *pp++ = 0;
         }
 
+#define MATCH(line, name) \
+        (!strncmp(line, name, sizeof(name) - 1) && \
+        (line[sizeof(name) - 1] == ' ' || \
+         line[sizeof(name) - 1] == '\t'))
+
         if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
             strncpy(_res.lookups, "bf", sizeof _res.lookups);
 
             /* read the config file */
             while (fgets(buf, sizeof(buf), fp) != NULL) {
                 /* skip comments */
-                if ((*buf == ';') || (*buf == '#'))
+                if (*buf == ';' || *buf == '#')
                         continue;
                 /* read default domain name */
-                if (!strncmp(buf, "domain", sizeof("domain") - 1)) {
+                if (MATCH(buf, "domain")) {
                     if (haveenv)        /* skip if have from environ */
                             continue;
                     cp = buf + sizeof("domain") - 1;
@@ -183,8 +261,7 @@ res_init()
                             cp++;
                     if ((*cp == '\0') || (*cp == '\n'))
                             continue;
-                    (void)strncpy(_res.defdname, cp,
-                                  sizeof(_res.defdname) - 1);
+                    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
                     _res.defdname[sizeof(_res.defdname) - 1] = '\0';
                     if ((cp = strpbrk(_res.defdname, " \t\n")) != NULL)
                             *cp = '\0';
@@ -219,7 +296,7 @@ res_init()
                     continue;
                 }
                 /* set search list */
-                if (!strncmp(buf, "search", sizeof("search") - 1)) {
+                if (MATCH(buf, "search")) {
                     if (haveenv)        /* skip if have from environ */
                             continue;
                     cp = buf + sizeof("search") - 1;
@@ -227,8 +304,7 @@ res_init()
                             cp++;
                     if ((*cp == '\0') || (*cp == '\n'))
                             continue;
-                    (void)strncpy(_res.defdname, cp,
-                                  sizeof(_res.defdname) - 1);
+                    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
                     _res.defdname[sizeof(_res.defdname) - 1] = '\0';
                     if ((cp = strchr(_res.defdname, '\n')) != NULL)
                             *cp = '\0';
@@ -257,84 +333,110 @@ res_init()
                     continue;
                 }
                 /* read nameservers to query */
-                if (!strncmp(buf, "nameserver", sizeof("nameserver") - 1) &&
-                   nserv < MAXNS) {
-                   struct in_addr a;
+                if (MATCH(buf, "nameserver") && nserv < MAXNS) {
+                    struct in_addr a;
 
                     cp = buf + sizeof("nameserver") - 1;
                     while (*cp == ' ' || *cp == '\t')
                         cp++;
                     if ((*cp != '\0') && (*cp != '\n') && inet_aton(cp, &a)) {
-                        _res.nsaddr_list[nserv].sin_len = sizeof(struct sockaddr_in);
+                        _res.nsaddr_list[nserv].sin_addr = a;
                         _res.nsaddr_list[nserv].sin_family = AF_INET;
                         _res.nsaddr_list[nserv].sin_port =
                                 htons(NAMESERVER_PORT);
-                        _res.nsaddr_list[nserv].sin_addr = a;
                         nserv++;
                     }
                     continue;
                 }
-                if (!strncmp(buf, "sortlist", sizeof("sortlist") - 1)) {
+#ifdef RESOLVSORT
+                if (MATCH(buf, "sortlist")) {
                     struct in_addr a;
 
                     cp = buf + sizeof("sortlist") - 1;
-                    while (*cp == ' ' || *cp == '\t')
-                        cp++;
-                    while (sscanf(cp,"%[0-9./]s", buf2) && nsort < MAXRESOLVSORT) {
-                        if (net = strchr(buf2, '/'))
-                            *net = '\0';
-                        if (inet_aton(buf2, &a)) {
+                    while (nsort < MAXRESOLVSORT) {
+                        while (*cp == ' ' || *cp == '\t')
+                            cp++;
+                        if (*cp == '\0' || *cp == '\n' || *cp == ';')
+                            break;
+                        net = cp;
+                        while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
+                               isascii(*cp) && !isspace(*cp))
+                                cp++;
+                        n = *cp;
+                        *cp = 0;
+                        if (inet_aton(net, &a)) {
                             _res.sort_list[nsort].addr = a;
-                            if (net && inet_aton(net+1, &a)) {
-                                _res.sort_list[nsort].mask = a.s_addr;
-                            } else {
-                                _res.sort_list[nsort].mask =
+                            if (ISSORTMASK(n)) {
+                                *cp++ = n;
+                                net = cp;
+                                while (*cp && *cp != ';' &&
+                                        isascii(*cp) && !isspace(*cp))
+                                    cp++;
+                                n = *cp;
+                                *cp = 0;
+                                if (inet_aton(net, &a)) {
+                                    _res.sort_list[nsort].mask = a.s_addr;
+                                } else {
+                                    _res.sort_list[nsort].mask = 
                                         net_mask(_res.sort_list[nsort].addr);
+                                }
+                            } else {
+                                _res.sort_list[nsort].mask = 
+                                    net_mask(_res.sort_list[nsort].addr);
                             }
                             nsort++;
                         }
-                        if (net)
-                                *net = '/';
-                        cp += strlen(buf2);
-                        while (*cp == ' ' || *cp == '\t')
-                            cp++;
+                        *cp = n;
                     }
                     continue;
                 }
-                if (!strncmp(buf, "options", sizeof("options") -1)) {
+#endif
+                if (MATCH(buf, "options")) {
                     res_setoptions(buf + sizeof("options") - 1, "conf");
                     continue;
                 }
             }
             if (nserv > 1) 
                 _res.nscount = nserv;
+#ifdef RESOLVSORT
             _res.nsort = nsort;
+#endif
             (void) fclose(fp);
         }
-        if (_res.defdname[0] == 0) {
-                if (gethostname(buf, sizeof(_res.defdname) - 1) == 0 &&
-                   (cp = strchr(buf, '.')))
-                        (void)strcpy(_res.defdname, cp + 1);
-        }
+        if (_res.defdname[0] == 0 &&
+            gethostname(buf, sizeof(_res.defdname) - 1) == 0 &&
+            (cp = strchr(buf, '.')) != NULL)
+                strcpy(_res.defdname, cp + 1);
 
         /* find components of local domain that might be searched */
         if (havesearch == 0) {
                 pp = _res.dnsrch;
                 *pp++ = _res.defdname;
-#ifndef SEARCH_LOCAL_DOMAINS
                 *pp = NULL;
-#else
-                for (cp = _res.defdname, n = 0; *cp; cp++)
-                        if (*cp == '.')
-                                n++;
+
+#ifndef RFC1535
+                dots = 0;
+                for (cp = _res.defdname; *cp; cp++)
+                        dots += (*cp == '.');
+
                 cp = _res.defdname;
-                for (; n >= LOCALDOMAINPARTS && pp < _res.dnsrch + MAXDFLSRCH;
-                    n--) {
-                        cp = strchr(cp, '.');
-                        *pp++ = ++cp;
+                while (pp < _res.dnsrch + MAXDFLSRCH) {
+                        if (dots < LOCALDOMAINPARTS)
+                                break;
+                        cp = strchr(cp, '.') + 1;    /* we know there is one */
+                        *pp++ = cp;
+                        dots--;
                 }
-                *pp++ = 0;
-#endif
+                *pp = NULL;
+#ifdef DEBUG
+                if (_res.options & RES_DEBUG) {
+                        printf(";; res_init()... default dnsrch list:\n");
+                        for (pp = _res.dnsrch; *pp; pp++)
+                                printf(";;\t%s\n", *pp);
+                        printf(";;\t..END..\n");
+                }
+#endif /* DEBUG */
+#endif /* !RFC1535 */
         }
 
         if (issetugid())
@@ -354,28 +456,26 @@ res_setoptions(options, source)
         int i;
 
 #ifdef DEBUG
-        if (_res.options & RES_DEBUG) {
+        if (_res.options & RES_DEBUG)
                 printf(";; res_setoptions(\"%s\", \"%s\")...\n",
                        options, source);
-        }
 #endif
         while (*cp) {
                 /* skip leading and inner runs of spaces */
                 while (*cp == ' ' || *cp == '\t')
                         cp++;
                 /* search for and process individual options */
-                if (!strncmp(cp, "ndots:", sizeof("ndots:")-1)) {
+                if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
                         i = atoi(cp + sizeof("ndots:") - 1);
                         if (i <= RES_MAXNDOTS)
                                 _res.ndots = i;
                         else
                                 _res.ndots = RES_MAXNDOTS;
 #ifdef DEBUG
-                        if (_res.options & RES_DEBUG) {
+                        if (_res.options & RES_DEBUG)
                                 printf(";;\tndots=%d\n", _res.ndots);
-                        }
 #endif
-                } else if (!strncmp(cp, "debug", sizeof("debug")-1)) {
+                } else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
 #ifdef DEBUG
                         if (!(_res.options & RES_DEBUG)) {
                                 printf(";; res_setoptions(\"%s\", \"%s\")..\n",
@@ -384,6 +484,8 @@ res_setoptions(options, source)
                         }
                         printf(";;\tdebug\n");
 #endif
+                } else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
+                        _res.options |= RES_USE_INET6;
                 } else {
                         /* XXX - print a warning here? */
                 }
@@ -393,6 +495,8 @@ res_setoptions(options, source)
         }
 }
 
+#ifdef RESOLVSORT
+/* XXX - should really support CIDR which means explicit masks always. */
 static u_int32_t
 net_mask(in)            /* XXX - should really use system's version of this */
         struct in_addr in;
@@ -401,12 +505,13 @@ net_mask(in)		/* XXX - should really use system's version of this */
 
         if (IN_CLASSA(i))
                 return (htonl(IN_CLASSA_NET));
-        if (IN_CLASSB(i))
+        else if (IN_CLASSB(i))
                 return (htonl(IN_CLASSB_NET));
         return (htonl(IN_CLASSC_NET));
 }
+#endif
 
-u_int16_t
+u_int
 res_randomid()
 {
         struct timeval now;