From owner-trustedbsd-cvs@FreeBSD.ORG Fri Dec 15 11:53:06 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8147C16A403 for ; Fri, 15 Dec 2006 11:53:06 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63DC943CA6 for ; Fri, 15 Dec 2006 11:51:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id 4C24F46FA5 for ; Fri, 15 Dec 2006 06:53:02 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id EA4E25CB94; Fri, 15 Dec 2006 11:51:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AD5D16A417; Fri, 15 Dec 2006 11:51:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 196E216A415 for ; Fri, 15 Dec 2006 11:51:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9725E43CA4 for ; Fri, 15 Dec 2006 11:49:54 +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.6/8.13.6) with ESMTP id kBFBpZaF004619 for ; Fri, 15 Dec 2006 11:51:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBFBpZ9q004615 for perforce@freebsd.org; Fri, 15 Dec 2006 11:51:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 15 Dec 2006 11:51:35 GMT Message-Id: <200612151151.kBFBpZ9q004615@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 111731 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Dec 2006 11:53:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=111731 Change 111731 by rwatson@rwatson_peppercorn on 2006/12/15 11:50:43 Trim trailing white space. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#45 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#58 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#45 (text+ko) ==== @@ -32,7 +32,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_io.c#44 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#45 $ */ #include @@ -729,7 +729,7 @@ fprintf(fp, "%s", inet_ntoa(ipaddr)); } -/* +/* * Prints a string value for the given ip address. */ static void @@ -1026,7 +1026,7 @@ * event modifier 2 bytes * seconds of time 4 bytes/8 bytes (32-bit/64-bit value) * milliseconds of time 4 bytes/8 bytes (32-bit/64-bit value) - * version # + * version # */ static int fetch_header64_tok(tokenstr_t *tok, u_char *buf, int len) @@ -2670,19 +2670,19 @@ } } -/* - * token ID 1 byte - * audit ID 4 bytes - * effective user ID 4 bytes - * effective group ID 4 bytes - * real user ID 4 bytes - * real group ID 4 bytes - * process ID 4 bytes - * session ID 4 bytes - * terminal ID +/* + * token ID 1 byte + * audit ID 4 bytes + * effective user ID 4 bytes + * effective group ID 4 bytes + * real user ID 4 bytes + * real group ID 4 bytes + * process ID 4 bytes + * session ID 4 bytes + * terminal ID * port ID 4 bytes - * address type-len 4 bytes - * machine address 16 bytes + * address type-len 4 bytes + * machine address 16 bytes */ static int fetch_process32ex_tok(tokenstr_t *tok, u_char *buf, int len) @@ -2800,19 +2800,19 @@ } } -/* - * token ID 1 byte - * audit ID 4 bytes - * effective user ID 4 bytes - * effective group ID 4 bytes - * real user ID 4 bytes - * real group ID 4 bytes - * process ID 4 bytes - * session ID 4 bytes - * terminal ID +/* + * token ID 1 byte + * audit ID 4 bytes + * effective user ID 4 bytes + * effective group ID 4 bytes + * real user ID 4 bytes + * real group ID 4 bytes + * process ID 4 bytes + * session ID 4 bytes + * terminal ID * port ID 8 bytes - * address type-len 4 bytes - * machine address 16 bytes + * address type-len 4 bytes + * machine address 16 bytes */ static int fetch_process64ex_tok(tokenstr_t *tok, u_char *buf, int len) ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#58 (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_token.c#57 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#58 $ */ #include @@ -783,7 +783,7 @@ u_char *dptr = NULL; if (tid->at_type == AU_IPv4) - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 7 * sizeof(u_int32_t) + sizeof(u_int64_t) + 2 * sizeof(u_int32_t)); else if (tid->at_type == AU_IPv6)