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 rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/raw_ip.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.89 retrieving revision 1.90 diff -u -p -r1.89 -r1.90 --- src/sys/netinet/raw_ip.c 2006/05/14 21:19:34 1.89 +++ src/sys/netinet/raw_ip.c 2006/07/23 22:06:13 1.90 @@ -1,4 +1,4 @@ -/* $NetBSD: raw_ip.c,v 1.89 2006/05/14 21:19:34 elad Exp $ */ +/* $NetBSD: raw_ip.c,v 1.90 2006/07/23 22:06:13 ad Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.89 2006/05/14 21:19:34 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.90 2006/07/23 22:06:13 ad Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -506,17 +506,15 @@ 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, p)); + (struct ifnet *)control, l)); if (req == PRU_PURGEIF) { in_pcbpurgeif0(&rawcbtable, (struct ifnet *)control); @@ -543,8 +541,8 @@ rip_usrreq(struct socket *so, int req, error = EISCONN; break; } - if (p == 0 || (error = kauth_authorize_generic(p->p_cred, - KAUTH_GENERIC_ISSUSER, &p->p_acflag))) { + if (l == 0 || (error = kauth_authorize_generic(l->l_cred, + KAUTH_GENERIC_ISSUSER, &l->l_acflag))) { error = EACCES; break; }