From owner-p4-projects@FreeBSD.ORG  Mon Jan 21 20:59:21 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4276116A53D; Mon, 21 Jan 2008 20:59:21 +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 AF51516A525
	for <perforce@freebsd.org>; Mon, 21 Jan 2008 20:59:20 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A8C1013C465
	for <perforce@freebsd.org>; Mon, 21 Jan 2008 20:59:20 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0LKxKf8002054
	for <perforce@freebsd.org>; Mon, 21 Jan 2008 20:59:20 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0LKxKS9002050
	for perforce@freebsd.org; Mon, 21 Jan 2008 20:59:20 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 21 Jan 2008 20:59:20 GMT
Message-Id: <200801212059.m0LKxKS9002050@repoman.freebsd.org>
X-Authentication-Warning: repoman.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>
Cc: 
Subject: PERFORCE change 133813 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Mon, 21 Jan 2008 20:59:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=133813

Change 133813 by rwatson@rwatson_freebsd_capabilities on 2008/01/21 20:58:39

	Correct logic in getsock_cap() to check for a socket and return it
	and file flags rather than check for a vnode.  Copy-and-paste-o.

Affected files ...

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

Differences ...

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

@@ -184,12 +184,14 @@
 		}
 	}
 #endif /* CAPABILITIES */
-	if (fp->f_vnode == NULL) {
-		error = EINVAL;
+	if (fp->f_type != DTYPE_SOCKET) {
+		error = ENOTSOCK;
 		fp = NULL;
 		goto out;
 	} else {
 		fhold(fp);
+		if (fflagp != NULL)
+			*fflagp = fp->f_flag;
 		error = 0;
 	}
 out: