From owner-p4-projects@FreeBSD.ORG Thu May 15 21:45:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E92D10656E1; Thu, 15 May 2008 21:45:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 879CB1065681 for ; Thu, 15 May 2008 21:45:32 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 75D0C8FC28 for ; Thu, 15 May 2008 21:45:32 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4FLjWfu015584 for ; Thu, 15 May 2008 21:45:32 GMT (envelope-from snagg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4FLjW3L015582 for perforce@freebsd.org; Thu, 15 May 2008 21:45:32 GMT (envelope-from snagg@FreeBSD.org) Date: Thu, 15 May 2008 21:45:32 GMT Message-Id: <200805152145.m4FLjW3L015582@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snagg@FreeBSD.org using -f From: Vincenzo Iozzo To: Perforce Change Reviews Cc: Subject: PERFORCE change 141676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 May 2008 21:45:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=141676 Change 141676 by snagg@snagg_macosx on 2008/05/15 21:45:23 missing sync Affected files ... .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_ioctl.h#9 edit .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_pipe.c#9 edit Differences ... ==== //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_ioctl.h#9 (text) ==== @@ -49,7 +49,7 @@ pid_t app_pid; struct auditpipe_ioctl_preselect_event *app_auevents; int app_event_len; -}; +}auditpipe_ioctl_preselect; struct auditpipe_ioctl_preselect_old { au_id_t aip_auid; @@ -61,7 +61,7 @@ */ #define AUDITPIPE_PRESELECT_MODE_TRAIL 1 /* Global audit trail. */ #define AUDITPIPE_PRESELECT_MODE_LOCAL 2 /* Local audit trail. */ -#define AUDITPIPE_PRESELECT_MODE_SYSCALL 3 /* Events based audit trail */ +#define AUDITPIPE_PRESELECT_MODE_EVENT 3 /* Events based audit trail */ /* * Ioctls to read and control the behavior of individual audit pipe devices. ==== //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_pipe.c#9 (text) ==== @@ -435,10 +435,6 @@ if (app != NULL) { TAILQ_REMOVE(&ap->ap_preselect_list, app, app_list); mtx_unlock(&audit_pipe_mtx); - } - - mtx_unlock(&audit_pipe_mtx); - if (app != NULL) { for(i = 0; i < app->app_event_len; i++) free((app->app_auevents + i), M_AUDIT_PIPE_PRESELECT_EVENT); free(app, M_AUDIT_PIPE_PRESELECT); @@ -559,7 +555,7 @@ return (au_preselect(event, class, &app->app_mask, sorf)); - case AUDITPIPE_PRESELECT_MODE_SYSCALL: + case AUDITPIPE_PRESELECT_MODE_EVENT: app = audit_pipe_preselect_find_event(ap, event, app_pid, sorf); if(app != NULL) return (1);