usr new form of suser()

SCCS-vsn: sys/netns/ns.c 7.5
SCCS-vsn: sys/netns/idp_usrreq.c 7.7

diff --git a/usr/src/sys/netns/idp_usrreq.c b/usr/src/sys/netns/idp_usrreq.c
index e2278d9..502fc89 100644 (file)
--- a/usr/src/sys/netns/idp_usrreq.c
+++ b/usr/src/sys/netns/idp_usrreq.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)idp_usrreq.c        7.6 (Berkeley) %G%
+ *     @(#)idp_usrreq.c        7.7 (Berkeley) %G%

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


@@ -528,7 +528,7 @@ idp_raw_usrreq(so, req, m, nam, rights)
 
        case PRU_ATTACH:
 
 
        case PRU_ATTACH:
 

-               if (!suser() || (nsp != NULL)) {
+               if (suser(u.u_cred, &u.u_acflag) || (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 e5ce2c9..ada4086 100644 (file)
--- a/usr/src/sys/netns/ns.c
+++ b/usr/src/sys/netns/ns.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)ns.c        7.4 (Berkeley) %G%
+ *     @(#)ns.c        7.5 (Berkeley) %G%

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


@@ -57,7 +57,7 @@ ns_control(so, cmd, data, ifp)
        struct ifaddr *ifa;
        struct ns_ifaddr *oia;
        struct mbuf *m;
        struct ifaddr *ifa;
        struct ns_ifaddr *oia;
        struct mbuf *m;

-       int dstIsNew, hostIsNew;
+       int error, dstIsNew, hostIsNew;

 
        /*
         * Find address for this interface, if it exists.
 
        /*
         * Find address for this interface, if it exists.


@@ -94,8 +94,8 @@ ns_control(so, cmd, data, ifp)
                return (0);
        }
 
                return (0);
        }
 

-       if (!suser())
-               return (u.u_error);
+       if (error = suser(u.u_cred, &u.u_acflag))
+               return (error);

 
        switch (cmd) {
        case SIOCAIFADDR:
 
        switch (cmd) {
        case SIOCAIFADDR: