[apparmor] [patch 03/12] This is the patch Im testing on top of patch 6 locally to address these

[Seth Arnold]

On Mon, Aug 25, 2014 at 05:06:08PM -0700, john.johansen at canonical.com wrote:
> Signed-off-by: Steve Beattie <steve at nxnw.org>
> Acked-by: John Johansen <john.johansen at canonical.com>

Acked-by: Seth Arnold <seth.arnold at canonical.com>

Thanks

> 
> ---
>  parser/af_rule.cc |    2 +-
>  parser/af_unix.cc |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> Index: b/parser/af_rule.cc
> ===================================================================
> --- a/parser/af_rule.cc
> +++ b/parser/af_rule.cc
> @@ -80,7 +80,7 @@ int af_rule::move_base_cond(struct cond_
>  	} else if (strcmp(ent->name, "protocol") == 0) {
>  		yyerror("socket rule: 'protocol' conditional is not currently supported\n");
>  	} else if (strcmp(ent->name, "label") == 0) {
> -		if (peer)
> +		if (!peer)
>  			move_conditional_value("unix", &label, ent);
>  		else
>  			move_conditional_value("unix", &peer_label, ent);
> Index: b/parser/af_unix.cc
> ===================================================================
> --- a/parser/af_unix.cc
> +++ b/parser/af_unix.cc
> @@ -350,7 +350,7 @@ int unix_rule::gen_policy_re(Profile &pr
>  
>  		/* peer addr */
>  		if (peer_path) {
> -			if (strcmp(path, "none") == 0) {
> +			if (strcmp(peer_path, "none") == 0) {
>  				buffer << "\\x01";
>  			} else {
>  				/* skip leading @ */
> 
> 
> -- 
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140826/fcd8a14f/attachment.pgp>