1 files changed, 23 insertions, 29 deletions

diff --git a/src/lib/libc/net/getnetent.c b/src/lib/libc/net/getnetent.c
index b4e16b8f5d..1bec6fb98c 100644
--- a/src/lib/libc/net/getnetent.c
+++ b/src/lib/libc/net/getnetent.c
@@ -1,5 +1,4 @@
-/*      $NetBSD: getnetent.c,v 1.4 1995/02/25 06:20:33 cgd Exp $        */
-
+/*      $OpenBSD: getnetent.c,v 1.12 2006/01/17 15:37:58 millert Exp $ */
 /*
  * Copyright (c) 1983, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -12,11 +11,7 @@
  * 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
+ * 3. 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.
  *
@@ -33,15 +28,7 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getnetent.c 8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$NetBSD: getnetent.c,v 1.4 1995/02/25 06:20:33 cgd Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -58,8 +45,7 @@ static char *net_aliases[MAXALIASES];
 int _net_stayopen;
 
 void
-setnetent(f)
-        int f;
+setnetent(int f)
 {
         if (netf == NULL)
                 netf = fopen(_PATH_NETWORKS, "r" );
@@ -69,7 +55,7 @@ setnetent(f)
 }
 
 void
-endnetent()
+endnetent(void)
 {
         if (netf) {
                 fclose(netf);
@@ -79,24 +65,29 @@ endnetent()
 }
 
 struct netent *
-getnetent()
+getnetent(void)
 {
-        char *p;
-        register char *cp, **q;
+        char *p, *cp, **q;
+        size_t len;
 
         if (netf == NULL && (netf = fopen(_PATH_NETWORKS, "r" )) == NULL)
                 return (NULL);
 again:
-        p = fgets(line, BUFSIZ, netf);
-        if (p == NULL)
+        if ((p = fgetln(netf, &len)) == NULL)
                 return (NULL);
-        if (*p == '#')
+        if (p[len-1] == '\n')
+                len--;
+        if (len >= sizeof(line) || len == 0)
                 goto again;
-        cp = strpbrk(p, "#\n");
-        if (cp == NULL)
+        p = memcpy(line, p, len);
+        line[len] = '\0';
+        if (*p == '#')
                 goto again;
-        *cp = '\0';
+        if ((cp = strchr(p, '#')) != NULL)
+                *cp = '\0';
         net.n_name = p;
+        if (strlen(net.n_name) >= MAXHOSTNAMELEN-1)
+                net.n_name[MAXHOSTNAMELEN-1] = '\0';
         cp = strpbrk(p, " \t");
         if (cp == NULL)
                 goto again;
@@ -116,8 +107,11 @@ again:
                         cp++;
                         continue;
                 }
-                if (q < &net_aliases[MAXALIASES - 1])
+                if (q < &net_aliases[MAXALIASES - 1]) {
                         *q++ = cp;
+                        if (strlen(cp) >= MAXHOSTNAMELEN-1)
+                                cp[MAXHOSTNAMELEN-1] = '\0';
+                }
                 cp = strpbrk(cp, " \t");
                 if (cp != NULL)
                         *cp++ = '\0';