sockaddr's now require length (K. Sklower);

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

diff --git a/usr/src/lib/libc/net/getproto.c b/usr/src/lib/libc/net/getproto.c
index cab54f9..d9e5e0a 100644 (file)
--- a/usr/src/lib/libc/net/getproto.c
+++ b/usr/src/lib/libc/net/getproto.c
@@ -1,17 +1,39 @@
-/*     getproto.c      4.2     82/10/05        */
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)getproto.c 5.5 (Berkeley) %G%";
+#endif /* LIBC_SCCS and not lint */

 
 #include <netdb.h>
 
 
 #include <netdb.h>
 

+extern int _proto_stayopen;
+

 struct protoent *
 getprotobynumber(proto)
        register int proto;
 {
        register struct protoent *p;
 
 struct protoent *
 getprotobynumber(proto)
        register int proto;
 {
        register struct protoent *p;
 

-       setprotoent(0);
+       setprotoent(_proto_stayopen);

        while (p = getprotoent())
                if (p->p_proto == proto)
                        break;
        while (p = getprotoent())
                if (p->p_proto == proto)
                        break;

-       endprotoent();
+       if (!_proto_stayopen)
+               endprotoent();

        return (p);
 }
        return (p);
 }