BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / net / gethostnamadr.c

diff --git a/usr/src/lib/libc/net/gethostnamadr.c b/usr/src/lib/libc/net/gethostnamadr.c
index a21a555..a451cb8 100644 (file)
--- a/usr/src/lib/libc/net/gethostnamadr.c
+++ b/usr/src/lib/libc/net/gethostnamadr.c
@@ -1,26 +1,54 @@
 /*
 /*

- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1985, 1988 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    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.
+ * 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
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)gethostnamadr.c    6.27 (Berkeley) %G%";
-#endif LIBC_SCCS and not lint
+static char sccsid[] = "@(#)gethostnamadr.c    6.45 (Berkeley) 2/24/91";
+#endif /* LIBC_SCCS and not lint */

 
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

-#include <ctype.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <errno.h>

 #include <arpa/inet.h>
 #include <arpa/nameser.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>

+#include <netdb.h>

 #include <resolv.h>
 #include <resolv.h>

+#include <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>

 
 #define        MAXALIASES      35
 
 #define        MAXALIASES      35

-#define MAXADDRS       35
+#define        MAXADDRS        35

 
 static char *h_addr_ptrs[MAXADDRS + 1];
 
 
 static char *h_addr_ptrs[MAXADDRS + 1];
 


@@ -28,105 +56,62 @@ static struct hostent host;
 static char *host_aliases[MAXALIASES];
 static char hostbuf[BUFSIZ+1];
 static struct in_addr host_addr;
 static char *host_aliases[MAXALIASES];
 static char hostbuf[BUFSIZ+1];
 static struct in_addr host_addr;

-static char HOSTDB[] = "/etc/hosts";

 static FILE *hostf = NULL;
 static FILE *hostf = NULL;

-static char line[BUFSIZ+1];

 static char hostaddr[MAXADDRS];
 static char *host_addrs[2];
 static int stayopen = 0;
 static char hostaddr[MAXADDRS];
 static char *host_addrs[2];
 static int stayopen = 0;

-static char *any();
+char *strpbrk();

 
 #if PACKETSZ > 1024
 
 #if PACKETSZ > 1024

-#define MAXPACKET      PACKETSZ
+#define        MAXPACKET       PACKETSZ

 #else
 #else

-#define MAXPACKET      1024
+#define        MAXPACKET       1024

 #endif
 
 typedef union {
 #endif
 
 typedef union {

-    HEADER qb1;
-    char qb2[MAXPACKET];
+    HEADER hdr;
+    u_char buf[MAXPACKET];

 } querybuf;
 
 } querybuf;
 

-static union {
+typedef union {

     long al;
     char ac;
 } align;
 
     long al;
     char ac;
 } align;
 

-

 int h_errno;
 int h_errno;

-extern errno;

 
 static struct hostent *
 
 static struct hostent *

