From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 18:33:11 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 0AA8F1065672;
	Sat, 30 Jan 2010 18:33:11 +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 EF4F58FC13;
	Sat, 30 Jan 2010 18:33:10 +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 o0UIXAh4072990;
	Sat, 30 Jan 2010 18:33:10 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UIXA5o072988;
	Sat, 30 Jan 2010 18:33:10 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001301833.o0UIXA5o072988@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 18:33:10 +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: r203211 - projects/capabilities8/lib/csu/common
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 18:33:11 -0000

Author: rwatson
Date: Sat Jan 30 18:33:10 2010
New Revision: 203211
URL: http://svn.freebsd.org/changeset/base/203211

Log:
  Merge c169761 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Since we're using write() rather than err(), we need to actually return
    something from cap_main()
  
  Submitted by:	Jonathan Anderson <jonathan.anderson at cl.cam.ac.uk>

Modified:
  projects/capabilities8/lib/csu/common/crtbrand.c

Modified: projects/capabilities8/lib/csu/common/crtbrand.c
==============================================================================
--- projects/capabilities8/lib/csu/common/crtbrand.c	Sat Jan 30 18:30:12 2010	(r203210)
+++ projects/capabilities8/lib/csu/common/crtbrand.c	Sat Jan 30 18:33:10 2010	(r203211)
@@ -58,5 +58,6 @@ int cap_main(int argc, char **argv, char
 		"ERROR: attempting to run a regular binary in capability mode.\n\nIf you wish to run a binary in a sandbox, you must provide a cap_main() function which takes the same arguments as main().\n";
 
 	write(2, warning, sizeof(warning));
+	return 1;
 }