20 files changed, 58 insertions, 53 deletions

diff --git a/src/lib/libc/crypt/arc4random.c b/src/lib/libc/crypt/arc4random.c
index 078f4eeea6..d34de2be7d 100644
--- a/src/lib/libc/crypt/arc4random.c
+++ b/src/lib/libc/crypt/arc4random.c
@@ -1,4 +1,4 @@
-/* $Id: arc4random.c,v 1.1 1996/12/28 06:33:01 dm Exp $ */
+/* $Id: arc4random.c,v 1.2 1997/07/09 01:08:16 millert Exp $ */
 
 /*
  * Arc4 random number generator for OpenBSD.
@@ -25,8 +25,9 @@
  * RC4 is a registered trademark of RSA Laboratories.
  */
 
-#include <stdlib.h>
 #include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/time.h>
 
diff --git a/src/lib/libc/crypt/bcrypt.c b/src/lib/libc/crypt/bcrypt.c
index 0a0cca14a1..6f78afdddf 100644
--- a/src/lib/libc/crypt/bcrypt.c
+++ b/src/lib/libc/crypt/bcrypt.c
@@ -1,4 +1,5 @@
-/* $OpenBSD: bcrypt.c,v 1.6 1997/07/01 20:12:43 provos Exp $ */
+/*      $OpenBSD: bcrypt.c,v 1.7 1997/07/09 01:08:18 millert Exp $      */
+
 /*
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
  * All rights reserved.
@@ -48,6 +49,7 @@
 #include <stdio.h>
 #endif
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <string.h>
diff --git a/src/lib/libc/crypt/crypt.c b/src/lib/libc/crypt/crypt.c
index caa58df486..a3a1338023 100644
--- a/src/lib/libc/crypt/crypt.c
+++ b/src/lib/libc/crypt/crypt.c
@@ -50,7 +50,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crypt.c,v 1.10 1997/03/30 20:24:46 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: crypt.c,v 1.11 1997/07/09 01:08:14 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -612,7 +612,7 @@ crypt(key, setting)
          */
         q = (u_char *) keybuf;
         while ((q - (u_char *) keybuf) < sizeof(keybuf)) {
-                if (*q++ = *key << 1)
+                if ((*q++ = *key << 1))
                         key++;
         }
         if (des_setkey((u_char *) keybuf))
diff --git a/src/lib/libc/net/base64.c b/src/lib/libc/net/base64.c
index 59788bee1b..a2055f5cc3 100644
--- a/src/lib/libc/net/base64.c
+++ b/src/lib/libc/net/base64.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: base64.c,v 1.1 1997/03/13 19:07:22 downsj Exp $       */
+/*      $OpenBSD: base64.c,v 1.2 1997/07/09 01:08:24 millert Exp $      */
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -278,7 +278,7 @@ b64_pton(src, target, targsize)
 
                 case 2:         /* Valid, means one byte of info */
                         /* Skip any number of spaces. */
-                        for (NULL; ch != '\0'; ch = *src++)
+                        for (; ch != '\0'; ch = *src++)
                                 if (!isspace(ch))
                                         break;
                         /* Make sure there is another trailing = sign. */
@@ -293,7 +293,7 @@ b64_pton(src, target, targsize)
                          * We know this char is an =.  Is there anything but
                          * whitespace after it?
                          */
-                        for (NULL; ch != '\0'; ch = *src++)
+                        for (; ch != '\0'; ch = *src++)
                                 if (!isspace(ch))
                                         return (-1);
 
diff --git a/src/lib/libc/net/gethostnamadr.c b/src/lib/libc/net/gethostnamadr.c
index 2cb69be722..266651b152 100644
--- a/src/lib/libc/net/gethostnamadr.c
+++ b/src/lib/libc/net/gethostnamadr.c
@@ -52,7 +52,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.25 1997/04/29 19:28:38 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.26 1997/07/09 01:08:26 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -769,7 +769,7 @@ _gethtent()
                 cp++;
         host.h_name = cp;
         q = host.h_aliases = host_aliases;
