diff options
author | rwatson <rwatson@FreeBSD.org> | 2008-12-02 23:26:43 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2008-12-02 23:26:43 +0000 |
commit | 0ac6f8ebdfebed8ad6c6fa1334d227524df2c013 (patch) | |
tree | 909e4490f5c6d4141d466ad2fdf963beeb90afca /contrib/openbsm/libbsm/bsm_user.c | |
parent | 1383cec09e16a1fb5117c67951f100e7931363e7 (diff) | |
parent | 208cf4160e79a64866887cc5f89f964cc899f97e (diff) | |
download | FreeBSD-src-0ac6f8ebdfebed8ad6c6fa1334d227524df2c013.zip FreeBSD-src-0ac6f8ebdfebed8ad6c6fa1334d227524df2c013.tar.gz |
Merge OpenBSM 1.1 alpha 2 from the OpenBSM vendor branch to head, both
contrib/openbsm (svn merge) and sys/{bsm,security/audit} (manual merge).
- Add OpenBSM contrib tree to include paths for audit(8) and auditd(8).
- Merge support for new tokens, fixes to existing token generation to
audit_bsm_token.c.
- Synchronize bsm includes and definitions.
OpenBSM history for imported revisions below for reference.
MFC after: 1 month
Sponsored by: Apple Inc.
Obtained from: TrustedBSD Project
--
OpenBSM 1.1 alpha 2
- Include files in OpenBSM are now broken out into two parts: library builds
required solely for user space, and system includes, which may also be
required for use in the kernels of systems integrating OpenBSM. Submitted
by Stacey Son.
- Configure option --with-native-includes allows forcing the use of native
include for system includes, rather than the versions bundled with OpenBSM.
This is intended specifically for platforms that ship OpenBSM, have adapted
versions of the system includes in a kernel source tree, and will use the
OpenBSM build infrastructure with an unmodified OpenBSM distribution,
allowing the customized system includes to be used with the OpenBSM build.
Submitted by Stacey Son.
- Various strcpy()'s/strcat()'s have been changed to strlcpy()'s/strlcat()'s
or asprintf(). Added compat/strlcpy.h for Linux.
- Remove compatibility defines for old Darwin token constant names; now only
BSM token names are provided and used.
- Add support for extended header tokens, which contain space for information
on the host generating the record.
- Add support for setting extended host information in the kernel, which is
used for setting host information in extended header tokens. The
audit_control file now supports a "host" parameter which can be used by
auditd to set the information; if not present, the kernel parameters won't
be set and auditd uses unextended headers for records that it generates.
OpenBSM 1.1 alpha 1
- Add option to auditreduce(1) which allows users to invert sense of
matching, such that BSM records that do not match, are selected.
- Fix bug in audit_write() where we commit an incomplete record in the
event there is an error writing the subject token. This was submitted
by Diego Giagio.
- Build support for Mac OS X 10.5.1 submitted by Eric Hall.
- Fix a bug which resulted in host XML attributes not being arguments so
that const strings can be passed as arguments to tokens. This patch was
submitted by Xin LI.
- Modify the -m option so users can select more then one audit event.
- For Mac OS X, added Mach IPC support for audit trigger messages.
- Fixed a bug in getacna() which resulted in a locking problem on Mac OS X.
- Added LOG_PERROR flag to openlog when -d option is used with auditd.
- AUE events added for Mac OS X Leopard system calls.
Diffstat (limited to 'contrib/openbsm/libbsm/bsm_user.c')
-rw-r--r-- | contrib/openbsm/libbsm/bsm_user.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/contrib/openbsm/libbsm/bsm_user.c b/contrib/openbsm/libbsm/bsm_user.c index c00d139..5266fdf 100644 --- a/contrib/openbsm/libbsm/bsm_user.c +++ b/contrib/openbsm/libbsm/bsm_user.c @@ -1,5 +1,5 @@ -/* - * Copyright (c) 2004 Apple Computer, Inc. +/*- + * Copyright (c) 2004 Apple Inc. * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * @@ -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. * @@ -27,9 +27,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#18 $ */ +#include <config/config.h> + #include <bsm/libbsm.h> #include <string.h> @@ -37,6 +39,10 @@ #include <stdio.h> #include <stdlib.h> +#ifndef HAVE_STRLCPY +#include <compat/strlcpy.h> +#endif + /* * Parse the contents of the audit_user file into au_user_ent structures. */ @@ -66,7 +72,7 @@ userfromstr(char *str, struct au_user_ent *u) if (strlen(username) >= AU_USER_NAME_MAX) return (NULL); - strcpy(u->au_name, username); + strlcpy(u->au_name, username, AU_USER_NAME_MAX); if (getauditflagsbin(always, &(u->au_always)) == -1) return (NULL); |