From owner-p4-projects@FreeBSD.ORG Thu Jun 30 09:42:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80C2316A420; Thu, 30 Jun 2005 09:42:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57F8A16A41C for ; Thu, 30 Jun 2005 09:42:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2745443D4C for ; Thu, 30 Jun 2005 09:42:21 +0000 (GMT) (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.1/8.13.1) with ESMTP id j5U9gL2U008774 for ; Thu, 30 Jun 2005 09:42:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5U9gKXF008771 for perforce@freebsd.org; Thu, 30 Jun 2005 09:42:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 30 Jun 2005 09:42:20 GMT Message-Id: <200506300942.j5U9gKXF008771@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 79268 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, 30 Jun 2005 09:42:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=79268 Change 79268 by rwatson@rwatson_zoo on 2005/06/30 09:41:22 Synchronization (mostly white space, one void -> char) of audit.h to OpenBSM. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#15 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#15 (text+ko) ==== @@ -1,15 +1,15 @@ /* * @APPLE_LICENSE_HEADER_START@ - * + * * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. - * + * * This file contains Original Code and/or Modifications of Original Code * as defined in and that are subject to the Apple Public Source License * Version 2.0 (the 'License'). You may not use this file except in * compliance with the License. Please obtain a copy of the License at * http://www.opensource.apple.com/apsl/ and read it before using this * file. - * + * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, @@ -17,7 +17,7 @@ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. * Please see the License for the specific language governing rights and * limitations under the License. - * + * * @APPLE_LICENSE_HEADER_END@ */ @@ -33,7 +33,7 @@ #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 -#define MAX_AUDIT_RECORD_SIZE 4096 +#define MAX_AUDIT_RECORD_SIZE 4096 #define MIN_AUDIT_FILE_SIZE 512 * 1024 /* The special device filename */ @@ -51,14 +51,14 @@ * free so userspace can terminate the log, etc. */ #define AUDIT_HARD_LIMIT_FREE_BLOCKS 4 -/* +/* * Triggers for the audit daemon */ #define AUDIT_TRIGGER_MIN 1 #define AUDIT_TRIGGER_LOW_SPACE 1 -#define AUDIT_TRIGGER_OPEN_NEW 2 -#define AUDIT_TRIGGER_READ_FILE 3 -#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 +#define AUDIT_TRIGGER_OPEN_NEW 2 +#define AUDIT_TRIGGER_READ_FILE 3 +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 #define AUDIT_TRIGGER_NO_SPACE 5 #define AUDIT_TRIGGER_MAX 5 @@ -179,7 +179,7 @@ typedef uid_t au_id_t; typedef pid_t au_asid_t; typedef u_int16_t au_event_t; -typedef u_int16_t au_emod_t; +typedef u_int16_t au_emod_t; typedef u_int32_t au_class_t; struct au_tid { @@ -189,7 +189,7 @@ typedef struct au_tid au_tid_t; struct au_tid_addr { - dev_t at_port; + dev_t at_port; u_int32_t at_type; u_int32_t at_addr[4]; }; @@ -251,7 +251,7 @@ u_char *data; size_t len; LIST_ENTRY(au_record) au_rec_q; -}; +}; typedef struct au_record au_record_t; /* @@ -309,7 +309,7 @@ int audit (const void *, int); int auditon (int, void *, int); -int auditctl (const void *); +int auditctl (const char *); int getauid (au_id_t *); int setauid (const au_id_t *); int getaudit (struct auditinfo *);