~ubuntu-branches/ubuntu/wily/apparmor/wily

« back to all changes in this revision

Viewing changes to kernel-patches/for-mainline/dfa-table-order.diff

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2011-04-27 10:38:07 UTC
  • mfrom: (5.1.118 natty)
  • Revision ID: james.westby@ubuntu.com-20110427103807-ym3rhwys6o84ith0
Tags: 2.6.1-2
debian/copyright: clarify for some full organization names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: b/security/apparmor/match.h
2
 
===================================================================
3
 
--- a/security/apparmor/match.h
4
 
+++ b/security/apparmor/match.h
5
 
@@ -22,13 +22,14 @@ struct table_set_header {
6
 
        char            th_version[];
7
 
 };
8
 
 
9
 
-#define        YYTD_ID_ACCEPT  1 /* 1 */
10
 
-#define YYTD_ID_BASE   2 /* 2 */
11
 
-#define YYTD_ID_CHK    3 /* 3 */
12
 
-#define YYTD_ID_DEF    4 /* 4 */
13
 
-#define YYTD_ID_EC     5 /* 5 */
14
 
-#define YYTD_ID_NXT    6 /* 8 */
15
 
-#define YYTD_ID_META   7 /* 6 */
16
 
+#define        YYTD_ID_ACCEPT  1
17
 
+#define YYTD_ID_BASE   2
18
 
+#define YYTD_ID_CHK    3
19
 
+#define YYTD_ID_DEF    4
20
 
+#define YYTD_ID_EC     5
21
 
+#define YYTD_ID_META   6
22
 
+#define YYTD_ID_NXT    8
23
 
+
24
 
 
25
 
 #define YYTD_DATA8     1
26
 
 #define YYTD_DATA16    2