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_syscalls.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_syscalls.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.86.2.3
retrieving revision 1.87
diff -u -p -r1.86.2.3 -r1.87
--- src/sys/kern/uipc_syscalls.c	2006/10/29 13:03:51	1.86.2.3
+++ src/sys/kern/uipc_syscalls.c	2004/05/18 11:31:49	1.87
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_syscalls.c,v 1.86.2.3 2006/10/29 13:03:51 tron Exp $	*/
+/*	$NetBSD: uipc_syscalls.c,v 1.87 2004/05/18 11:31:49 ragge Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.86.2.3 2006/10/29 13:03:51 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.87 2004/05/18 11:31:49 ragge Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_pipe.h"
@@ -242,12 +242,10 @@ sys_accept(struct lwp *l, void *v, regis
 			namelen = nam->m_len;
 		/* SHOULD COPY OUT A CHAIN HERE */
 		if ((error = copyout(mtod(nam, caddr_t),
-		    (caddr_t)SCARG(uap, name), namelen)) != 0 ||
-		    (error = copyout((caddr_t)&namelen,
-		    (caddr_t)SCARG(uap, anamelen),
-		    sizeof(*SCARG(uap, anamelen)))) != 0) {
-			soclose(so);
-		}
+		    (caddr_t)SCARG(uap, name), namelen)) == 0)
+			error = copyout((caddr_t)&namelen,
+			    (caddr_t)SCARG(uap, anamelen),
+			    sizeof(*SCARG(uap, anamelen)));
 	}
 	/* if an error occurred, free the file descriptor */
 	if (error) {
@@ -517,7 +515,7 @@ sendit(struct proc *p, int s, struct msg
 	} else
 		to = 0;
 	if (mp->msg_control) {
-		if (mp->msg_controllen < CMSG_ALIGN(sizeof(struct cmsghdr))) {
+		if (mp->msg_controllen < sizeof(struct cmsghdr)) {
 			error = EINVAL;
 			goto bad;
 		}