Date: Sat, 9 Jul 2005 17:01:43 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 79844 for review Message-ID: <200507091701.j69H1h24078590@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507091701.j69H1h24078590>