From owner-p4-projects@FreeBSD.ORG  Sat Jul  9 17:01:44 2005
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 4B71B16A420; Sat,  9 Jul 2005 17:01:44 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 097AB16A41C
	for <perforce@freebsd.org>; Sat,  9 Jul 2005 17:01:44 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D04E243D46
	for <perforce@freebsd.org>; Sat,  9 Jul 2005 17:01:43 +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 j69H1hsG078593
	for <perforce@freebsd.org>; Sat, 9 Jul 2005 17:01:43 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 j69H1h24078590
	for perforce@freebsd.org; Sat, 9 Jul 2005 17:01:43 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 9 Jul 2005 17:01:43 GMT
Message-Id: <200507091701.j69H1h24078590@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>
Cc: 
Subject: PERFORCE change 79844 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: Sat, 09 Jul 2005 17:01:45 -0000

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

Change 79844 by rwatson@rwatson_zoo on 2005/07/09 17:01:18

	Correct possible conflict mis-merge for mac_portacl from the MAC
	branch to the SEBSD branch.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/security/mac_portacl/mac_portacl.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/security/mac_portacl/mac_portacl.c#9 (text+ko) ====

@@ -193,7 +193,7 @@
 static int
 parse_rule_element(char *element, struct rule **rule)
 {
-	char *idtype, *id, *rtype, *portnumber, *prison, *p;
+	char *idtype, *id, *portnumber, *protocol, *prison, *p;
 	struct rule *new;
 	int error;