From owner-p4-projects@FreeBSD.ORG  Wed Jun 20 00:56:20 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A8D1B16A475; Wed, 20 Jun 2007 00:56:20 +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 485BE16A46C
	for <perforce@freebsd.org>; Wed, 20 Jun 2007 00:56:20 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 37DED13C45D
	for <perforce@freebsd.org>; Wed, 20 Jun 2007 00:56:20 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5K0uKEA033392
	for <perforce@freebsd.org>; Wed, 20 Jun 2007 00:56:20 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5K0uKZ3033379
	for perforce@freebsd.org; Wed, 20 Jun 2007 00:56:20 GMT
	(envelope-from csjp@freebsd.org)
Date: Wed, 20 Jun 2007 00:56:20 GMT
Message-Id: <200706200056.l5K0uKZ3033379@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 122000 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Jun 2007 00:56:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=122000

Change 122000 by csjp@push on 2007/06/20 00:55:23

	- Fix bug in in_addr_ex tokens where the incorrect amount of data
	  was being copied for ip6 addresses.
	- Fix printing bug which resulted in the strings associated with
	  arg32 tokens were not being processed.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#49 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#63 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#49 (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#48 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#49 $
  */
 
 #include <sys/types.h>
@@ -1306,6 +1306,7 @@
 		print_delim(fp, del);
 		print_4_bytes(fp, tok->tt.arg32.val, "0x%x");
 		print_delim(fp, del);
+		print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len);
 	}
 }
 

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#63 (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#62 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#63 $
  */
 
 #include <sys/types.h>
@@ -411,7 +411,7 @@
 
 	ADD_U_CHAR(dptr, AUT_IN_ADDR_EX);
 	ADD_U_INT32(dptr, type);
-	ADD_MEM(dptr, internet_addr, 5 * sizeof(uint32_t));
+	ADD_MEM(dptr, internet_addr, 4 * sizeof(uint32_t));
 
 	return (t);
 }