diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index 539cbbffaa99..dff6e09998a4 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: an.c,v 1.46 2006/10/07 14:30:27 peter Exp $	*/
+/*	$NetBSD: an.c,v 1.47 2007/01/04 18:44:45 elad Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.46 2006/10/07 14:30:27 peter Exp $");
+__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.47 2007/01/04 18:44:45 elad Exp $");
 
 #include "bpfilter.h"
 
@@ -1300,7 +1300,7 @@ an_get_nwkey(struct an_softc *sc, struct ieee80211_nwkey *nwkey)
 			continue;
 		/* do not show any keys to non-root user */
 		if ((error = kauth_authorize_generic(curlwp->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &curlwp->l_acflag)) != 0)
+		    KAUTH_GENERIC_ISSUSER, NULL)) != 0)
 			break;
 		nwkey->i_key[i].i_keylen = sc->sc_wepkeys[i].an_wep_keylen;
 		if (nwkey->i_key[i].i_keylen < 0) {
diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c
index 5caabc3bc668..101ba00d53fa 100644
--- a/sys/dev/ic/midway.c
+++ b/sys/dev/ic/midway.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: midway.c,v 1.73 2006/07/21 16:48:49 ad Exp $	*/
+/*	$NetBSD: midway.c,v 1.74 2007/01/04 18:44:45 elad Exp $	*/
 /*	(sync'd to midway.c 1.68)	*/
 
 /*
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.73 2006/07/21 16:48:49 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.74 2007/01/04 18:44:45 elad Exp $");
 
 #include "opt_natm.h"
 
@@ -1309,7 +1309,7 @@ caddr_t data;
 		  struct ifnet *sifp;
 
 		  if ((error = kauth_authorize_generic(curlwp->l_cred,
-		     KAUTH_GENERIC_ISSUSER, &curlwp->l_acflag)) != 0)
+		     KAUTH_GENERIC_ISSUSER, NULL)) != 0)
 		    break;
 
 		  if ((sifp = en_pvcattach(ifp)) != NULL) {
@@ -1338,7 +1338,7 @@ caddr_t data;
 
 	case SIOCSPVCTX:
 		if ((error = kauth_authorize_generic(curlwp->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &curlwp->l_acflag)) == 0)
+		    KAUTH_GENERIC_ISSUSER, NULL)) == 0)
 			error = en_pvctx(sc, (struct pvctxreq *)data);
 		break;
 
diff --git a/sys/dev/ic/rrunner.c b/sys/dev/ic/rrunner.c
index 221dff798eff..de71a74b0490 100644
--- a/sys/dev/ic/rrunner.c
+++ b/sys/dev/ic/rrunner.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rrunner.c,v 1.59 2006/11/16 01:32:52 christos Exp $	*/
+/*	$NetBSD: rrunner.c,v 1.60 2007/01/04 18:44:45 elad Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.59 2006/11/16 01:32:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.60 2007/01/04 18:44:45 elad Exp $");
 
 #include "opt_inet.h"
 
@@ -3089,7 +3089,7 @@ esh_generic_ioctl(struct esh_softc *sc, u_long cmd, caddr_t data,
 
 		default:
 			error = kauth_authorize_generic(l->l_cred,
-			    KAUTH_GENERIC_ISSUSER, &l->l_acflag);
+			    KAUTH_GENERIC_ISSUSER, NULL);
 			if (error)
 				return (error);
 		}
diff --git a/sys/dev/ic/wi.c b/sys/dev/ic/wi.c
index e08a03a82e49..ebb257bb452f 100644
--- a/sys/dev/ic/wi.c
+++ b/sys/dev/ic/wi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wi.c,v 1.217 2006/11/16 01:32:52 christos Exp $	*/
+/*	$NetBSD: wi.c,v 1.218 2007/01/04 18:44:45 elad Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.217 2006/11/16 01:32:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.218 2007/01/04 18:44:45 elad Exp $");
 
 #define WI_HERMES_AUTOINC_WAR	/* Work around data write autoinc bug. */
 #define WI_HERMES_STATS_WAR	/* Work around stats counter bug. */
@@ -1407,7 +1407,7 @@ wi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		break;
 	case SIOCSIFGENERIC:
 		error = kauth_authorize_generic(curlwp->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &curlwp->l_acflag);
+		    KAUTH_GENERIC_ISSUSER, NULL);
 		if (error)
 			break;
 		error = wi_set_cfg(ifp, cmd, data);
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index 1fef93b7d6d5..90796f860bc6 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.69.2.6 2005/03/31 04:24:36 wpaul Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.11 2006/09/11 21:17:18 rittera Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.12 2007/01/04 18:44:46 elad Exp $");
 #endif
 
 #ifdef __FreeBSD__
