diff options
| -rw-r--r-- | sys/dev/pci/drm/drmP.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_san_obsd.c | 8 | ||||
| -rw-r--r-- | sys/net/if_pflow.c | 4 | ||||
| -rw-r--r-- | sys/net/if_pfsync.c | 4 | ||||
| -rw-r--r-- | sys/net/if_pppoe.c | 6 | ||||
| -rw-r--r-- | sys/netinet/ip_carp.c | 6 |
6 files changed, 16 insertions, 16 deletions
diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h index c4111721e99..4825fd6321e 100644 --- a/sys/dev/pci/drm/drmP.h +++ b/sys/dev/pci/drm/drmP.h @@ -1,4 +1,4 @@ -/* $OpenBSD: drmP.h,v 1.128 2011/06/02 18:22:00 weerd Exp $ */ +/* $OpenBSD: drmP.h,v 1.129 2012/04/11 17:42:53 mikeb Exp $ */ /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com */ @@ -99,7 +99,7 @@ #endif /* DRM_SUSER returns true if the user is superuser */ -#define DRM_SUSER(p) (suser(p, p->p_acflag) == 0) +#define DRM_SUSER(p) (suser(p, 0) == 0) #define DRM_MTRR_WC MDF_WRITECOMBINE #define PAGE_ALIGN(addr) (((addr) + PAGE_MASK) & ~PAGE_MASK) diff --git a/sys/dev/pci/if_san_obsd.c b/sys/dev/pci/if_san_obsd.c index 8571f221e01..ca0c5891e91 100644 --- a/sys/dev/pci/if_san_obsd.c +++ b/sys/dev/pci/if_san_obsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_san_obsd.c,v 1.12 2006/05/13 19:04:30 brad Exp $ */ +/* $OpenBSD: if_san_obsd.c,v 1.13 2012/04/11 17:42:53 mikeb Exp $ */ /*- * Copyright (c) 2001-2004 Sangoma Technologies (SAN) @@ -244,7 +244,7 @@ wanpipe_generic_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) goto ioctl_out; case SIOCSIFTIMESLOT: - if ((err = suser(p, p->p_acflag)) != 0) + if ((err = suser(p, 0)) != 0) goto ioctl_out; if (card->state != WAN_DISCONNECTED) { log(LOG_INFO, "%s: Unable to change timeslot map!\n", @@ -313,14 +313,14 @@ wanpipe_generic_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) case IF_PROTO_CISCO: case IF_PROTO_PPP: - if ((err = suser(p, p->p_acflag)) != 0) + if ((err = suser(p, 0)) != 0) goto ioctl_out; err = wp_lite_set_proto(ifp, (struct ifreq*)data); break; case IF_IFACE_T1: case IF_IFACE_E1: - if ((err = suser(p, p->p_acflag)) != 0) + if ((err = suser(p, 0)) != 0) goto ioctl_out; err = wp_lite_set_te1_cfg(ifp, (struct ifreq*)data); break; diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c index 45b24b9037d..372098cd90b 100644 --- a/sys/net/if_pflow.c +++ b/sys/net/if_pflow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflow.c,v 1.19 2012/02/02 12:34:37 benno Exp $ */ +/* $OpenBSD: if_pflow.c,v 1.20 2012/04/11 17:42:53 mikeb Exp $ */ /* * Copyright (c) 2011 Florian Obser <florian@narrans.de> @@ -345,7 +345,7 @@ pflowioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; case SIOCSETPFLOW: - if ((error = suser(p, p->p_acflag)) != 0) + if ((error = suser(p, 0)) != 0) return (error); if ((error = copyin(ifr->ifr_data, &pflowr, sizeof(pflowr)))) diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index 947cfe32db3..534c9d34ed2 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.183 2012/04/07 14:28:45 camield Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.184 2012/04/11 17:42:53 mikeb Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -1310,7 +1310,7 @@ pfsyncioctl(struct ifnet *ifp, u_long cmd, caddr_t data) return (copyout(&pfsyncr, ifr->ifr_data, sizeof(pfsyncr))); case SIOCSETPFSYNC: - if ((error = suser(p, p->p_acflag)) != 0) + if ((error = suser(p, 0)) != 0) return (error); if ((error = copyin(ifr->ifr_data, &pfsyncr, sizeof(pfsyncr)))) return (error); diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c index ff685077e71..6bb8c5546cf 100644 --- a/sys/net/if_pppoe.c +++ b/sys/net/if_pppoe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppoe.c,v 1.34 2012/01/19 01:13:20 sthen Exp $ */ +/* $OpenBSD: if_pppoe.c,v 1.35 2012/04/11 17:42:53 mikeb Exp $ */ /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */ /* @@ -920,8 +920,8 @@ pppoe_ioctl(struct ifnet *ifp, unsigned long cmd, caddr_t data) { struct pppoediscparms *parms = (struct pppoediscparms *)data; int len; - - if ((error = suser(p, p->p_acflag)) != 0) + + if ((error = suser(p, 0)) != 0) return (error); if (parms->eth_ifname[0] != '\0') { struct ifnet *eth_if; diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index cee7a87beac..c593ac70b02 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.194 2011/11/19 13:54:53 mikeb Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.195 2012/04/11 17:42:53 mikeb Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -2270,7 +2270,7 @@ carp_ioctl(struct ifnet *ifp, u_long cmd, caddr_t addr) case SIOCSVH: vhe = LIST_FIRST(&sc->carp_vhosts); - if ((error = suser(p, p->p_acflag)) != 0) + if ((error = suser(p, 0)) != 0) break; if ((error = copyin(ifr->ifr_data, &carpr, sizeof carpr))) break; @@ -2352,7 +2352,7 @@ carp_ioctl(struct ifnet *ifp, u_long cmd, caddr_t addr) } carpr.carpr_advbase = sc->sc_advbase; carpr.carpr_balancing = sc->sc_balancing; - if (suser(p, p->p_acflag) == 0) + if (suser(p, 0) == 0) bcopy(sc->sc_key, carpr.carpr_key, sizeof(carpr.carpr_key)); carpr.carpr_peer.s_addr = sc->sc_peer.s_addr; |