From owner-p4-projects@FreeBSD.ORG Sun Mar 5 02:32:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 271EC16A423; Sun, 5 Mar 2006 02:32:34 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D9DF416A420 for ; Sun, 5 Mar 2006 02:32:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7538543D45 for ; Sun, 5 Mar 2006 02:32:33 +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 k252WXHT008391 for ; Sun, 5 Mar 2006 02:32:33 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 k252WXgk008388 for perforce@freebsd.org; Sun, 5 Mar 2006 02:32:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 02:32:33 GMT Message-Id: <200603050232.k252WXgk008388@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 Cc: Subject: PERFORCE change 92761 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 02:32:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=92761 Change 92761 by rwatson@rwatson_fledge on 2006/03/05 02:32:16 s/AU_NO_WRITE/AU_TO_NO_WRITE/ Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#2 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#24 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#20 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#1 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#2 $ .\" .Dd March 4, 2006 .Dt AU_OPEN 3 @@ -74,7 +74,7 @@ argument determines the behavior: a value of .Dv AU_TO_WRITE causes the record to be committed; a value of -.Dv AU_NO_WRITE +.Dv AU_TO_NO_WRITE causes it to be abandoned. When the audit record is committed, a BSM header will be inserted before tokens added to the record, using the event identifier passed via ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#24 (text+ko) ==== @@ -30,7 +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/openbsm/libbsm/bsm_audit.c#23 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#24 $ */ #include @@ -280,7 +280,7 @@ return (-1); /* Invalid descriptor */ } - if (keep == AU_NO_WRITE) { + if (keep == AU_TO_NO_WRITE) { retval = 0; goto cleanup; } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#20 (text+ko) ==== @@ -26,7 +26,7 @@ * 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_wrappers.c#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#20 $ */ #ifdef __APPLE__ @@ -164,21 +164,21 @@ /* Save the event-specific token. */ if (misctok && au_write(aufd, misctok) == -1) { au_free_token(misctok); - (void)au_close(aufd, AU_NO_WRITE, event_code); + (void)au_close(aufd, AU_TO_NO_WRITE, event_code); syslog(LOG_ERR, "%s: write of caller token failed", func); return (kAUWriteCallerTokErr); } /* Tokenize and save the return value. */ if ((rettok = au_to_return32(retval, errcode)) == NULL) { - (void)au_close(aufd, AU_NO_WRITE, event_code); + (void)au_close(aufd, AU_TO_NO_WRITE, event_code); syslog(LOG_ERR, "%s: au_to_return32() failed", func); return (kAUMakeReturnTokErr); } if (au_write(aufd, rettok) == -1) { au_free_token(rettok); - (void)au_close(aufd, AU_NO_WRITE, event_code); + (void)au_close(aufd, AU_TO_NO_WRITE, event_code); syslog(LOG_ERR, "%s: write of return code failed", func); return (kAUWriteReturnTokErr); }