-getanswer(msg, msglen, iquery)
-       char *msg;
-       int msglen, iquery;
+getanswer(answer, anslen, iquery)
+       querybuf *answer;
+       int anslen;
+       int iquery;

 {
        register HEADER *hp;
 {
        register HEADER *hp;

-       register char *cp;
+       register u_char *cp;

        register int n;
        register int n;

-       querybuf answer;
-       char *eom, *bp, **ap;
+       u_char *eom;
+       char *bp, **ap;

        int type, class, buflen, ancount, qdcount;
        int haveanswer, getclass = C_ANY;
        char **hap;
 
        int type, class, buflen, ancount, qdcount;
        int haveanswer, getclass = C_ANY;
        char **hap;
 

-       n = res_send(msg, msglen, (char *)&answer, sizeof(answer));
-       if (n < 0) {
-#ifdef DEBUG
-               int terrno;
-               terrno = errno;
-               if (_res.options & RES_DEBUG)
-                       printf("res_send failed\n");
-               errno = terrno;
-#endif
-               h_errno = TRY_AGAIN;
-               return (NULL);
-       }
-       eom = (char *)&answer + n;
+       eom = answer->buf + anslen;

        /*
         * find first satisfactory answer
         */
        /*
         * find first satisfactory answer
         */

-       hp = (HEADER *) &answer;
+       hp = &answer->hdr;

        ancount = ntohs(hp->ancount);
        qdcount = ntohs(hp->qdcount);
        ancount = ntohs(hp->ancount);
        qdcount = ntohs(hp->qdcount);

-       if (hp->rcode != NOERROR || ancount == 0) {
-#ifdef DEBUG
-               if (_res.options & RES_DEBUG)
-                       printf("rcode = %d, ancount=%d\n", hp->rcode, ancount);
-#endif
-               switch (hp->rcode) {
-                       case NXDOMAIN:
-                               /* Check if it's an authoritive answer */
-                               if (hp->aa)
-                                       h_errno = HOST_NOT_FOUND;
-                               else
-                                       h_errno = TRY_AGAIN;
-                               break;
-                       case SERVFAIL:
-                               h_errno = TRY_AGAIN;
-                               break;
-                       case NOERROR:
-                               if (hp->aa)
-                                       h_errno = NO_ADDRESS;
-                               else
-                                       h_errno = TRY_AGAIN;
-                               break;
-                       case FORMERR:
-                       case NOTIMP:
-                       case REFUSED:
-                               h_errno = NO_RECOVERY;
-               }
-               return (NULL);
-       }

        bp = hostbuf;
        buflen = sizeof(hostbuf);
        bp = hostbuf;
        buflen = sizeof(hostbuf);

-       cp = (char *)&answer + sizeof(HEADER);
+       cp = answer->buf + sizeof(HEADER);

        if (qdcount) {
                if (iquery) {
        if (qdcount) {
                if (iquery) {

-                       if ((n = dn_expand((char *)&answer, eom,
-                            cp, bp, buflen)) < 0) {
+                       if ((n = dn_expand((u_char *)answer->buf,
+                           (u_char *)eom, (u_char *)cp, (u_char *)bp,
+                           buflen)) < 0) {

                                h_errno = NO_RECOVERY;
                                h_errno = NO_RECOVERY;

-                               return (NULL);
+                               return ((struct hostent *) NULL);

                        }
                        cp += n + QFIXEDSZ;
                        host.h_name = bp;
                        }
                        cp += n + QFIXEDSZ;
                        host.h_name = bp;


@@ -134,25 +119,28 @@ getanswer(msg, msglen, iquery)
                        bp += n;
                        buflen -= n;
                } else
                        bp += n;
                        buflen -= n;
                } else

-                       cp += dn_skipname(cp, eom) + QFIXEDSZ;
+                       cp += __dn_skipname(cp, eom) + QFIXEDSZ;

                while (--qdcount > 0)
                while (--qdcount > 0)

-                       cp += dn_skipname(cp, eom) + QFIXEDSZ;
+                       cp += __dn_skipname(cp, eom) + QFIXEDSZ;

        } else if (iquery) {
                if (hp->aa)
                        h_errno = HOST_NOT_FOUND;
                else
                        h_errno = TRY_AGAIN;
        } else if (iquery) {
                if (hp->aa)
                        h_errno = HOST_NOT_FOUND;
                else
                        h_errno = TRY_AGAIN;

-               return (NULL);
+               return ((struct hostent *) NULL);

        }
        ap = host_aliases;
        }
        ap = host_aliases;

+       *ap = NULL;

        host.h_aliases = host_aliases;
        hap = h_addr_ptrs;
        host.h_aliases = host_aliases;
        hap = h_addr_ptrs;

-#if BSD >= 43
+       *hap = NULL;
+#if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */

        host.h_addr_list = h_addr_ptrs;
 #endif
        haveanswer = 0;
        while (--ancount >= 0 && cp < eom) {
        host.h_addr_list = h_addr_ptrs;
 #endif
        haveanswer = 0;
        while (--ancount >= 0 && cp < eom) {

-               if ((n = dn_expand((char *)&answer, eom, cp, bp, buflen)) < 0)
+               if ((n = dn_expand((u_char *)answer->buf, (u_char *)eom,
+                   (u_char *)cp, (u_char *)bp, buflen)) < 0)

                        break;
                cp += n;
                type = _getshort(cp);
                        break;
                cp += n;
                type = _getshort(cp);


@@ -171,9 +159,10 @@ getanswer(msg, msglen, iquery)
                        buflen -= n;
                        continue;
                }
                        buflen -= n;
                        continue;
                }

-               if (type == T_PTR) {
-                       if ((n = dn_expand((char *)&answer, eom,
-                           cp, bp, buflen)) < 0) {
+               if (iquery && type == T_PTR) {
+                       if ((n = dn_expand((u_char *)answer->buf,
+                           (u_char *)eom, (u_char *)cp, (u_char *)bp,
+                           buflen)) < 0) {

                                cp += n;
                                continue;
                        }
                                cp += n;
                                continue;
                        }


@@ -181,7 +170,7 @@ getanswer(msg, msglen, iquery)
                        host.h_name = bp;
                        return(&host);
                }
                        host.h_name = bp;
                        return(&host);
                }

-               if (type != T_A)  {
+               if (iquery || type != T_A)  {

 #ifdef DEBUG
                        if (_res.options & RES_DEBUG)
                                printf("unexpected answer type %d, size %d\n",
 #ifdef DEBUG
                        if (_res.options & RES_DEBUG)
                                printf("unexpected answer type %d, size %d\n",


@@ -225,7 +214,7 @@ getanswer(msg, msglen, iquery)
        }
        if (haveanswer) {
                *ap = NULL;
        }
        if (haveanswer) {
                *ap = NULL;

-#if BSD >= 43
+#if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */

                *hap = NULL;
 #else
                host.h_addr = h_addr_ptrs[0];
                *hap = NULL;
 #else
                host.h_addr = h_addr_ptrs[0];


@@ -233,7 +222,7 @@ getanswer(msg, msglen, iquery)
                return (&host);
        } else {
                h_errno = TRY_AGAIN;
                return (&host);
        } else {
                h_errno = TRY_AGAIN;

-               return (NULL);
+               return ((struct hostent *) NULL);

        }
 }
 
        }
 }
 


@@ -241,14 +230,11 @@ struct hostent *
 gethostbyname(name)
        char *name;
 {
 gethostbyname(name)
        char *name;
 {

-       register char *cp, **domain;
+       querybuf buf;
+       register char *cp;

        int n;
        int n;

-       struct hostent *hp, *gethostdomain();
-       char *hostalias();

        extern struct hostent *_gethtbyname();
 
        extern struct hostent *_gethtbyname();
 

-       if (!(_res.options & RES_INIT) && res_init() == -1)
-               return (NULL);

        /*
         * disallow names consisting only of digits/dots, unless
         * they end in a dot.
        /*
         * disallow names consisting only of digits/dots, unless
         * they end in a dot.


@@ -258,83 +244,51 @@ gethostbyname(name)
                        if (!*cp) {
                                if (*--cp == '.')
                                        break;
                        if (!*cp) {
                                if (*--cp == '.')
                                        break;

-                               h_errno = HOST_NOT_FOUND;
-                               return (NULL);
+                               /*
+                                * All-numeric, no dot at the end.
+                                * Fake up a hostent as if we'd actually
+                                * done a lookup.  What if someone types
+                                * 255.255.255.255?  The test below will
+                                * succeed spuriously... ???
+                                */
+                               if ((host_addr.s_addr = inet_addr(name)) == -1) {
+                                       h_errno = HOST_NOT_FOUND;
+                                       return((struct hostent *) NULL);
+                               }
+                               host.h_name = name;
+                               host.h_aliases = host_aliases;
+                               host_aliases[0] = NULL;
+                               host.h_addrtype = AF_INET;
+                               host.h_length = sizeof(u_long);
+                               h_addr_ptrs[0] = (char *)&host_addr;
+                               h_addr_ptrs[1] = (char *)0;
+#if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */
+                               host.h_addr_list = h_addr_ptrs;
+#else
+                               host.h_addr = h_addr_ptrs[0];
+#endif
+                               return (&host);

                        }
                        if (!isdigit(*cp) && *cp != '.') 
                                break;
                }
                        }
                        if (!isdigit(*cp) && *cp != '.') 
                                break;
                }

