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
retrieving revision 1.167
retrieving revision 1.167.2.2
diff -u -p -r1.167 -r1.167.2.2
--- src/sys/kern/uipc_socket.c	2008/05/28 21:01:42	1.167
+++ src/sys/kern/uipc_socket.c	2008/07/28 14:37:36	1.167.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.167 2008/05/28 21:01:42 ad Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.167.2.2 2008/07/28 14:37:36 simonb Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.167 2008/05/28 21:01:42 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.167.2.2 2008/07/28 14:37:36 simonb Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -500,6 +500,8 @@ socreate(int dom, struct socket **aso, i
 #endif
 	uid = kauth_cred_geteuid(l->l_cred);
 	so->so_uidinfo = uid_find(uid);
+	so->so_egid = kauth_cred_getegid(l->l_cred);
+	so->so_cpid = l->l_proc->p_pid;
 	if (lockso != NULL) {
 		/* Caller wants us to share a lock. */
 		lock = lockso->so_lock;
@@ -643,23 +645,21 @@ soclose(struct socket *so)
 	solock(so);
 	if (so->so_options & SO_ACCEPTCONN) {
 		do {
-			if ((so2 = TAILQ_FIRST(&so->so_q0)) != 0) {
+			while ((so2 = TAILQ_FIRST(&so->so_q0)) != 0) {
 				KASSERT(solocked2(so, so2));
 				(void) soqremque(so2, 0);
 				/* soabort drops the lock. */
 				(void) soabort(so2);
 				solock(so);
-				continue;
 			}
-			if ((so2 = TAILQ_FIRST(&so->so_q)) != 0) {
+			while ((so2 = TAILQ_FIRST(&so->so_q)) != 0) {
 				KASSERT(solocked2(so, so2));
 				(void) soqremque(so2, 1);
 				/* soabort drops the lock. */
 				(void) soabort(so2);
 				solock(so);
-				continue;
 			}
-		} while (0);
+		} while (!TAILQ_EMPTY(&so->so_q0));
 	}
 	if (so->so_pcb == 0)
 		goto discard;