From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jan 11 15:19:34 2007 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DAAF516A403 for ; Thu, 11 Jan 2007 15:19:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.freebsd.org (Postfix) with ESMTP id 919D713C45A for ; Thu, 11 Jan 2007 15:19:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id 994B34CBF8 for ; Thu, 11 Jan 2007 10:19:33 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id 5DA9F55415; Thu, 11 Jan 2007 15:19:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5689416A416; Thu, 11 Jan 2007 15:19:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 30E5F16A412 for ; Thu, 11 Jan 2007 15:19:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 211CD13C43E for ; Thu, 11 Jan 2007 15:19:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0BFJWSF089148 for ; Thu, 11 Jan 2007 15:19:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0BFJVZD089145 for perforce@freebsd.org; Thu, 11 Jan 2007 15:19:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 11 Jan 2007 15:19:31 GMT Message-Id: <200701111519.l0BFJVZD089145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 112773 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jan 2007 15:19:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=112773 Change 112773 by rwatson@rwatson_zoo on 2007/01/11 15:18:32 Fix compile nits due to merging. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#26 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#26 (text+ko) ==== @@ -440,6 +440,16 @@ case AUE_RECVMSG: case AUE_SEND: case AUE_SENDFILE: + /* + * XXXRW: While sendfile() is effectively a combination of + * read() and write(), it is useful to audit if only because + * it performs IPC/network I/O. We will need to eventually + * audit the following information to be complete: + * + * - socket information + * - file descriptor information for two file descriptors + * - file information + */ case AUE_SENDMSG: case AUE_SENDTO: /* @@ -486,19 +496,6 @@ } break; - case AUE_SENDFILE: - /* - * XXXRW: While sendfile() is effectively a combination of - * read() and write(), it is useful to audit if only because - * it performs IPC/network I/O. We will need to eventually - * audit the following information to be complete: - * - * - socket information - * - file descriptor information for two file descriptors - * - file information - */ - break; - case AUE_ACCT: if (ARG_IS_VALID(kar, ARG_UPATH1)) { UPATH1_VNODE1_TOKENS; @@ -948,7 +945,6 @@ break; case AUE_MOUNT: - case AUE_NMOUNT: /* XXX Need to handle NFS mounts */ if (ARG_IS_VALID(kar, ARG_FFLAGS)) { tok = au_to_arg32(3, "flags", ar->ar_arg_fflags);