2c2
< * Copyright (c) 2004-2008 Apple Inc.
---
> * Copyright (c) 2004-2009 Apple Inc.
29c29
< * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#41 $
---
> * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#43 $
70c70
< * XXX the following is temporary until this can be added to the kernel
---
> * XXX The following are temporary until these can be added to the kernel
75a76,78
> #ifndef AUDIT_TRIGGER_EXPIRE_TRAILS
> #define AUDIT_TRIGGER_EXPIRE_TRAILS 8
> #endif
76a80
>
169c173
< strlcpy(ptr, TS, TIMESTAMP_LEN);
---
> memcpy(ptr, TS, POSTFIX_LEN);
277a282,289
> /*
> * Finally, see if there are any trail files to expire.
> */
> err = auditd_expire_trails(audit_warn_expired);
> if (err)
> auditd_log_err("auditd_expire_trails(): %s",
> auditd_strerror(err));
>
552a565,572
> case AUDIT_TRIGGER_EXPIRE_TRAILS:
> auditd_log_info("Got audit expire trails trigger");
> err = auditd_expire_trails(audit_warn_expired);
> if (err)
> auditd_log_err("auditd_expire_trails(): %s",
> auditd_strerror(err));
> break;
>
672,674c692,699
< auditd_log_err("auditd_set_host() %s: %m",
< auditd_strerror(err));
< ret = -1;
---
> if (err == ADE_PARSE) {
> auditd_log_notice(
> "audit_control(5) may be missing 'host:' field");
> } else {
> auditd_log_err("auditd_set_host() %s: %m",
> auditd_strerror(err));
> ret = -1;
> }
678c703
<
---
>