BSD 4_3_Tahoe release

[unix-history] / usr / src / sys / netns / ns_pcb.c

diff --git a/usr/src/sys/netns/ns_pcb.c b/usr/src/sys/netns/ns_pcb.c
index e2e0312..7c3f7f0 100644 (file)
--- a/usr/src/sys/netns/ns_pcb.c
+++ b/usr/src/sys/netns/ns_pcb.c
@@ -1,9 +1,20 @@
 /*
 /*

- * Copyright (c) 1984, 1985, 1986 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1984, 1985, 1986, 1987 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)ns_pcb.c    7.2 (Berkeley) %G%
+ * 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.
+ *
+ *     @(#)ns_pcb.c    7.5 (Berkeley) 6/29/88

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -95,7 +106,6 @@ ns_pcbconnect(nsp, nam)
 {
        struct ns_ifaddr *ia;
        register struct sockaddr_ns *sns = mtod(nam, struct sockaddr_ns *);
 {
        struct ns_ifaddr *ia;
        register struct sockaddr_ns *sns = mtod(nam, struct sockaddr_ns *);

-       struct sockaddr_ns *ifaddr;

        register struct ns_addr *dst;
 
        if (nam->m_len != sizeof (*sns))
        register struct ns_addr *dst;
 
        if (nam->m_len != sizeof (*sns))