From owner-p4-projects@FreeBSD.ORG  Sat Apr 23 12:07:19 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2DC6416A4D0; Sat, 23 Apr 2005 12:07:19 +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 CB09816A4CE
	for <perforce@freebsd.org>; Sat, 23 Apr 2005 12:07:18 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 973B743D45
	for <perforce@freebsd.org>; Sat, 23 Apr 2005 12:07:18 +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 j3NC7IWL064745
	for <perforce@freebsd.org>; Sat, 23 Apr 2005 12:07:18 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 j3NC7Ipa064742
	for perforce@freebsd.org; Sat, 23 Apr 2005 12:07:18 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 23 Apr 2005 12:07:18 GMT
Message-Id: <200504231207.j3NC7Ipa064742@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 <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 75796 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sat, 23 Apr 2005 12:07:19 -0000

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

Change 75796 by rwatson@rwatson_paprika on 2005/04/23 12:06:24

	Merge removal of bogus checks for nul-termination from FreeBSD to
	OpenBSM.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#3 (text+ko) ====

@@ -74,12 +74,7 @@
 		return NULL;	
 	}
 	
-	/* Make sure that text is null terminated */
 	textlen = strlen(text);
-	if(text[textlen] != '\0') {	
-		return NULL;
-	}
-	
 	GET_TOKEN_AREA(t, dptr, 9 + textlen);
 	if(t == NULL) {
 		return NULL;
@@ -107,12 +102,7 @@
 		return NULL;	
 	}
 	
-	/* Make sure that text is null terminated */
 	textlen = strlen(text);
-	if(text[textlen] != '\0') {	
-		return NULL;
-	}
-	
 	GET_TOKEN_AREA(t, dptr, 13 + textlen);
 	if(t == NULL) {
 		return NULL;
@@ -537,12 +527,7 @@
 	if(file == NULL) {
 		return NULL;
 	}
-	/* Make sure that text is null terminated */
 	filelen = strlen(file);
-	if(file[filelen] != '\0') {
-		return NULL;
-	}
- 
 	GET_TOKEN_AREA(t, dptr, filelen + 12);
 	if(t == NULL) {
 		return NULL;
@@ -576,12 +561,7 @@
 	if(text == NULL) {
 		return NULL;
 	}
-	/* Make sure that text is null terminated */
 	textlen = strlen(text);
-	if(text[textlen] != '\0') {
-		return NULL;
-	}
-
 	GET_TOKEN_AREA(t, dptr, textlen + 4);
 	if(t == NULL) {
 		return NULL;
@@ -610,12 +590,7 @@
 	if(text == NULL) {
 		return NULL;
 	}
-	/* Make sure that text is null terminated */
 	textlen = strlen(text);
-	if(text[textlen] != '\0') {
-		return NULL;
-	}
-
 	GET_TOKEN_AREA(t, dptr, textlen + 4);
 	if(t == NULL) {
 		return NULL;
@@ -1087,10 +1062,6 @@
 		int nextlen;
 	
 		nextlen = strlen(nextarg);
-		if(nextarg[nextlen] != '\0') {
-			return NULL;
-		}
-		
 		totlen += nextlen + 1;
 		count++;
 		nextarg = *(args + count);
@@ -1137,10 +1108,6 @@
 		int nextlen;
 		
 		nextlen = strlen(nextenv);
-		if(nextenv[nextlen] != '\0') {
-			return NULL;
-		}
-		
 		totlen += nextlen + 1;
 		count++;
 		nextenv = *(env + count);