@@ -2772,7 +2772,7 @@ ndis_wi_ioctl_set(ifp, command, data)
 	error = suser(curthread);
 #else /* __NetBSD__ */
 	error = kauth_authorize_generic(curlwp->l_cred,
-	    KAUTH_GENERIC_ISSUSER, &curlwp->l_acflag);
+	    KAUTH_GENERIC_ISSUSER, NULL);
 #endif	
 	if (error)
 		return (error);
diff --git a/sys/dev/pci/if_lmc.h b/sys/dev/pci/if_lmc.h
index 51b3151addd8..9d7268995f85 100644
--- a/sys/dev/pci/if_lmc.h
+++ b/sys/dev/pci/if_lmc.h
@@ -1,5 +1,5 @@
 /*-
- * $NetBSD: if_lmc.h,v 1.6 2006/08/27 19:19:47 christos Exp $
+ * $NetBSD: if_lmc.h,v 1.7 2007/01/04 18:44:46 elad Exp $
  *
  * Copyright (c) 2002-2006 David Boggs. (boggs@boggs.palo-alto.ca.us)
  * All rights reserved.
@@ -1061,7 +1061,7 @@ typedef int intr_return_t;
 # define TOP_UNLOCK(sc)		__cpu_simple_unlock  (&(sc)->top_lock)
 # define BOTTOM_TRYLOCK(sc)	__cpu_simple_lock_try(&(sc)->bottom_lock)
 # define BOTTOM_UNLOCK(sc)	__cpu_simple_unlock  (&(sc)->bottom_lock)
-# define CHECK_CAP		kauth_authorize_generic(curlwp->l_cred, KAUTH_GENERIC_ISSUSER, &curlwp->l_acflag)
+# define CHECK_CAP		kauth_authorize_generic(curlwp->l_cred, KAUTH_GENERIC_ISSUSER, NULL)
 # define DISABLE_INTR		int spl = splnet()
 # define ENABLE_INTR		splx(spl)
 # define IRQ_NONE		0
diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c
index 764f91987d8e..843290e7a989 100644
--- a/sys/dev/pcmcia/if_cnw.c
+++ b/sys/dev/pcmcia/if_cnw.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cnw.c,v 1.38 2006/11/16 01:33:20 christos Exp $	*/
+/*	$NetBSD: if_cnw.c,v 1.39 2007/01/04 18:44:46 elad Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -112,7 +112,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.38 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.39 2007/01/04 18:44:46 elad Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"
@@ -1094,7 +1094,7 @@ cnw_ioctl(ifp, cmd, data)
 
 	case SIOCSCNWDOMAIN:
 		error = kauth_authorize_generic(l->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &l->l_acflag);
+		    KAUTH_GENERIC_ISSUSER, NULL);
 		if (error)
 			break;
 		error = cnw_setdomain(sc, ifr->ifr_domain);
@@ -1102,7 +1102,7 @@ cnw_ioctl(ifp, cmd, data)
 
 	case SIOCSCNWKEY:
 		error = kauth_authorize_generic(l->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &l->l_acflag);
+		    KAUTH_GENERIC_ISSUSER, NULL);
 		if (error)
 			break;
 		error = cnw_setkey(sc, ifr->ifr_key);
@@ -1110,7 +1110,7 @@ cnw_ioctl(ifp, cmd, data)
 
 	case SIOCGCNWSTATUS:
 		error = kauth_authorize_generic(l->l_cred,
-		     KAUTH_GENERIC_ISSUSER, &l->l_acflag);
+		     KAUTH_GENERIC_ISSUSER, NULL);
 		if (error)
 			break;
 		if ((ifp->if_flags & IFF_RUNNING) == 0)
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c
index d30f240965ad..7c626aa7673f 100644
--- a/sys/dev/rnd.c
+++ b/sys/dev/rnd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rnd.c,v 1.57 2006/11/16 01:32:45 christos Exp $	*/
+/*	$NetBSD: rnd.c,v 1.58 2007/01/04 18:44:45 elad Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.57 2006/11/16 01:32:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.58 2007/01/04 18:44:45 elad Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -513,7 +513,7 @@ rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag,
 
 	case RNDGETPOOLSTAT:
 		if ((ret = kauth_authorize_generic(l->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &l->l_acflag)) != 0)
+		    KAUTH_GENERIC_ISSUSER, NULL)) != 0)
 			return (ret);
 
 		s = splsoftclock();
@@ -523,7 +523,7 @@ rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag,
 
 	case RNDGETSRCNUM:
 		if ((ret = kauth_authorize_generic(l->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &l->l_acflag)) != 0)
+		    KAUTH_GENERIC_ISSUSER, NULL)) != 0)
 			return (ret);
 
 		rst = (rndstat_t *)addr;
@@ -567,7 +567,7 @@ rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag,
 
 	case RNDGETSRCNAME:
 		if ((ret = kauth_authorize_generic(l->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &l->l_acflag)) != 0)
+		    KAUTH_GENERIC_ISSUSER, NULL)) != 0)
 			return (ret);
 
 		/*
@@ -591,7 +591,7 @@ rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag,
 
 	case RNDCTL:
 		if ((ret = kauth_authorize_generic(l->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &l->l_acflag)) != 0)
+		    KAUTH_GENERIC_ISSUSER, NULL)) != 0)
 			return (ret);
 
 		/*
@@ -636,7 +636,7 @@ rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag,
 
 	case RNDADDDATA:
 		if ((ret = kauth_authorize_generic(l->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &l->l_acflag)) != 0)
+		    KAUTH_GENERIC_ISSUSER, NULL)) != 0)
 			return (ret);
 
 		rnddata = (rnddata_t *)addr;
diff --git a/sys/dev/tc/pxg.c b/sys/dev/tc/pxg.c
index 58dbfc4b23ad..5ed876a26f3b 100644
--- a/sys/dev/tc/pxg.c
+++ b/sys/dev/tc/pxg.c
@@ -1,4 +1,4 @@
-/* 	$NetBSD: pxg.c,v 1.24 2006/07/21 16:48:52 ad Exp $	*/
+/* 	$NetBSD: pxg.c,v 1.25 2007/01/04 18:44:46 elad Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.24 2006/07/21 16:48:52 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.25 2007/01/04 18:44:46 elad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -368,7 +368,7 @@ pxg_ioctl(struct stic_info *si, u_long cmd, caddr_t data, int flag,
 	case STICIO_START860:
 	case STICIO_RESET860:
 		if ((rv = kauth_authorize_generic(l->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &l->l_acflag)) != 0)
+		    KAUTH_GENERIC_ISSUSER, NULL)) != 0)
 			return (rv);
 		if (si->si_dispmode != WSDISPLAYIO_MODE_MAPPED)
 			return (EBUSY);
diff --git a/sys/dev/verified_exec.c b/sys/dev/verified_exec.c
index 7538697ea2ed..5e5013c2254b 100644
--- a/sys/dev/verified_exec.c
+++ b/sys/dev/verified_exec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: verified_exec.c,v 1.52 2006/11/30 16:53:48 elad Exp $	*/
+/*	$NetBSD: verified_exec.c,v 1.53 2007/01/04 18:44:45 elad Exp $	*/
 
 /*-
  * Copyright 2005 Elad Efrat <elad@NetBSD.org>
@@ -31,9 +31,9 @@
 
 #include <sys/cdefs.h>
 #if defined(__NetBSD__)
-__KERNEL_RCSID(0, "$NetBSD: verified_exec.c,v 1.52 2006/11/30 16:53:48 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: verified_exec.c,v 1.53 2007/01/04 18:44:45 elad Exp $");
 #else
-__RCSID("$Id: verified_exec.c,v 1.52 2006/11/30 16:53:48 elad Exp $\n$NetBSD: verified_exec.c,v 1.52 2006/11/30 16:53:48 elad Exp $");
+__RCSID("$Id: verified_exec.c,v 1.53 2007/01/04 18:44:45 elad Exp $\n$NetBSD: verified_exec.c,v 1.53 2007/01/04 18:44:45 elad Exp $");
 #endif
 
 #include <sys/param.h>
@@ -120,8 +120,7 @@ veriexecopen(dev_t dev, int flags,
 		    dev);
 	}
 
-	if (kauth_authorize_generic(l->l_cred, KAUTH_GENERIC_ISSUSER,
-	    &l->l_acflag) != 0)
+	if (kauth_authorize_generic(l->l_cred, KAUTH_GENERIC_ISSUSER, NULL))
 		return (EPERM);
 
 	if (veriexec_dev_usage > 0) {
diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c
index 4c88a0d644cf..49a733164753 100644
--- a/sys/dev/vme/xd.c
+++ b/sys/dev/vme/xd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xd.c,v 1.64 2006/08/27 19:18:08 christos Exp $	*/
+/*	$NetBSD: xd.c,v 1.65 2007/01/04 18:44:46 elad Exp $	*/
 
 /*
  *
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.64 2006/08/27 19:18:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.65 2007/01/04 18:44:46 elad Exp $");
 
 #undef XDC_DEBUG		/* full debug */
 #define XDC_DIAG		/* extra sanity checks */
