Date: Sat, 30 Apr 2005 13:36:59 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 76274 for review Message-ID: <200504301336.j3UDaxI5063164@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=76274 Change 76274 by rwatson@rwatson_paprika on 2005/04/30 13:36:17 Remove trailing white space. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#5 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#2 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#8 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#5 (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@ */ @@ -26,10 +26,10 @@ #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 -/* +/* * Triggers for the audit daemon */ #define AUDIT_TRIGGER_LOW_SPACE 1 @@ -151,7 +151,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 { @@ -223,7 +223,7 @@ u_char *data; size_t len; LIST_ENTRY(au_record) au_rec_q; -}; +}; typedef struct au_record au_record_t; /* ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#2 (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,28 +17,28 @@ * 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@ */ #ifndef _BSM_AUDIT_KEVENTS_H_ #define _BSM_AUDIT_KEVENTS_H_ -/* - * Values marked as AUE_NULL are not required to be audited as per CAPP - * +/* + * Values marked as AUE_NULL are not required to be audited as per CAPP + * * The second value within comments is the syscall number in Darwin * - * Values in the third column are the values assigned by BSM for obsolete - * or old system calls + * Values in the third column are the values assigned by BSM for obsolete + * or old system calls * - * Values marked as XXX in the third column do not have an - * event number assigned as yet, and have (temporarily) been assigned - * value of AUE_NULL + * Values marked as XXX in the third column do not have an + * event number assigned as yet, and have (temporarily) been assigned + * value of AUE_NULL */ #define AUE_NULL 0 -#define AUE_EXIT 1 /*1*/ +#define AUE_EXIT 1 /*1*/ #define AUE_FORK 2 /*2*/ #define AUE_OPEN 3 /*3*/ #define AUE_READ AUE_NULL /*4*/ @@ -56,14 +56,14 @@ #define AUE_OPEN_WTC 79 /*5*/ #define AUE_OPEN_WT 78 /*5*/ #define AUE_CLOSE 112 /*6*/ -#define AU_WAIT4 AUE_NULL /*7*/ +#define AU_WAIT4 AUE_NULL /*7*/ #define AUE_O_CREAT AUE_OPEN_RWTC /*8*/ /*4*/ -#define AUE_LINK 5 /*9*/ -#define AUE_UNLINK 6 /*10*/ +#define AUE_LINK 5 /*9*/ +#define AUE_UNLINK 6 /*10*/ #define AUE_O_EXECV AUE_NULL /*11*/ #define AUE_CHDIR 8 /*12*/ #define AUE_FCHDIR 68 /*13*/ -#define AUE_MKNOD 9 /*14*/ +#define AUE_MKNOD 9 /*14*/ #define AUE_CHMOD 10 /*15*/ #define AUE_CHOWN 11 /*16*/ #define AUE_O_SBREAK AUE_NULL /*17*/ @@ -72,11 +72,11 @@ #define AUE_GETPID AUE_NULL /*20*/ #define AUE_O_MOUNT AUE_NULL /*21*/ #define AUE_O_UMOUNT AUE_NULL /*22*/ -#define AUE_SETUID 200 /*23*/ +#define AUE_SETUID 200 /*23*/ #define AUE_GETUID AUE_NULL /*24*/ #define AUE_GETEUID AUE_NULL /*25*/ #define AUE_PTRACE 302 /*26*/ -#define AUE_RECVMSG 190 /*27*/ +#define AUE_RECVMSG 190 /*27*/ #define AUE_SENDMSG 188 /*28*/ #define AUE_RECVFROM 191 /*29*/ #define AUE_ACCEPT 33 /*30*/ @@ -85,8 +85,8 @@ #define AUE_ACCESS 14 /*33*/ #define AUE_CHFLAGS 303 /*34*/ #define AUE_FCHFLAGS 304 /*35*/ -#define AUE_SYNC AUE_NULL /*36*/ -#define AUE_KILL 15 /*37*/ +#define AUE_SYNC AUE_NULL /*36*/ +#define AUE_KILL 15 /*37*/ #define AUE_O_STAT AUE_STAT /*38*/ #define AUE_GETPPID AUE_NULL /*39*/ #define AUE_O_LSTAT AUE_LSTAT /*40*/ @@ -101,7 +101,7 @@ #define AUE_SIGPROCMASK AUE_NULL /*48*/ /*XXX*/ #define AUE_GETLOGIN AUE_NULL /*49*/ #define AUE_SETLOGIN 307 /*50*/ -#define AUE_ACCT 18 /*51*/ +#define AUE_ACCT 18 /*51*/ #define AUE_SIGPENDING AUE_NULL /*52*/ /*XXX*/ #define AUE_SIGALTSTACK AUE_NULL /*53*/ /*XXX*/ #define AUE_IOCTL 158 /*54*/ @@ -111,7 +111,7 @@ #define AUE_READLINK 22 /*58*/ #define AUE_EXECVE 23 /*59*/ #define AUE_UMASK 310 /*60*/ -#define AUE_CHROOT 24 /*61*/ +#define AUE_CHROOT 24 /*61*/ #define AUE_O_FSTAT AUE_FSTAT /*62*/ #define AUE_O_GETPAGESIZE AUE_NULL /*64*/ @@ -128,7 +128,7 @@ #define AUE_MADVISE AUE_NULL /*75*/ #define AUE_O_VHANGUP AUE_NULL /*76*/ #define AUE_O_VLIMIT AUE_NULL /*77*/ -#define AUE_MINCORE AUE_NULL /*78*/ +#define AUE_MINCORE AUE_NULL /*78*/ #define AUE_GETGROUPS AUE_NULL /*79*/ #define AUE_SETGROUPS 26 /*80*/ #define AUE_GETPGRP AUE_NULL /*81*/ @@ -170,7 +170,7 @@ #define AUE_GETRUSAGE AUE_NULL /*117*/ #define AUE_GTSOCKOPT AUE_NULL /*118*/ #define AUE_O_RESUBA AUE_NULL /*119*/ -#define AUE_READV AUE_NULL /*120*/ +#define AUE_READV AUE_NULL /*120*/ #define AUE_WRITEV AUE_NULL /*121*/ #define AUE_SETTIMEOFDAY 313 /*122*/ #define AUE_FCHOWN 38 /*123*/ @@ -195,7 +195,7 @@ #define AUE_O_GETHOSTID AUE_NULL /*142*/ #define AUE_O_SETHOSTID AUE_NULL /*143*/ #define AUE_O_GETRLIMIT AUE_NULL /*144*/ -#define AUE_O_SETRLIMIT AUE_SETRLIMIT /*145*/ +#define AUE_O_SETRLIMIT AUE_SETRLIMIT /*145*/ #define AUE_O_KILLPG AUE_KILL /*146*/ #define AUE_SETSID 319 /*147*/ #define AUE_O_SETQUOTA AUE_NULL /*148*/ @@ -254,7 +254,7 @@ #define AUE_LSTATV AUE_NULL /*218*/ /*EOPNOTSUPP*/ #define AUE_FSTATV AUE_NULL /*219*/ /*EOPNOTSUPP*/ #define AUE_GETATTRLIST 335 /*220*/ -#define AUE_SETATTRLIST 336 /*221*/ +#define AUE_SETATTRLIST 336 /*221*/ #define AUE_GETDIRENTRIESATTR 337 /*222*/ #define AUE_EXCHANGEDATA 338 /*223*/ #define AUE_CHECKUSERACCESS AUE_ACCESS /*224*/ /* To Be Removed */ @@ -364,7 +364,7 @@ #define AUE_FCHROOT 69 #define AUE_FORK1 241 #define AUE_GETAUDIT 132 -#define AUE_GETAUDIT_ADDR 267 +#define AUE_GETAUDIT_ADDR 267 #define AUE_GETAUID 130 #define AUE_GETMSG 217 #define AUE_SOCKACCEPT 247 ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#8 (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@ */ @@ -26,14 +26,14 @@ /* Various token id types */ -/* +/* * Values inside the comments are not documented in the BSM pages and - * have been picked up from the header files - */ + * have been picked up from the header files + */ /* - * Values marked as XXX do not have a value defined in the BSM header files - */ + * Values marked as XXX do not have a value defined in the BSM header files + */ /* * Control token types @@ -46,8 +46,8 @@ #define AUT_INVALID 0x00 #define AU_FILE_TOKEN 0x11 -#define AU_TRAILER_TOKEN 0x13 -#define AU_HEADER_32_TOKEN 0x14 +#define AU_TRAILER_TOKEN 0x13 +#define AU_HEADER_32_TOKEN 0x14 #define AU_HEADER_EX_32_TOKEN 0x15 /* @@ -57,7 +57,7 @@ */ #define AU_DATA_TOKEN 0x21 -#define AU_ARB_TOKEN AU_DATA_TOKEN +#define AU_ARB_TOKEN AU_DATA_TOKEN #define AU_IPC_TOKEN 0x22 #define AU_PATH_TOKEN 0x23 #define AU_SUBJECT_32_TOKEN 0x24 @@ -68,7 +68,7 @@ #define AU_IN_ADDR_TOKEN 0x2A #define AU_IP_TOKEN 0x2B #define AU_IPORT_TOKEN 0x2C -#define AU_ARG32_TOKEN 0x2D +#define AU_ARG32_TOKEN 0x2D #define AU_SOCK_TOKEN 0x2E #define AU_SEQ_TOKEN 0x2F @@ -84,7 +84,7 @@ #define AUT_PRIV ((char)0x38) #define AUT_UPRIV ((char)0x39) #define AUT_LIAISON ((char)0x3A) - + */ #define AU_ATTR_TOKEN 0x31 @@ -97,7 +97,7 @@ /* * Command token types */ - + #define AU_CMD_TOKEN 0x51 #define AU_EXIT_TOKEN 0x52 @@ -126,9 +126,9 @@ /* * Extended network address token types */ - + #define AU_HEADER_EX_64_TOKEN 0x79 -#define AU_SUBJECT_32_EX_TOKEN 0x7a +#define AU_SUBJECT_32_EX_TOKEN 0x7a #define AU_PROCESS_32_EX_TOKEN 0x7b #define AU_SUBJECT_64_EX_TOKEN 0x7c #define AU_PROCESS_64_EX_TOKEN 0x7d @@ -141,7 +141,7 @@ * The values for the following token ids are not * defined by BSM */ -#define AU_SOCK_INET_32_TOKEN 0x80 /*XXX*/ +#define AU_SOCK_INET_32_TOKEN 0x80 /*XXX*/ #define AU_SOCK_INET_128_TOKEN 0x81 /*XXX*/ #define AU_SOCK_UNIX_TOKEN 0x82 /*XXX*/ @@ -158,7 +158,7 @@ #define AUR_LONG 2 /* ... and their sizes */ -#define AUR_BYTE_SIZE sizeof(u_char) +#define AUR_BYTE_SIZE sizeof(u_char) #define AUR_SHORT_SIZE sizeof(u_int16_t) #define AUR_LONG_SIZE sizeof(u_int32_t) @@ -193,14 +193,14 @@ int au_close_buffer(int d, short event, u_char *buffer, size_t *buflen); token_t *au_to_file(char *file); -token_t *au_to_header(int rec_size, au_event_t e_type, +token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); -token_t *au_to_header32(int rec_size, au_event_t e_type, +token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); -token_t *au_to_header64(int rec_size, au_event_t e_type, +token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_me(void); - + token_t *au_to_arg(char n, char *text, u_int32_t v); token_t *au_to_arg32(char n, char *text, u_int32_t v); token_t *au_to_arg64(char n, char *text, u_int64_t v); @@ -246,9 +246,9 @@ token_t *au_to_seq(long audit_count); #if defined(_KERNEL) || defined(KERNEL) token_t *au_to_socket(struct socket *so); -token_t *au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, +token_t *au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, struct sockaddr *la, struct sockaddr *ta); -token_t *au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, +token_t *au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, struct sockaddr *la, struct sockaddr *ta); #endif token_t *au_to_sock_inet(struct sockaddr_in *so); ==== //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#2 (text+ko) ==== @@ -1,18 +1,18 @@ /* * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200504301336.j3UDaxI5063164>