-        if (cp = strpbrk(cp, " \t"))
+        if ((cp = strpbrk(cp, " \t")))
                 *cp++ = '\0';
         while (cp && *cp) {
                 if (*cp == ' ' || *cp == '\t') {
@@ -778,7 +778,7 @@ _gethtent()
                 }
                 if (q < &host_aliases[MAXALIASES - 1])
                         *q++ = cp;
-                if (cp = strpbrk(cp, " \t"))
+                if ((cp = strpbrk(cp, " \t")))
                         *cp++ = '\0';
         }
         *q = NULL;
@@ -816,7 +816,7 @@ _gethtbyname2(name, af)
         register char **cp;
         
         _sethtent(0);
-        while (p = _gethtent()) {
+        while ((p = _gethtent())) {
                 if (p->h_addrtype != af)
                         continue;
                 if (strcasecmp(p->h_name, name) == 0)
@@ -838,7 +838,7 @@ _gethtbyaddr(addr, len, af)
         register struct hostent *p;
 
         _sethtent(0);
-        while (p = _gethtent())
+        while ((p = _gethtent()))
                 if (p->h_addrtype == af && !bcmp(p->h_addr, addr, len))
                         break;
         _endhtent();
diff --git a/src/lib/libc/net/getnetbyaddr.c b/src/lib/libc/net/getnetbyaddr.c
index 76431a79a9..925d1d5895 100644
--- a/src/lib/libc/net/getnetbyaddr.c
+++ b/src/lib/libc/net/getnetbyaddr.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getnetbyaddr.c,v 1.4 1997/04/05 21:13:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: getnetbyaddr.c,v 1.5 1997/07/09 01:08:28 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <netdb.h>
@@ -47,7 +47,7 @@ _getnetbyaddr(net, type)
         register struct netent *p;
 
         setnetent(_net_stayopen);
-        while (p = getnetent())
+        while ((p = getnetent()))
                 if (p->n_addrtype == type && p->n_net == net)
                         break;
         if (!_net_stayopen)
diff --git a/src/lib/libc/net/getnetbyname.c b/src/lib/libc/net/getnetbyname.c
index 764c78b361..4e39cf6860 100644
--- a/src/lib/libc/net/getnetbyname.c
+++ b/src/lib/libc/net/getnetbyname.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getnetbyname.c,v 1.4 1997/03/13 19:07:26 downsj Exp $";
+static char rcsid[] = "$OpenBSD: getnetbyname.c,v 1.5 1997/07/09 01:08:29 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <netdb.h>
@@ -48,7 +48,7 @@ _getnetbyname(name)
         register char **cp;
 
         setnetent(_net_stayopen);
-        while (p = getnetent()) {
+        while ((p = getnetent())) {
                 if (strcasecmp(p->n_name, name) == 0)
                         break;
                 for (cp = p->n_aliases; *cp != 0; cp++)
diff --git a/src/lib/libc/net/getproto.c b/src/lib/libc/net/getproto.c
index 2af98dc38d..474d8d9427 100644
--- a/src/lib/libc/net/getproto.c
+++ b/src/lib/libc/net/getproto.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getproto.c,v 1.2 1996/08/19 08:28:49 tholo Exp $";
+static char rcsid[] = "$OpenBSD: getproto.c,v 1.3 1997/07/09 01:08:31 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <netdb.h>
@@ -46,7 +46,7 @@ getprotobynumber(proto)
         register struct protoent *p;
 
         setprotoent(_proto_stayopen);
-        while (p = getprotoent())
+        while ((p = getprotoent()))
                 if (p->p_proto == proto)
                         break;
         if (!_proto_stayopen)
diff --git a/src/lib/libc/net/getprotoname.c b/src/lib/libc/net/getprotoname.c
index 0b057a5dd2..7a4e5fede5 100644
--- a/src/lib/libc/net/getprotoname.c
+++ b/src/lib/libc/net/getprotoname.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getprotoname.c,v 1.2 1996/08/19 08:28:53 tholo Exp $";
+static char rcsid[] = "$OpenBSD: getprotoname.c,v 1.3 1997/07/09 01:08:32 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <netdb.h>
@@ -48,7 +48,7 @@ getprotobyname(name)
         register char **cp;
 
         setprotoent(_proto_stayopen);
-        while (p = getprotoent()) {
+        while ((p = getprotoent())) {
                 if (strcmp(p->p_name, name) == 0)
                         break;
                 for (cp = p->p_aliases; *cp != 0; cp++)
diff --git a/src/lib/libc/net/getservbyname.c b/src/lib/libc/net/getservbyname.c
index 269bc5c57a..25f0e27d06 100644
--- a/src/lib/libc/net/getservbyname.c
+++ b/src/lib/libc/net/getservbyname.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getservbyname.c,v 1.2 1996/08/19 08:28:55 tholo Exp $";
+static char rcsid[] = "$OpenBSD: getservbyname.c,v 1.3 1997/07/09 01:08:34 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <netdb.h>
@@ -48,7 +48,7 @@ getservbyname(name, proto)
         register char **cp;
 
         setservent(_serv_stayopen);
-        while (p = getservent()) {
+        while ((p = getservent())) {
                 if (strcmp(name, p->s_name) == 0)
                         goto gotname;
                 for (cp = p->s_aliases; *cp; cp++)
diff --git a/src/lib/libc/net/getservbyport.c b/src/lib/libc/net/getservbyport.c
index f1911e8dcd..4b063760d2 100644
--- a/src/lib/libc/net/getservbyport.c
+++ b/src/lib/libc/net/getservbyport.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getservbyport.c,v 1.2 1996/08/19 08:28:57 tholo Exp $";
+static char rcsid[] = "$OpenBSD: getservbyport.c,v 1.3 1997/07/09 01:08:35 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <netdb.h>
@@ -48,7 +48,7 @@ getservbyport(port, proto)
         register struct servent *p;
 
         setservent(_serv_stayopen);
-        while (p = getservent()) {
+        while ((p = getservent())) {
                 if (p->s_port != port)
                         continue;
                 if (proto == 0 || strcmp(p->s_proto, proto) == 0)
diff --git a/src/lib/libc/net/inet_network.c b/src/lib/libc/net/inet_network.c
index a5360b7252..8a9a555d62 100644
--- a/src/lib/libc/net/inet_network.c
+++ b/src/lib/libc/net/inet_network.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: inet_network.c,v 1.6 1997/04/24 08:35:21 tholo Exp $";
+static char rcsid[] = "$OpenBSD: inet_network.c,v 1.7 1997/07/09 01:08:37 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -60,7 +60,7 @@ again:
                 base = 8, cp++;
         if (*cp == 'x' || *cp == 'X')
                 base = 16, cp++;
-        while (c = *cp) {
+        while ((c = *cp)) {
                 if (isdigit(c)) {
                         val = (val * base) + (c - '0');
                         cp++;
diff --git a/src/lib/libc/net/ipx_addr.c b/src/lib/libc/net/ipx_addr.c
index 96ee9d0fdb..a76e03e913 100644
--- a/src/lib/libc/net/ipx_addr.c
+++ b/src/lib/libc/net/ipx_addr.c
@@ -37,7 +37,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ipx_addr.c,v 1.2 1996/08/19 08:29:18 tholo Exp $";
+static char rcsid[] = "$OpenBSD: ipx_addr.c,v 1.3 1997/07/09 01:08:39 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -66,7 +66,7 @@ ipx_addr(name)
          * form  2-272.AA001234H.01777, i.e. XDE standard.
          * Great efforts are made to insure backward compatability.
          */
-        if (hostname = strchr(buf, '#'))
+        if ((hostname = strchr(buf, '#')))
                 separator = '#';
         else {
                 hostname = strchr(buf, '.');
diff --git a/src/lib/libc/net/ns_addr.c b/src/lib/libc/net/ns_addr.c
index 96e01e2106..9a4483a209 100644
--- a/src/lib/libc/net/ns_addr.c
+++ b/src/lib/libc/net/ns_addr.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.2 1996/08/19 08:29:30 tholo Exp $";
+static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.3 1997/07/09 01:08:41 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -64,7 +64,7 @@ ns_addr(name)
          * form  2-272.AA001234H.01777, i.e. XDE standard.
          * Great efforts are made to insure backward compatability.
          */
-        if (hostname = strchr(buf, '#'))
+        if ((hostname = strchr(buf, '#')))
                 separator = '#';
         else {
                 hostname = strchr(buf, '.');
diff --git a/src/lib/libc/net/ns_ntoa.c b/src/lib/libc/net/ns_ntoa.c
index d65d6d84d8..472675e066 100644
--- a/src/lib/libc/net/ns_ntoa.c
+++ b/src/lib/libc/net/ns_ntoa.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ns_ntoa.c,v 1.4 1997/04/05 21:13:15 millert Exp $";
+static char rcsid[] = "$OpenBSD: ns_ntoa.c,v 1.5 1997/07/09 01:08:43 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -54,7 +54,7 @@ ns_ntoa(addr)
         u_char *uplim = up + 6;
 
         net.net_e = addr.x_net;
-        sprintf(obuf, "%lx", ntohl(net.long_e));
+        sprintf(obuf, "%x", ntohl(net.long_e));
         cp = spectHex(obuf);
         cp2 = cp + 1;
         while (*up==0 && up < uplim) up++;
diff --git a/src/lib/libc/net/nsap_addr.c b/src/lib/libc/net/nsap_addr.c
index e62d952a07..22a5f8d66e 100644
--- a/src/lib/libc/net/nsap_addr.c
+++ b/src/lib/libc/net/nsap_addr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: nsap_addr.c,v 1.3 1997/03/13 19:07:34 downsj Exp $    */
+/*      $OpenBSD: nsap_addr.c,v 1.4 1997/07/09 01:08:45 millert Exp $   */
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -21,7 +21,7 @@
 #if 0
 static char rcsid[] = "$From: nsap_addr.c,v 8.3 1996/08/05 08:31:35 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: nsap_addr.c,v 1.3 1997/03/13 19:07:34 downsj Exp $";
+static char rcsid[] = "$OpenBSD: nsap_addr.c,v 1.4 1997/07/09 01:08:45 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -58,7 +58,7 @@ inet_nsap_addr(ascii, binary, maxlen)
                         c = toupper(c);
                 if (isxdigit(c)) {
                         nib = xtob(c);
-                        if (c = *ascii++) {
+                        if ((c = *ascii++)) {
                                 c = toupper(c);
                                 if (isxdigit(c)) {
                                         *binary++ = (nib << 4) | xtob(c);
diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c
index 6e3ee93caf..4fbf602215 100644
--- a/src/lib/libc/net/rcmd.c
+++ b/src/lib/libc/net/rcmd.c
@@ -34,7 +34,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rcmd.c,v 1.25 1997/07/06 07:55:58 deraadt Exp $";
+static char *rcsid = "$OpenBSD: rcmd.c,v 1.26 1997/07/09 01:08:47 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -55,6 +55,7 @@ static char *rcsid = "$OpenBSD: rcmd.c,v 1.25 1997/07/06 07:55:58 deraadt Exp $"
 #include <string.h>
 #include <syslog.h>
 #include <stdlib.h>
+#include <netgroup.h>
 
 int     __ivaliduser __P((FILE *, in_addr_t, const char *, const char *));
 static int __icheckhost __P((u_int32_t, const char *));
diff --git a/src/lib/libc/net/res_comp.c b/src/lib/libc/net/res_comp.c
index 030400d2a0..f7a0358967 100644
--- a/src/lib/libc/net/res_comp.c
+++ b/src/lib/libc/net/res_comp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: res_comp.c,v 1.7 1997/04/30 05:54:44 tholo Exp $      */
+/*      $OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Exp $    */
 
 /*
  * ++Copyright++ 1985, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_comp.c  8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: res_comp.c,v 8.11 1996/12/02 09:17:22 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_comp.c,v 1.7 1997/04/30 05:54:44 tholo Exp $";
+static char rcsid[] = "$OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -106,7 +106,7 @@ dn_expand(msg, eomorig, comp_dn, exp_dn, length)
         /*
          * fetch next label in domain name
          */
-        while (n = *cp++) {
+        while ((n = *cp++)) {
                 /*
                  * Check for indirection
                  */
@@ -306,7 +306,7 @@ dn_find(exp_dn, msg, dnptrs, lastdnptr)
         for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
                 dn = exp_dn;
                 sp = cp = *cpp;
-                while (n = *cp++) {
+                while ((n = *cp++)) {
                         /*
                          * check for indirection
                          */
diff --git a/src/lib/libc/net/res_debug.c b/src/lib/libc/net/res_debug.c
index f002e11d7d..908ad421b7 100644
--- a/src/lib/libc/net/res_debug.c
+++ b/src/lib/libc/net/res_debug.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: res_debug.c,v 1.7 1997/04/30 05:54:43 tholo Exp $     */
+/*      $OpenBSD: res_debug.c,v 1.8 1997/07/09 01:08:51 millert Exp $   */
 
 /*
  * ++Copyright++ 1985, 1990, 1993
@@ -82,7 +82,7 @@
 static char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: res_debug.c,v 8.19 1996/11/26 10:11:23 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_debug.c,v 1.7 1997/04/30 05:54:43 tholo Exp $";
+static char rcsid[] = "$OpenBSD: res_debug.c,v 1.8 1997/07/09 01:08:51 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -201,7 +201,7 @@ do_rrset(msg, len, cp, cnt, pflag, file, hs)
          * Print answer records.
          */
         sflag = (_res.pfcode & pflag);
-        if (n = ntohs(cnt)) {
+        if ((n = ntohs(cnt))) {
                 if ((!_res.pfcode) ||
                     ((sflag) && (_res.pfcode & RES_PRF_HEAD1)))
                         fprintf(file, hs);
@@ -322,7 +322,7 @@ __fp_nquery(msg, len, file)
         /*
          * Print question records.
          */
-        if (n = ntohs(hp->qdcount)) {
+        if ((n = ntohs(hp->qdcount))) {
                 if ((!_res.pfcode) || (_res.pfcode & RES_PRF_QUES))
                         fprintf(file, ";; QUESTIONS:\n");
                 while (--n >= 0) {
@@ -632,7 +632,7 @@ __p_rr(cp, msg, file)
                 cp2 = cp1 + dlen;
                 while (cp < cp2) {
                         putc('"', file);
-                        if (n = (unsigned char) *cp++) {
+                        if ((n = (unsigned char) *cp++)) {
                                 for (c = n; c > 0 && cp < cp2; c--) {
                                         if (strchr("\n\"\\", *cp))
                                                 (void) putc('\\', file);
@@ -847,8 +847,8 @@ __p_rr(cp, msg, file)
         putc('\n', file);
 #endif
         if (cp - cp1 != dlen) {
-                fprintf(file, ";; packet size error (found %d, dlen was %d)\n",
-                        cp - cp1, dlen);
+                fprintf(file, ";; packet size error (found %ld, dlen was %d)\n",
+                        (long)(cp - cp1), dlen);
                 cp = NULL;
         }
         return (cp);
@@ -929,7 +929,7 @@ __sym_ston(syms, name, success)
         char *name;
         int *success;
 {
-        for (NULL; syms->name != 0; syms++) {
+        for (; syms->name != 0; syms++) {
                 if (strcasecmp (name, syms->name) == 0) {
                         if (success)
                                 *success = 1;
@@ -949,7 +949,7 @@ __sym_ntos(syms, number, success)
 {
         static char unname[20];
 
-        for (NULL; syms->name != 0; syms++) {
+        for (; syms->name != 0; syms++) {
                 if (number == syms->number) {
                         if (success)
                                 *success = 1;
@@ -972,7 +972,7 @@ __sym_ntop(syms, number, success)
 {
         static char unname[20];
 
-        for (NULL; syms->name != 0; syms++) {
+        for (; syms->name != 0; syms++) {
                 if (number == syms->number) {
                         if (success)
                                 *success = 1;
diff --git a/src/lib/libc/net/res_query.c b/src/lib/libc/net/res_query.c
index 4f3665f276..2e245b78cc 100644
--- a/src/lib/libc/net/res_query.c
+++ b/src/lib/libc/net/res_query.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: res_query.c,v 1.9 1997/04/06 07:55:04 deraadt Exp $   */
+/*      $OpenBSD: res_query.c,v 1.10 1997/07/09 01:08:53 millert Exp $  */
 
 /*
  * ++Copyright++ 1988, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: res_query.c,v 8.9 1996/09/22 00:13:28 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_query.c,v 1.9 1997/04/06 07:55:04 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: res_query.c,v 1.10 1997/07/09 01:08:53 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -77,6 +77,7 @@ static char rcsid[] = "$OpenBSD: res_query.c,v 1.9 1997/04/06 07:55:04 deraadt E
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #if PACKETSZ > 1024
 #define MAXPACKET       PACKETSZ