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.108.2.3
retrieving revision 1.112
diff -u -p -r1.108.2.3 -r1.112
--- src/sys/kern/uipc_socket.c	2006/10/25 12:58:56	1.108.2.3
+++ src/sys/kern/uipc_socket.c	2005/10/21 17:40:03	1.112
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.108.2.3 2006/10/25 12:58:56 ghen Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.112 2005/10/21 17:40:03 nathanw 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.108.2.3 2006/10/25 12:58:56 ghen Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.112 2005/10/21 17:40:03 nathanw Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -132,7 +132,7 @@ soinit(void)
 
 	/* Set the initial adjusted socket buffer size. */
 	if (sb_max_set(sb_max))
-		panic("bad initial sb_max value: %lu\n", sb_max);
+		panic("bad initial sb_max value: %lu", sb_max);
 
 }
 
@@ -234,7 +234,7 @@ sokvaalloc(vsize_t len, struct socket *s
 	 * allocate kva.
 	 */
 
-	lva = uvm_km_valloc_wait(kernel_map, len);
+	lva = uvm_km_alloc(kernel_map, len, 0, UVM_KMF_VAONLY | UVM_KMF_WAITVA);
 	if (lva == 0) {
 		sokvaunreserve(len);
 		return (0);
@@ -255,7 +255,7 @@ sokvafree(vaddr_t sva, vsize_t len)
 	 * free kva.
 	 */
 
-	uvm_km_free(kernel_map, sva, len);
+	uvm_km_free(kernel_map, sva, len, UVM_KMF_VAONLY);
 
 	/*
 	 * unreserve kva.
@@ -480,9 +480,9 @@ socreate(int dom, struct socket **aso, i
 	so->so_mowner = &prp->pr_domain->dom_mowner;
 #endif
 	if (p != 0)
-		so->so_uid = p->p_ucred->cr_uid;
+		so->so_uidinfo = uid_find(p->p_ucred->cr_uid);
 	else
-		so->so_uid = UID_MAX;
+		so->so_uidinfo = uid_find(0);
 	error = (*prp->pr_usrreq)(so, PRU_ATTACH, (struct mbuf *)0,
 	    (struct mbuf *)(long)proto, (struct mbuf *)0, p);
 	if (error) {
@@ -545,10 +545,10 @@ sofree(struct socket *so)
 			return;
 	}
 	if (so->so_rcv.sb_hiwat)
-		(void)chgsbsize(so->so_uid, &so->so_rcv.sb_hiwat, 0,
+		(void)chgsbsize(so->so_uidinfo, &so->so_rcv.sb_hiwat, 0,
 		    RLIM_INFINITY);
 	if (so->so_snd.sb_hiwat)
-		(void)chgsbsize(so->so_uid, &so->so_snd.sb_hiwat, 0,
+		(void)chgsbsize(so->so_uidinfo, &so->so_snd.sb_hiwat, 0,
 		    RLIM_INFINITY);
 	sbrelease(&so->so_snd, so);
 	sorflush(so);