diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2006-08-26 08:17:58 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2006-08-26 08:17:58 +0000 |
| commit | 1c4d2797dd88fe53db1eafa4a358a096caeefcf8 (patch) | |
| tree | ac1900c782723514580e177d7a0ee77286c2115b /sys/security | |
| parent | 98c38adbfdebce054f9a000691e3c3b91a0892ca (diff) | |
| download | src-1c4d2797dd88fe53db1eafa4a358a096caeefcf8.tar.gz src-1c4d2797dd88fe53db1eafa4a358a096caeefcf8.zip | |
Update kernel OpenBSM parts, especially src/sys/bsm, for the OpenBSM
1.0 alpha 9 import. See the OpenBSM import commit message for a
detailed summary of changes.
Obtained from: TrustedBSD Project
Notes
Notes:
svn path=/head/; revision=161635
Diffstat (limited to 'sys/security')
| -rw-r--r-- | sys/security/audit/audit_bsm.c | 2 | ||||
| -rw-r--r-- | sys/security/audit/audit_bsm_token.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/security/audit/audit_bsm.c b/sys/security/audit/audit_bsm.c index 8252b9358d33..9beb68e39e94 100644 --- a/sys/security/audit/audit_bsm.c +++ b/sys/security/audit/audit_bsm.c @@ -118,7 +118,7 @@ kau_close(struct au_record *rec, struct timespec *ctime, short event) token_t *cur, *hdr, *trail; struct timeval tm; - tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; + tot_rec_size = rec->len + AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; if (tot_rec_size <= MAX_AUDIT_RECORD_SIZE) { /* Create the header token */ tm.tv_usec = ctime->tv_nsec / 1000; diff --git a/sys/security/audit/audit_bsm_token.c b/sys/security/audit/audit_bsm_token.c index fb40fcd9bf3c..7b9abe5c688c 100644 --- a/sys/security/audit/audit_bsm_token.c +++ b/sys/security/audit/audit_bsm_token.c @@ -30,6 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#23 $ * $FreeBSD$ */ @@ -269,7 +270,7 @@ token_t * au_to_groups(int *groups) { - return (au_to_newgroups(BSM_MAX_GROUPS, groups)); + return (au_to_newgroups(AUDIT_MAX_GROUPS, groups)); } /* @@ -1113,7 +1114,7 @@ au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, ADD_U_CHAR(dptr, AUT_HEADER32); ADD_U_INT32(dptr, rec_size); - ADD_U_CHAR(dptr, HEADER_VERSION); + ADD_U_CHAR(dptr, AUDIT_HEADER_VERSION_OPENBSM); ADD_U_INT16(dptr, e_type); ADD_U_INT16(dptr, e_mod); |