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

« back to all changes in this revision

Viewing changes to kernel-patches/for-mainline/struct-flagval-not-needed.diff

• browse files at revision 6
• compare with another revision
• download diff
• download tarball
• view history from revision 6

Show diffs side-by-side

added

removed

kernel-patches/for-mainline/struct-flagval-not-needed.diff

1

 

There is no need to give struct flagval a name; it is only used

2

 

in this one place.

3

 

 

4

 

Index: b/security/apparmor/apparmor.h

5

 

===================================================================

6

 

--- a/security/apparmor/apparmor.h

7

 

+++ b/security/apparmor/apparmor.h

8

 

@@ -77,12 +77,6 @@ static inline int mediated_filesystem(st

9

 

 

10

 

 /* basic AppArmor data structures */

11

 

 

12

 

-struct flagval {

13

 

-       int debug;

14

 

-       int complain;

15

 

-       int audit;

16

 

-};

17

 

-

18

 

 #define AA_SECURE_EXEC_NEEDED 0x00000001

19

 

 

20

 

 #define AA_EXEC_MODIFIER_MASK(mask) ((mask) & AA_EXEC_MODIFIERS)

21

 

@@ -113,7 +107,11 @@ struct aa_profile {

22

 

 

23

 

        struct list_head list;

24

 

        struct list_head sub;

25

 

-       struct flagval flags;

26

 

+       struct {

27

 

+               int debug;

28

 

+               int complain;

29

 

+               int audit;

30

 

+       } flags;

31

 

        struct aa_profile *null_profile;

32

 

        int isstale;

33

 

 

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1