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.209.2.2.2.2
retrieving revision 1.211.2.1
diff -u -p -r1.209.2.2.2.2 -r1.211.2.1
--- src/sys/kern/uipc_socket.c	2013/11/25 08:27:06	1.209.2.2.2.2
+++ src/sys/kern/uipc_socket.c	2012/11/20 03:02:44	1.211.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.209.2.2.2.2 2013/11/25 08:27:06 bouyer Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.211.2.1 2012/11/20 03:02:44 tls Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209.2.2.2.2 2013/11/25 08:27:06 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.211.2.1 2012/11/20 03:02:44 tls Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_sock_counters.h"
@@ -160,7 +160,7 @@ static void sopendfree_thread(void *);
 static kcondvar_t pendfree_thread_cv;
 static lwp_t *sopendfree_lwp;
 
-static void sysctl_kern_somaxkva_setup(void);
+static void sysctl_kern_socket_setup(void);
 static struct sysctllog *socket_sysctllog;
 
 static vsize_t
@@ -416,7 +416,7 @@ socket_listener_cb(kauth_cred_t cred, ka
 		/* Normal users can only drop their own connections. */
 		struct socket *so = (struct socket *)arg1;
 
-		if (so->so_cred && proc_uidmatch(cred, so->so_cred) == 0)
+		if (proc_uidmatch(cred, so->so_cred))
 			result = KAUTH_RESULT_ALLOW;
 
 		break;
@@ -453,7 +453,7 @@ void
 soinit(void)
 {
 
-	sysctl_kern_somaxkva_setup();
+	sysctl_kern_socket_setup();
 
 	mutex_init(&so_pendfree_lock, MUTEX_DEFAULT, IPL_VM);
 	softnet_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
@@ -585,8 +585,6 @@ fsocreate(int domain, struct socket **so
 		fp->f_data = so;
 		fd_affix(curproc, fp, fd);
 		*fdout = fd;
-		if (flags & SOCK_NONBLOCK)
-			so->so_state |= SS_NBIO;
 	}
 	return error;
 }
@@ -624,7 +622,7 @@ solisten(struct socket *so, int backlog,
 	if ((so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING | 
 	    SS_ISDISCONNECTING)) != 0) {
 	    	sounlock(so);
-		return (EOPNOTSUPP);
+		return (EINVAL);
 	}
 	error = (*so->so_proto->pr_usrreq)(so, PRU_LISTEN, NULL,
 	    NULL, NULL, l);
@@ -2368,6 +2366,7 @@ sopoll(struct socket *so, int events)
 #include <sys/sysctl.h>
 
 static int sysctl_kern_somaxkva(SYSCTLFN_PROTO);
+static int sysctl_kern_sbmax(SYSCTLFN_PROTO);
 
 /*
  * sysctl helper routine for kern.somaxkva.  ensures that the given
@@ -2398,8 +2397,32 @@ sysctl_kern_somaxkva(SYSCTLFN_ARGS)
 	return (error);
 }
 
+/*
+ * sysctl helper routine for kern.sbmax. Basically just ensures that
+ * any new value is not too small.
+ */
+static int
+sysctl_kern_sbmax(SYSCTLFN_ARGS)
+{
+	int error, new_sbmax;
+	struct sysctlnode node;
+
+	new_sbmax = sb_max;
+	node = *rnode;
+	node.sysctl_data = &new_sbmax;
+	error = sysctl_lookup(SYSCTLFN_CALL(&node));
+	if (error || newp == NULL)
+		return (error);
+
+	KERNEL_LOCK(1, NULL);
+	error = sb_max_set(new_sbmax);
+	KERNEL_UNLOCK_ONE(NULL);
+
+	return (error);
+}
+
 static void
-sysctl_kern_somaxkva_setup(void)
+sysctl_kern_socket_setup(void)
 {
 
 	KASSERT(socket_sysctllog == NULL);
@@ -2416,4 +2439,11 @@ sysctl_kern_somaxkva_setup(void)
 				    "used for socket buffers"),
 		       sysctl_kern_somaxkva, 0, NULL, 0,
 		       CTL_KERN, KERN_SOMAXKVA, CTL_EOL);
+
+	sysctl_createv(&socket_sysctllog, 0, NULL, NULL,
+		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+		       CTLTYPE_INT, "sbmax",
+		       SYSCTL_DESCR("Maximum socket buffer size"),
+		       sysctl_kern_sbmax, 0, NULL, 0,
+		       CTL_KERN, KERN_SBMAX, CTL_EOL);
 }