From owner-p4-projects@FreeBSD.ORG Sat Oct 4 13:29:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F303A1065690; Sat, 4 Oct 2008 13:29:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EDC7106568D for ; Sat, 4 Oct 2008 13:29:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B3F78FC1B for ; Sat, 4 Oct 2008 13:29:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m94DTFOG023868 for ; Sat, 4 Oct 2008 13:29:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m94DTFxx023866 for perforce@freebsd.org; Sat, 4 Oct 2008 13:29:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Oct 2008 13:29:15 GMT Message-Id: <200810041329.m94DTFxx023866@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 150960 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: Sat, 04 Oct 2008 13:29:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=150960 Change 150960 by rwatson@rwatson_cinnamon on 2008/10/04 13:28:52 Update and clean up audit.log(5) some: Synchronize definitions of in_addr and in_addr_ex tokens to our implementation. Comment out definition of expanded IP token as we don't support it currently. The BUGS entry likely applies only to in_addr_ex, where there's a confusion about type vs. length on addresses. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#18 (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/man/audit.log.5#17 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#18 $ .\" .Dd November 5, 2006 .Dt AUDIT.LOG 5 @@ -176,29 +176,27 @@ .Ss in_addr Token The .Dq in_addr -token holds a network byte order IPv4 or IPv6 address. +token holds a network byte order IPv4 address. An .Dq in_addr token can be created using .Xr au_to_in_addr 3 -for an IPv4 address, or -.Xr au_to_in_addr_ex 3 -for an IPv6 address. -.Pp -See the -.Sx BUGS -section for information on the storage of this token. +for an IPv4 address. .Pp .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It "IP Address Type 1 byte Type of address" -.It "IP Address 4/16 bytes IPv4 or IPv6 address" +.It "IP Address 4 bytes IPv4 address" .El .Ss Expanded in_addr Token The -.Dq expanded in_addr -token ... +.Dq in_addr_ex +token holds a network byte order IPv4 or IPv6 address. +An +.Dq in_addr_ex +token can be created using +.Xr au_to_in_addr_ex 3 +for an IPv6 address. .Pp See the .Sx BUGS @@ -206,7 +204,8 @@ .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXX +.It "IP Address Type 1 byte Type of address" +.It "IP Address 4/16 bytes IPv4 or IPv6 address" .El .Ss ip Token The @@ -230,15 +229,15 @@ .It "Source Address 4 bytes IPv4 source address" .It "Destination Address 4 bytes IPv4 destination address" .El -.Ss Expanded ip Token -The -.Dq expanded ip -token ... -.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" -.It Sy "Field Bytes Description" -.It "Token ID 1 byte Token ID" -.It XXXX -.El +.\" .Ss Expanded ip Token +.\" The +.\" .Dq expanded ip +.\" token ... +.\" .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.\" .It Sy "Field Bytes Description" +.\" .It "Token ID 1 byte Token ID" +.\" .It XXXX +.\" .El .Ss iport Token The .Dq iport @@ -677,7 +676,5 @@ .Dq in_addr_ex token layout documented here appears to be in conflict with the .Xr libbsm 3 -implementations of -.Xr au_to_in_addr 3 -and +implementation of .Xr au_to_in_addr_ex 3 .