From owner-p4-projects@FreeBSD.ORG  Wed Sep  1 12:31:20 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7759A1065697; Wed,  1 Sep 2010 12:31:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A6E61065674
	for <perforce@freebsd.org>; Wed,  1 Sep 2010 12:31:20 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 264D48FC23
	for <perforce@freebsd.org>; Wed,  1 Sep 2010 12:31:20 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o81CVK0w000606
	for <perforce@freebsd.org>; Wed, 1 Sep 2010 12:31:20 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o81CVKQX000602
	for perforce@freebsd.org; Wed, 1 Sep 2010 12:31:20 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 1 Sep 2010 12:31:20 GMT
Message-Id: <201009011231.o81CVKQX000602@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 183178 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Sep 2010 12:31:20 -0000

http://p4web.freebsd.org/@@183178?ac=10

Change 183178 by rwatson@rwatson_cinnamon_macosx on 2010/09/01 12:30:21

	Replace use of CAP_SHUTDOWN with CAP_SETSOCKOPT, as reported by
	Heradon Douglas.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_syscalls.c#20 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_syscalls.c#20 (text+ko) ====

@@ -1356,7 +1356,7 @@
 	}
 
 	AUDIT_ARG_FD(s);
-	error = getsock_cap(td->td_proc->p_fd, s, CAP_SHUTDOWN, &fp, NULL);
+	error = getsock_cap(td->td_proc->p_fd, s, CAP_SETSOCKOPT, &fp, NULL);
 	if (error == 0) {
 		so = fp->f_data;
 		CURVNET_SET(so->so_vnet);