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/kern/uipc_socket.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.122.4.2
retrieving revision 1.133
diff -u -p -r1.122.4.2 -r1.133
--- src/sys/kern/uipc_socket.c	2007/01/12 01:04:07	1.122.4.2
+++ src/sys/kern/uipc_socket.c	2007/02/22 06:34:45	1.133
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.122.4.2 2007/01/12 01:04:07 ad Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.133 2007/02/22 06:34:45 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.122.4.2 2007/01/12 01:04:07 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.133 2007/02/22 06:34:45 thorpej Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -271,7 +271,7 @@ sodoloanfree(struct vm_page **pgs, caddr
 		pgs = alloca(npgs * sizeof(*pgs));
 
 		for (i = 0, va = sva; va < eva; i++, va += PAGE_SIZE) {
-			if (pmap_extract(pmap_kernel(), va, &pa) == FALSE)
+			if (pmap_extract(pmap_kernel(), va, &pa) == false)
 				panic("sodoloanfree: va 0x%lx not mapped", va);
 			pgs[i] = PHYS_TO_VM_PAGE(pa);
 		}
@@ -473,10 +473,11 @@ socreate(int dom, struct socket **aso, i
 	uid_t		uid;
 	int		error, s;
 
-	if (kauth_authorize_network(l->l_cred, KAUTH_NETWORK_SOCKET,
-	    KAUTH_REQ_NETWORK_SOCKET_OPEN, (void *)(u_long)dom,
-	    (void *)(u_long)type, (void *)(u_long)proto) != 0)
-		return (EPERM);
+	error = kauth_authorize_network(l->l_cred, KAUTH_NETWORK_SOCKET,
+	    KAUTH_REQ_NETWORK_SOCKET_OPEN, KAUTH_ARG(dom), KAUTH_ARG(type),
+	    KAUTH_ARG(proto));
+	if (error)
+		return (error);
 
 	if (proto)
 		prp = pffindproto(dom, proto, type);