BSD 4_3_Net_2 release

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

diff --git a/usr/src/lib/libc/net/getnetbyaddr.c b/usr/src/lib/libc/net/getnetbyaddr.c
index cc5d2f4..58bf79e 100644 (file)
--- a/usr/src/lib/libc/net/getnetbyaddr.c
+++ b/usr/src/lib/libc/net/getnetbyaddr.c
@@ -1,25 +1,56 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * 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[] = "@(#)getnetbyaddr.c     5.2 (Berkeley) %G%";
-#endif LIBC_SCCS and not lint
+static char sccsid[] = "@(#)getnetbyaddr.c     5.7 (Berkeley) 6/1/90";
+#endif /* LIBC_SCCS and not lint */

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

+extern int _net_stayopen;
+

 struct netent *
 getnetbyaddr(net, type)
 struct netent *
 getnetbyaddr(net, type)

-       register int net, type;
+       register long net;
+       register int type;

 {
        register struct netent *p;
 
 {
        register struct netent *p;
 

-       setnetent(0);
+       setnetent(_net_stayopen);

        while (p = getnetent())
                if (p->n_addrtype == type && p->n_net == net)
                        break;
        while (p = getnetent())
                if (p->n_addrtype == type && p->n_net == net)
                        break;

-       endnetent();
+       if (!_net_stayopen)
+               endnetent();

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