[apparmor] [patch 05/26] fix: network detection

[Seth Arnold]

On Tue, Apr 15, 2014 at 10:22:12AM -0700, john.johansen at canonical.com wrote:
> The features file patch broke detection of network support.
> 
> Signed-off-by: John Johansen <john.johansen at canonical.com>

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

Thanks

> ---
>  parser/parser_common.c |    2 +-
>  parser/parser_main.c   |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> --- 2.9-test.orig/parser/parser_common.c
> +++ 2.9-test/parser/parser_common.c
> @@ -25,7 +25,7 @@
>  int perms_create = 0;                   /* perms contain create flag */
>  int net_af_max_override = -1;           /* use kernel to determine af_max */
>  int kernel_load = 1;
> -int kernel_supports_network = 1;        /* kernel supports network rules */
> +int kernel_supports_network = 0;        /* kernel supports network rules */
>  int kernel_supports_mount = 0;	        /* kernel supports mount rules */
>  int kernel_supports_dbus = 0;		/* kernel supports dbus rules */
>  int conf_verbose = 0;
> --- 2.9-test.orig/parser/parser_main.c
> +++ 2.9-test/parser/parser_main.c
> @@ -814,11 +814,11 @@
>  		if (strstr(match_string, " perms=c"))
>  			perms_create = 1;
>  		free(match_string);
> +		kernel_supports_network = 1;
>  		goto out;
>  	}
>  no_match:
>  	perms_create = 1;
> -	kernel_supports_network = 0;
>  
>  out:
>  	if (ms)
> 
> 
> -- 
> 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/20140415/21611c81/attachment.pgp>