diff options
author | rwatson <rwatson@FreeBSD.org> | 2008-07-31 09:54:35 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2008-07-31 09:54:35 +0000 |
commit | b8596e4794a3aeb4fb1425b04700669f545743de (patch) | |
tree | bc8ff7eafd3118c4597e5580331169bbd2e1edcc | |
parent | e92a1d88d1012f9d957b2cae9c71f0d4441994c9 (diff) | |
download | FreeBSD-src-b8596e4794a3aeb4fb1425b04700669f545743de.zip FreeBSD-src-b8596e4794a3aeb4fb1425b04700669f545743de.tar.gz |
Further synchronization of copyrights, licenses, white space, etc from
Apple and from the OpenBSM vendor tree.
Obtained from: Apple Inc., TrustedBSD Project
MFC after: 3 days
-rw-r--r-- | sys/bsm/audit.h | 4 | ||||
-rw-r--r-- | sys/bsm/audit_internal.h | 2 | ||||
-rw-r--r-- | sys/bsm/audit_kevents.h | 4 | ||||
-rw-r--r-- | sys/bsm/audit_record.h | 4 | ||||
-rw-r--r-- | sys/security/audit/audit.c | 2 | ||||
-rw-r--r-- | sys/security/audit/audit.h | 2 | ||||
-rw-r--r-- | sys/security/audit/audit_arg.c | 2 | ||||
-rw-r--r-- | sys/security/audit/audit_bsm_klib.c | 4 | ||||
-rw-r--r-- | sys/security/audit/audit_bsm_token.c | 4 | ||||
-rw-r--r-- | sys/security/audit/audit_pipe.c | 1 | ||||
-rw-r--r-- | sys/security/audit/audit_private.h | 2 | ||||
-rw-r--r-- | sys/security/audit/audit_syscalls.c | 2 | ||||
-rw-r--r-- | sys/security/audit/audit_worker.c | 2 |
13 files changed, 17 insertions, 18 deletions
diff --git a/sys/bsm/audit.h b/sys/bsm/audit.h index 0cb552c..bed5e73 100644 --- a/sys/bsm/audit.h +++ b/sys/bsm/audit.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Apple Computer, Inc. + * Copyright (c) 2005 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,7 +11,7 @@ * 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. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple 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. * diff --git a/sys/bsm/audit_internal.h b/sys/bsm/audit_internal.h index 92ed01b..2c7a1ef 100644 --- a/sys/bsm/audit_internal.h +++ b/sys/bsm/audit_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Apple Computer, Inc. + * Copyright (c) 2005 Apple Inc. * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. * diff --git a/sys/bsm/audit_kevents.h b/sys/bsm/audit_kevents.h index ec4b3d1..400b79d 100644 --- a/sys/bsm/audit_kevents.h +++ b/sys/bsm/audit_kevents.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Apple Computer, Inc. + * Copyright (c) 2005 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,7 +11,7 @@ * 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. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple 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. * diff --git a/sys/bsm/audit_record.h b/sys/bsm/audit_record.h index 575d446..dd3ea29 100644 --- a/sys/bsm/audit_record.h +++ b/sys/bsm/audit_record.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Apple Computer, Inc. + * Copyright (c) 2005 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,7 +11,7 @@ * 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. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple 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. * diff --git a/sys/security/audit/audit.c b/sys/security/audit/audit.c index 96217ce..795b2a5 100644 --- a/sys/security/audit/audit.c +++ b/sys/security/audit/audit.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1999-2005 Apple Inc. * Copyright (c) 2006-2007 Robert N. M. Watson * All rights reserved. diff --git a/sys/security/audit/audit.h b/sys/security/audit/audit.h index 89b59f4..14dbcfd 100644 --- a/sys/security/audit/audit.h +++ b/sys/security/audit/audit.h @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1999-2005 Apple Inc. * All rights reserved. * diff --git a/sys/security/audit/audit_arg.c b/sys/security/audit/audit_arg.c index d6564f6..338fa1e 100644 --- a/sys/security/audit/audit_arg.c +++ b/sys/security/audit/audit_arg.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1999-2005 Apple Inc. * All rights reserved. * diff --git a/sys/security/audit/audit_bsm_klib.c b/sys/security/audit/audit_bsm_klib.c index c778f45..ba8325d 100644 --- a/sys/security/audit/audit_bsm_klib.c +++ b/sys/security/audit/audit_bsm_klib.c @@ -230,7 +230,7 @@ audit_ctlname_to_sysctlevent(int name[], uint64_t valid_arg) case KERN_IOV_MAX: case KERN_MAXID: return ((valid_arg & ARG_VALUE) ? - AUE_SYSCTL : AUE_SYSCTL_NONADMIN); + AUE_SYSCTL : AUE_SYSCTL_NONADMIN); default: return (AUE_SYSCTL); @@ -397,7 +397,7 @@ audit_semctl_to_event(int cmd) return (AUE_SEMCTL_STAT); default: - /* We will audit a bad command */ + /* We will audit a bad command. */ return (AUE_SEMCTL); } } diff --git a/sys/security/audit/audit_bsm_token.c b/sys/security/audit/audit_bsm_token.c index b798b97..b60a688 100644 --- a/sys/security/audit/audit_bsm_token.c +++ b/sys/security/audit/audit_bsm_token.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2004 Apple Inc. * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. @@ -158,7 +158,7 @@ au_to_attr32(struct vnode_au_info *vni) ADD_U_INT32(dptr, vni->vn_fsid); /* - * Some systems use 32-bit file ID's, other's use 64-bit file IDs. + * Some systems use 32-bit file ID's, others use 64-bit file IDs. * Attempt to handle both, and let the compiler sort it out. If we * could pick this out at compile-time, it would be better, so as to * avoid the else case below. diff --git a/sys/security/audit/audit_pipe.c b/sys/security/audit/audit_pipe.c index ff950c9..00b09ca 100644 --- a/sys/security/audit/audit_pipe.c +++ b/sys/security/audit/audit_pipe.c @@ -497,7 +497,6 @@ audit_pipe_submit_user(void *record, u_int record_len) cv_broadcastpri(&audit_pipe_cv, PSOCK); } - /* * Pop the next record off of an audit pipe. */ diff --git a/sys/security/audit/audit_private.h b/sys/security/audit/audit_private.h index dbe7d1d..d0cfe94 100644 --- a/sys/security/audit/audit_private.h +++ b/sys/security/audit/audit_private.h @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1999-2005 Apple Inc. * All rights reserved. * diff --git a/sys/security/audit/audit_syscalls.c b/sys/security/audit/audit_syscalls.c index 6e9b365..b548794 100644 --- a/sys/security/audit/audit_syscalls.c +++ b/sys/security/audit/audit_syscalls.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1999-2005 Apple Inc. * All rights reserved. * diff --git a/sys/security/audit/audit_worker.c b/sys/security/audit/audit_worker.c index 44a7439..88a45c1 100644 --- a/sys/security/audit/audit_worker.c +++ b/sys/security/audit/audit_worker.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1999-2005 Apple Inc. * Copyright (c) 2006-2008 Robert N. M. Watson * All rights reserved. |