[apparmor] [patch 09/24] fix: network detection

john.johansen at canonical.com john.johansen at canonical.com
Fri Mar 7 17:31:30 UTC 2014


The features file patch broke detection of network support.

Signed-off-by: John Johansen <john.johansen at canonical.com>
---
 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)




More information about the AppArmor mailing list