-       errno = 0;
-       for (cp = name, n = 0; *cp; cp++)
-               if (*cp == '.')
-                       n++;
-       if ((n && *--cp == '.') || (_res.options & RES_DEFNAMES) == 0) {
-               int defflag = _res.options & RES_DEFNAMES;

 
 

-               _res.options &= ~RES_DEFNAMES;                  /* XXX */
-               if (n && *cp == '.')
-                       *cp = '\0';
-               hp = gethostdomain(name, (char *)NULL);
-               if (n && *cp == '\0')
-                       *cp = '.';
-               if (defflag)
-                       _res.options |= RES_DEFNAMES;
-               return (hp);
-       }
-       if (n == 0 && (cp = hostalias(name)))
-               return (gethostdomain(cp, (char *)NULL));
-       for (domain = _res.dnsrch; *domain; domain++) {
-               hp = gethostdomain(name, *domain);
-               if (hp)
-                       return (hp);
-               /*
-                * If no server present, use host table.
-                * If host isn't found in this domain,
-                * keep trying higher domains in the search list
-                * (if that's enabled).
-                * On a NO_ADDRESS error, keep trying,
-                * or a wildcard MX entry could keep us from finding
-                * host entries higher in the domain.
-                */
-               if (errno == ECONNREFUSED)
-                       return (_gethtbyname(name));
-               if ((h_errno != HOST_NOT_FOUND &&
-                   h_errno != NO_ADDRESS) ||
-                   (_res.options & RES_DNSRCH) == 0)
-                       return (NULL);
-               h_errno = 0;
-       }
-       return (gethostdomain(name, (char *)NULL));
-}
-
-static struct hostent *
-gethostdomain(name, domain)
-       char *name, *domain;
-{
-       querybuf buf;
-       char nbuf[2*MAXDNAME+2];
-       int n;
-
-       if (domain == NULL)
-               (void)sprintf(nbuf, "%.*s", MAXDNAME, name);
-       else
-               (void)sprintf(nbuf, "%.*s.%.*s",
-                   MAXDNAME, name, MAXDNAME, domain);
-       n = res_mkquery(QUERY, nbuf, C_IN, T_A, (char *)NULL, 0, NULL,
-               (char *)&buf, sizeof(buf));
-       if (n < 0) {
+       if ((n = res_search(name, C_IN, T_A, buf.buf, sizeof(buf))) < 0) {

 #ifdef DEBUG
                if (_res.options & RES_DEBUG)
 #ifdef DEBUG
                if (_res.options & RES_DEBUG)

-                       printf("res_mkquery failed\n");
+                       printf("res_search failed\n");

 #endif
 #endif

-               return (NULL);
+               if (errno == ECONNREFUSED)
+                       return (_gethtbyname(name));
+               else
+                       return ((struct hostent *) NULL);

        }
        }

-       return (getanswer((char *)&buf, n, 0));
+       return (getanswer(&buf, n, 0));

 }
 
 struct hostent *
 gethostbyaddr(addr, len, type)
 }
 
 struct hostent *
 gethostbyaddr(addr, len, type)

