Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet/raw_ip.c,v retrieving revision 1.88.8.3 retrieving revision 1.89 diff -u -p -r1.88.8.3 -r1.89 --- src/sys/netinet/raw_ip.c 2006/09/14 12:31:55 1.88.8.3 +++ src/sys/netinet/raw_ip.c 2006/05/14 21:19:34 1.89 @@ -1,4 +1,4 @@ -/* $NetBSD: raw_ip.c,v 1.88.8.3 2006/09/14 12:31:55 yamt Exp $ */ +/* $NetBSD: raw_ip.c,v 1.89 2006/05/14 21:19:34 elad Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.88.8.3 2006/09/14 12:31:55 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.89 2006/05/14 21:19:34 elad Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -506,15 +506,17 @@ rip_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, struct mbuf *control, struct lwp *l) { struct inpcb *inp; + struct proc *p; int s; int error = 0; #ifdef MROUTING extern struct socket *ip_mrouter; #endif + p = l ? l->l_proc : NULL; if (req == PRU_CONTROL) return (in_control(so, (long)m, (caddr_t)nam, - (struct ifnet *)control, l)); + (struct ifnet *)control, p)); if (req == PRU_PURGEIF) { in_pcbpurgeif0(&rawcbtable, (struct ifnet *)control); @@ -541,10 +543,8 @@ rip_usrreq(struct socket *so, int req, error = EISCONN; break; } - if (l == 0 || (error = kauth_authorize_network(l->l_cred, - KAUTH_NETWORK_SOCKET, - (void *)KAUTH_REQ_NETWORK_SOCKET_RAWSOCK, so, NULL, - NULL))) { + if (p == 0 || (error = kauth_authorize_generic(p->p_cred, + KAUTH_GENERIC_ISSUSER, &p->p_acflag))) { error = EACCES; break; }