svn commit: r203233 - projects/capabilities8/sys/kern

[Robert Watson]

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);
 }