make compile under both new and old vm system

SCCS-vsn: sys/netns/spp_usrreq.c 7.15
SCCS-vsn: sys/netns/ns_input.c 7.8
SCCS-vsn: sys/netns/idp_usrreq.c 7.11
SCCS-vsn: sys/netns/ns.c 7.8
SCCS-vsn: sys/netns/ns_pcb.c 7.11

diff --git a/usr/src/sys/netns/idp_usrreq.c b/usr/src/sys/netns/idp_usrreq.c
index c50866d..90ec529 100644 (file)
--- a/usr/src/sys/netns/idp_usrreq.c
+++ b/usr/src/sys/netns/idp_usrreq.c
@@ -4,11 +4,10 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)idp_usrreq.c        7.10 (Berkeley) %G%
+ *     @(#)idp_usrreq.c        7.11 (Berkeley) %G%

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

-#include "user.h"

 #include "malloc.h"
 #include "mbuf.h"
 #include "protosw.h"
 #include "malloc.h"
 #include "mbuf.h"
 #include "protosw.h"


@@ -519,7 +518,7 @@ idp_raw_usrreq(so, req, m, nam, control)
 
        case PRU_ATTACH:
 
 
        case PRU_ATTACH:
 

-               if (suser(u.u_cred, &u.u_acflag) || (nsp != NULL)) {
+               if (!(so->so_state & SS_PRIV) || (nsp != NULL)) {

                        error = EINVAL;
                        break;
                }
                        error = EINVAL;
                        break;
                }

diff --git a/usr/src/sys/netns/ns.c b/usr/src/sys/netns/ns.c
index 87b0a8a..d300c7d 100644 (file)
--- a/usr/src/sys/netns/ns.c
+++ b/usr/src/sys/netns/ns.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ns.c        7.7 (Berkeley) %G%
+ *     @(#)ns.c        7.8 (Berkeley) %G%

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

diff --git a/usr/src/sys/netns/ns_input.c b/usr/src/sys/netns/ns_input.c
index 291d8bd..e0b12ec 100644 (file)
--- a/usr/src/sys/netns/ns_input.c
+++ b/usr/src/sys/netns/ns_input.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ns_input.c  7.7 (Berkeley) %G%
+ *     @(#)ns_input.c  7.8 (Berkeley) %G%

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


@@ -216,7 +216,7 @@ u_char nsctlerrmap[PRC_NCMDS] = {
        0,              0,              0,              0
 };
 
        0,              0,              0,              0
 };
 

-idp_donosocks = 1;
+int idp_donosocks = 1;

 
 idp_ctlinput(cmd, arg)
        int cmd;
 
 idp_ctlinput(cmd, arg)
        int cmd;


@@ -423,8 +423,6 @@ register struct route *ro;
 {
        if (ro->ro_rt) {RTFREE(ro->ro_rt);}
 }
 {
        if (ro->ro_rt) {RTFREE(ro->ro_rt);}
 }

-static union ns_net
-ns_zeronet;

 
 ns_watch_output(m, ifp)
 struct mbuf *m;
 
 ns_watch_output(m, ifp)
 struct mbuf *m;

diff --git a/usr/src/sys/netns/ns_pcb.c b/usr/src/sys/netns/ns_pcb.c
index e5263ce..8d2a8ce 100644 (file)
--- a/usr/src/sys/netns/ns_pcb.c
+++ b/usr/src/sys/netns/ns_pcb.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ns_pcb.c    7.10 (Berkeley) %G%
+ *     @(#)ns_pcb.c    7.11 (Berkeley) %G%

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

diff --git a/usr/src/sys/netns/spp_usrreq.c b/usr/src/sys/netns/spp_usrreq.c
index b7fc4e6..45d1e23 100644 (file)
--- a/usr/src/sys/netns/spp_usrreq.c
+++ b/usr/src/sys/netns/spp_usrreq.c
@@ -4,12 +4,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)spp_usrreq.c        7.14 (Berkeley) %G%
+ *     @(#)spp_usrreq.c        7.15 (Berkeley) %G%

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

-#include "user.h"

 #include "malloc.h"
 #include "mbuf.h"
 #include "protosw.h"
 #include "malloc.h"
 #include "mbuf.h"
 #include "protosw.h"