PERFORCE change 79844 for review

[Robert Watson]

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

Change 79844 by rwatson at 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;
 
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message