-       char *addr;
+       const char *addr;

        int len, type;
 {
        int n;
        int len, type;
 {
        int n;


@@ -344,73 +298,41 @@ gethostbyaddr(addr, len, type)
        extern struct hostent *_gethtbyaddr();
        
        if (type != AF_INET)
        extern struct hostent *_gethtbyaddr();
        
        if (type != AF_INET)

-               return (NULL);
-       (void)sprintf(qbuf, "%d.%d.%d.%d.in-addr.arpa",
+               return ((struct hostent *) NULL);
+       (void)sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa",

                ((unsigned)addr[3] & 0xff),
                ((unsigned)addr[2] & 0xff),
                ((unsigned)addr[1] & 0xff),
                ((unsigned)addr[0] & 0xff));
                ((unsigned)addr[3] & 0xff),
                ((unsigned)addr[2] & 0xff),
                ((unsigned)addr[1] & 0xff),
                ((unsigned)addr[0] & 0xff));

-       n = res_mkquery(QUERY, qbuf, C_IN, T_PTR, (char *)NULL, 0, NULL,
-               (char *)&buf, sizeof(buf));
+       n = res_query(qbuf, C_IN, T_PTR, (char *)&buf, sizeof(buf));

        if (n < 0) {
 #ifdef DEBUG
                if (_res.options & RES_DEBUG)
        if (n < 0) {
 #ifdef DEBUG
                if (_res.options & RES_DEBUG)

-                       printf("res_mkquery failed\n");
+                       printf("res_query failed\n");

 #endif
 #endif

-               return (NULL);
+               if (errno == ECONNREFUSED)
+                       return (_gethtbyaddr(addr, len, type));
+               return ((struct hostent *) NULL);

        }
        }

-       hp = getanswer((char *)&buf, n, 1);
-       if (hp == NULL && errno == ECONNREFUSED)
-               hp = _gethtbyaddr(addr, len, type);
+       hp = getanswer(&buf, n, 1);

        if (hp == NULL)
        if (hp == NULL)

-               return(NULL);
+               return ((struct hostent *) NULL);

        hp->h_addrtype = type;
        hp->h_length = len;
        h_addr_ptrs[0] = (char *)&host_addr;
        h_addr_ptrs[1] = (char *)0;
        host_addr = *(struct in_addr *)addr;
        hp->h_addrtype = type;
        hp->h_length = len;
        h_addr_ptrs[0] = (char *)&host_addr;
        h_addr_ptrs[1] = (char *)0;
        host_addr = *(struct in_addr *)addr;

+#if BSD < 43 && !defined(h_addr)       /* new-style hostent structure */
+       hp->h_addr = h_addr_ptrs[0];
+#endif

        return(hp);
 }
 
        return(hp);
 }
 