@@ -1122,7 +1122,7 @@ xdioctl(dev, command, addr, flag, l)
 	case DIOSXDCMD:
 		xio = (struct xd_iocmd *) addr;
 		if ((error = kauth_authorize_generic(l->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &l->l_acflag)) != 0)
+		    KAUTH_GENERIC_ISSUSER, NULL)) != 0)
 			return (error);
 		return (xdc_ioctlcmd(xd, dev, xio));
 
diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c
index 034e144b7701..e5c853eb97fc 100644
--- a/sys/dev/vme/xy.c
+++ b/sys/dev/vme/xy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xy.c,v 1.67 2006/08/27 19:18:08 christos Exp $	*/
+/*	$NetBSD: xy.c,v 1.68 2007/01/04 18:44:46 elad Exp $	*/
 
 /*
  *
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.67 2006/08/27 19:18:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.68 2007/01/04 18:44:46 elad Exp $");
 
 #undef XYC_DEBUG		/* full debug */
 #undef XYC_DIAG			/* extra sanity checks */
@@ -1034,7 +1034,7 @@ xyioctl(dev, command, addr, flag, l)
 	case DIOSXDCMD:
 		xio = (struct xd_iocmd *) addr;
 		if ((error = kauth_authorize_generic(l->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &l->l_acflag)) != 0)
