From owner-p4-projects@FreeBSD.ORG Sun Apr 24 16:29:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 445CF16A4D0; Sun, 24 Apr 2005 16:29:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 09EAD16A4CE for ; Sun, 24 Apr 2005 16:29:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5FAB43D2F for ; Sun, 24 Apr 2005 16:29:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OGTtZn092749 for ; Sun, 24 Apr 2005 16:29:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OGTto1092746 for perforce@freebsd.org; Sun, 24 Apr 2005 16:29:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 16:29:55 GMT Message-Id: <200504241629.j3OGTto1092746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 16:29:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=75892 Change 75892 by rwatson@rwatson_paprika on 2005/04/24 16:29:44 Rename HEADER_SIZE to BSM_HEADER_SIZE for API reasons. Rename TRAILER_SIZE to BSM_TRAILER_SIZE for API reasons. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#6 (text+ko) ==== @@ -31,8 +31,8 @@ * contain pointers of whose contents we dont know the size * (e.g text tokens) */ -#define HEADER_SIZE 18 -#define TRAILER_SIZE 7 +#define BSM_HEADER_SIZE 18 +#define BSM_TRAILER_SIZE 7 #define ADD_U_CHAR(loc, val) \ do {\ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#5 (text+ko) ==== @@ -161,7 +161,7 @@ return -1; /* Invalid descriptor */ } - if (rec->len + tok->len + TRAILER_SIZE > MAX_AUDIT_RECORD_SIZE) { + if (rec->len + tok->len + BSM_TRAILER_SIZE > MAX_AUDIT_RECORD_SIZE) { errno = ENOMEM; return (-1); } @@ -195,7 +195,7 @@ u_char *dptr; int error; - tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE; + tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; header = au_to_header32(tot_rec_size, event, 0); if (header == NULL) return (-1); @@ -272,7 +272,7 @@ } - tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE; + tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; if (tot_rec_size > MAX_AUDIT_RECORD_SIZE) { /* @@ -320,7 +320,7 @@ return (-1); } - tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE; + tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; if ((tot_rec_size > MAX_AUDIT_RECORD_SIZE) || (tot_rec_size > *buflen)) { /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#2 (text+ko) ==== @@ -2057,7 +2057,7 @@ int err = 0; int recoversize; - recoversize = len - tok->len - TRAILER_SIZE; + recoversize = len - tok->len - BSM_TRAILER_SIZE; if(recoversize <= 0) { return -1; }