From owner-p4-projects@FreeBSD.ORG  Fri Nov 21 11:39:45 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 63DAB16A4D0; Fri, 21 Nov 2003 11:39:45 -0800 (PST)
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 3E76F16A4CE
	for <perforce@freebsd.org>; Fri, 21 Nov 2003 11:39:45 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9973843F75
	for <perforce@freebsd.org>; Fri, 21 Nov 2003 11:39:44 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hALJdiXJ005136
	for <perforce@freebsd.org>; Fri, 21 Nov 2003 11:39:44 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hALJdi5r005133
	for perforce@freebsd.org; Fri, 21 Nov 2003 11:39:44 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 21 Nov 2003 11:39:44 -0800 (PST)
Message-Id: <200311211939.hALJdi5r005133@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 42899 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: Fri, 21 Nov 2003 19:39:45 -0000

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

Change 42899 by rwatson@rwatson_tislabs on 2003/11/21 11:39:43

	Apply cvance's fix to the MAC and SEBSD branches to the SEDarwin
	branch: correct logic in the event that a userspace process
	requests externalization of multiple optional labels, and
	we satisfy only one.  Otherwise, there's an extra leading
	comma.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#32 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#32 (text+ko) ====

@@ -446,10 +446,9 @@
 		 } else							\
 			ignorenotfound = 0;				\
 		savedlen = sbuf_len(&sb);				\
-		if (first) {						\
+		if (first)						\
 			error = sbuf_printf(&sb, "%s/", element_name);	\
-			first = 0;					\
-		} else							\
+		else							\
 			error = sbuf_printf(&sb, ",%s/", element_name);	\
 		if (error == -1) {					\
 			error = ENOMEM;	/* XXX: E2BIG? */		\
@@ -466,7 +465,9 @@
 		} else if (claimed != 1) {				\
 			error = ENOENT;	/* XXX: ENOLABEL? */		\
 			break;						\
-		} 							\
+		} else { 						\
+			first = 0;					\
+		}							\
 	}								\
 	sbuf_finish(&sb);						\
 } while (0)