From owner-svn-src-projects@FreeBSD.ORG Sat Jan 30 21:08:17 2010 Return-Path: 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 79DBD106566C; Sat, 30 Jan 2010 21:08:17 +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 696928FC1F; Sat, 30 Jan 2010 21:08:17 +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 o0UL8H3S008993; Sat, 30 Jan 2010 21:08:17 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UL8Hp0008986; Sat, 30 Jan 2010 21:08:17 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201001302108.o0UL8Hp0008986@svn.freebsd.org> From: Robert Watson Date: Sat, 30 Jan 2010 21:08:17 +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: r203256 - in projects/capabilities8: lib/csu/amd64 lib/csu/common sys/kern sys/sys X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 21:08:17 -0000 Author: rwatson Date: Sat Jan 30 21:08:17 2010 New Revision: 203256 URL: http://svn.freebsd.org/changeset/base/203256 Log: Merge c173948, c173950, c173951, c173952 from the p4 TrustedBSD Capabilities branch to capabilities8: Revert and clean up various local whitespace changes. Modified: projects/capabilities8/lib/csu/amd64/crt1.c projects/capabilities8/lib/csu/common/crtbrand.c projects/capabilities8/sys/kern/vfs_lookup.c projects/capabilities8/sys/kern/vfs_syscalls.c projects/capabilities8/sys/sys/file.h Modified: projects/capabilities8/lib/csu/amd64/crt1.c ============================================================================== --- projects/capabilities8/lib/csu/amd64/crt1.c Sat Jan 30 21:06:48 2010 (r203255) +++ projects/capabilities8/lib/csu/amd64/crt1.c Sat Jan 30 21:08:17 2010 (r203256) @@ -94,8 +94,6 @@ __asm__("eprol:"); exit( main(argc, argv, env) ); } - - /* The Capsicum entry function. */ void _capstart(char **ap, void (*cleanup)(void)) Modified: projects/capabilities8/lib/csu/common/crtbrand.c ============================================================================== --- projects/capabilities8/lib/csu/common/crtbrand.c Sat Jan 30 21:06:48 2010 (r203255) +++ projects/capabilities8/lib/csu/common/crtbrand.c Sat Jan 30 21:08:17 2010 (r203256) @@ -52,8 +52,6 @@ static const struct { __FreeBSD_version }; - - extern int cap_main(int, char **, char **) __attribute__((weak)); int cap_main(__unused int argc, __unused char **argv, __unused char **env) { @@ -61,6 +59,5 @@ int cap_main(__unused int argc, __unused "ERROR: attempting to run a regular binary in capability mode!\n\nIf you want 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); } Modified: projects/capabilities8/sys/kern/vfs_lookup.c ============================================================================== --- projects/capabilities8/sys/kern/vfs_lookup.c Sat Jan 30 21:06:48 2010 (r203255) +++ projects/capabilities8/sys/kern/vfs_lookup.c Sat Jan 30 21:08:17 2010 (r203256) @@ -505,7 +505,7 @@ lookup(struct nameidata *ndp) int dvfslocked; /* VFS Giant state for parent */ int tvfslocked; int lkflags_save; - + /* * Setup: break out flag bits into variables. */ @@ -531,7 +531,6 @@ lookup(struct nameidata *ndp) cnp->cn_lkflags = LK_SHARED; else cnp->cn_lkflags = LK_EXCLUSIVE; - dp = ndp->ni_startdir; ndp->ni_startdir = NULLVP; vn_lock(dp, Modified: projects/capabilities8/sys/kern/vfs_syscalls.c ============================================================================== --- projects/capabilities8/sys/kern/vfs_syscalls.c Sat Jan 30 21:06:48 2010 (r203255) +++ projects/capabilities8/sys/kern/vfs_syscalls.c Sat Jan 30 21:08:17 2010 (r203256) @@ -1083,8 +1083,6 @@ kern_open(struct thread *td, char *path, return (kern_openat(td, AT_FDCWD, path, pathseg, flags, mode)); } - - int kern_openat(struct thread *td, int fd, char *path, enum uio_seg pathseg, int flags, int mode) Modified: projects/capabilities8/sys/sys/file.h ============================================================================== --- projects/capabilities8/sys/sys/file.h Sat Jan 30 21:06:48 2010 (r203255) +++ projects/capabilities8/sys/sys/file.h Sat Jan 30 21:08:17 2010 (r203256) @@ -274,6 +274,7 @@ fo_ioctl(fp, com, data, active_cred, td) struct ucred *active_cred; struct thread *td; { + return ((*fp->f_ops->fo_ioctl)(fp, com, data, active_cred, td)); }