-char *
-hostalias(name)
-       register char *name;
-{
-       register char *C1, *C2;
-       FILE *fp;
-       char *file, *getenv(), *strcpy(), *strncpy();
-       char buf[BUFSIZ];
-       static char abuf[MAXDNAME];
-
-       file = getenv("HOSTALIASES");
-       if (file == NULL || (fp = fopen(file, "r")) == NULL)
-               return (NULL);
-       buf[sizeof(buf) - 1] = '\0';
-       while (fgets(buf, sizeof(buf), fp)) {
-               for (C1 = buf; *C1 && !isspace(*C1); ++C1);
-               if (!*C1)
-                       break;
-               *C1 = '\0';
-               if (!strcasecmp(buf, name)) {
-                       while (isspace(*++C1));
-                       if (!*C1)
-                               break;
-                       for (C2 = C1 + 1; *C2 && !isspace(*C2); ++C2);
-                       abuf[sizeof(abuf) - 1] = *C2 = '\0';
-                       (void)strncpy(abuf, C1, sizeof(abuf) - 1);
-                       fclose(fp);
-                       return (abuf);
-               }
-       }
-       fclose(fp);
-       return (NULL);
-}
-

 _sethtent(f)
        int f;
 {
        if (hostf == NULL)
 _sethtent(f)
        int f;
 {
        if (hostf == NULL)

-               hostf = fopen(HOSTDB, "r" );
+               hostf = fopen(_PATH_HOSTS, "r" );

        else
                rewind(hostf);
        stayopen |= f;
        else
                rewind(hostf);
        stayopen |= f;


@@ -430,23 +352,23 @@ _gethtent()
        char *p;
        register char *cp, **q;
 
        char *p;
        register char *cp, **q;
 

-       if (hostf == NULL && (hostf = fopen(HOSTDB, "r" )) == NULL)
+       if (hostf == NULL && (hostf = fopen(_PATH_HOSTS, "r" )) == NULL)

                return (NULL);
 again:
                return (NULL);
 again:

-       if ((p = fgets(line, BUFSIZ, hostf)) == NULL)
+       if ((p = fgets(hostbuf, BUFSIZ, hostf)) == NULL)

                return (NULL);
        if (*p == '#')
                goto again;
                return (NULL);
        if (*p == '#')
                goto again;

-       cp = any(p, "#\n");
+       cp = strpbrk(p, "#\n");

        if (cp == NULL)
                goto again;
        *cp = '\0';
        if (cp == NULL)
                goto again;
        *cp = '\0';

-       cp = any(p, " \t");
+       cp = strpbrk(p, " \t");

        if (cp == NULL)
                goto again;
        *cp++ = '\0';
        /* THIS STUFF IS INTERNET SPECIFIC */
        if (cp == NULL)
                goto again;
        *cp++ = '\0';
        /* THIS STUFF IS INTERNET SPECIFIC */

-#if    BSD >= 43
+#if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */

        host.h_addr_list = host_addrs;
 #endif
        host.h_addr = hostaddr;
        host.h_addr_list = host_addrs;
 #endif
        host.h_addr = hostaddr;


@@ -457,7 +379,7 @@ again:
                cp++;
        host.h_name = cp;
        q = host.h_aliases = host_aliases;
                cp++;
        host.h_name = cp;
        q = host.h_aliases = host_aliases;

-       cp = any(cp, " \t");
+       cp = strpbrk(cp, " \t");

        if (cp != NULL) 
                *cp++ = '\0';
        while (cp && *cp) {
        if (cp != NULL) 
                *cp++ = '\0';
        while (cp && *cp) {


@@ -467,7 +389,7 @@ again:
                }
                if (q < &host_aliases[MAXALIASES - 1])
                        *q++ = cp;
                }
                if (q < &host_aliases[MAXALIASES - 1])
                        *q++ = cp;

-               cp = any(cp, " \t");
+               cp = strpbrk(cp, " \t");

                if (cp != NULL)
                        *cp++ = '\0';
        }
                if (cp != NULL)
                        *cp++ = '\0';
        }


@@ -475,22 +397,6 @@ again:
        return (&host);
 }
 
        return (&host);
 }
 

-static char *
-any(cp, match)
-       register char *cp;
-       char *match;
-{
-       register char *mp, c;
-
-       while (c = *cp) {
-               for (mp = match; *mp; mp++)
-                       if (*mp == c)
-                               return (cp);
-               cp++;
-       }
-       return ((char *)0);
-}
-

 struct hostent *
 _gethtbyname(name)
        char *name;
 struct hostent *
 _gethtbyname(name)
        char *name;


@@ -513,7 +419,7 @@ found:
 
 struct hostent *
 _gethtbyaddr(addr, len, type)
 
 struct hostent *
 _gethtbyaddr(addr, len, type)

-       char *addr;
+       const char *addr;

        int len, type;
 {
        register struct hostent *p;
        int len, type;
 {
        register struct hostent *p;