From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 19:40:33 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E9DC91065670;
	Sat, 30 Jan 2010 19:40:33 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DAD0B8FC08;
	Sat, 30 Jan 2010 19:40:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UJeXro088697;
	Sat, 30 Jan 2010 19:40:33 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UJeX4j088695;
	Sat, 30 Jan 2010 19:40:33 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001301940.o0UJeX4j088695@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 19:40:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203233 - projects/capabilities8/sys/kern
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2010 19:40:34 -0000

Author: rwatson
Date: Sat Jan 30 19:40:33 2010
New Revision: 203233
URL: http://svn.freebsd.org/changeset/base/203233

Log:
  Merge c173616 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Trim slightly verbose printf in capability code.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/sys/kern/sys_capability.c

Modified: projects/capabilities8/sys/kern/sys_capability.c
==============================================================================
--- projects/capabilities8/sys/kern/sys_capability.c	Sat Jan 30 19:39:33 2010	(r203232)
+++ projects/capabilities8/sys/kern/sys_capability.c	Sat Jan 30 19:40:33 2010	(r203233)
@@ -50,7 +50,7 @@
 #include "opt_capabilities.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#28 $");
+__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#29 $");
 
 #include <sys/param.h>
 #include <sys/capability.h>
@@ -153,11 +153,8 @@ static int
 cap_check(struct capability *c, cap_rights_t rights)
 {
 
-	if ((c->cap_rights | rights) != c->cap_rights) {
-		printf("ENOTCAPABLE: %016x < %016x\n",
-		       (unsigned int) c->cap_rights, (unsigned int) rights);
+	if ((c->cap_rights | rights) != c->cap_rights)
 		return (ENOTCAPABLE);
-	}
 	return (0);
 }