+		    KAUTH_GENERIC_ISSUSER, NULL)) != 0)
 			return (error);
 		return (xyc_ioctlcmd(xy, dev, xio));
 
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index bbfb5fe5090f..cb8a0ded2e40 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.98 2006/11/16 01:33:31 christos Exp $ */
+/* $NetBSD: wskbd.c,v 1.99 2007/01/04 18:44:46 elad Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.98 2006/11/16 01:33:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.99 2007/01/04 18:44:46 elad Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -1024,7 +1024,7 @@ getbell:
 
 	case WSKBDIO_SETDEFAULTBELL:
 		if (p && (error = kauth_authorize_generic(l->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &l->l_acflag)) != 0)
+		    KAUTH_GENERIC_ISSUSER, NULL)) != 0)
 			return (error);
 		kbdp = &wskbd_default_bell_data;
 		goto setbell;
@@ -1063,7 +1063,7 @@ getkeyrepeat:
 
 	case WSKBDIO_SETDEFAULTKEYREPEAT:
 		if ((error = kauth_authorize_generic(l->l_cred,
-		    KAUTH_GENERIC_ISSUSER, &l->l_acflag)) != 0)
+		    KAUTH_GENERIC_ISSUSER, NULL)) != 0)
 			return (error);
 		kkdp = &wskbd_default_keyrepeat_data;
 		goto setkeyrepeat;