BSD 4_3_Net_2 release

[unix-history] / usr / src / sbin / XNSrouted / startup.c

diff --git a/usr/src/sbin/XNSrouted/startup.c b/usr/src/sbin/XNSrouted/startup.c
index e8e9faa..8887c1f 100644 (file)
--- a/usr/src/sbin/XNSrouted/startup.c
+++ b/usr/src/sbin/XNSrouted/startup.c
@@ -5,11 +5,37 @@
  * This file includes significant work done at Cornell University by
  * Bill Nesheim.  That work included by permission.
  *
  * This file includes significant work done at Cornell University by
  * Bill Nesheim.  That work included by permission.
  *

- * %sccs.include.redist.c%
+ * 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)startup.c  5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)startup.c  5.11 (Berkeley) 2/26/91";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -19,7 +45,7 @@ static char sccsid[] = "@(#)startup.c 5.9 (Berkeley) %G%";
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <nlist.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <nlist.h>

-#include <syslog.h>
+#include <stdlib.h>

 
 struct interface *ifnet;
 int    lookforinterfaces = 1;
 
 struct interface *ifnet;
 int    lookforinterfaces = 1;


@@ -66,6 +92,7 @@ ifinit()
        cplim = buf + ifc.ifc_len; /*skip over if's with big ifr_addr's */
        for (cp = buf; cp < cplim;
                        cp += sizeof (ifr->ifr_name) + size(ifr->ifr_addr)) {
        cplim = buf + ifc.ifc_len; /*skip over if's with big ifr_addr's */
        for (cp = buf; cp < cplim;
                        cp += sizeof (ifr->ifr_name) + size(ifr->ifr_addr)) {

+               ifr = (struct ifreq *)cp;

                bzero((char *)&ifs, sizeof(ifs));
                ifs.int_addr = ifr->ifr_addr;
                ifreq = *ifr;
                bzero((char *)&ifs, sizeof(ifs));
                ifs.int_addr = ifr->ifr_addr;
                ifreq = *ifr;