Date: Sat, 30 Jan 2010 18:33:10 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r203211 - projects/capabilities8/lib/csu/common Message-ID: <201001301833.o0UIXA5o072988@svn.freebsd.org>
index | next in thread | raw e-mail
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; }help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001301833.o0UIXA5o072988>