SOURCES (LINUX_2_6_20): linux-2.6-apparmor-caps.patch - up to 2.6.20

[zbyniu]

Author: zbyniu                       Date: Sun Mar 25 22:59:57 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_20
---- Log message:
- up to 2.6.20

---- Files affected:
SOURCES:
   linux-2.6-apparmor-caps.patch (1.1.2.1 -> 1.1.2.1.2.1) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-apparmor-caps.patch
diff -u SOURCES/linux-2.6-apparmor-caps.patch:1.1.2.1 SOURCES/linux-2.6-apparmor-caps.patch:1.1.2.1.2.1
--- SOURCES/linux-2.6-apparmor-caps.patch:1.1.2.1	Fri Dec 22 13:36:24 2006
+++ SOURCES/linux-2.6-apparmor-caps.patch	Mon Mar 26 00:59:52 2007
@@ -1,12 +1,10 @@
---- linux-2.6.16/security/apparmor/capabilities.c~	2006-12-14 16:33:24.000000000 +0100
-+++ linux-2.6.16/security/apparmor/capabilities.c	2006-12-17 20:59:31.243483000 +0100
-@@ -40,7 +40,10 @@ static const char *capnames[] = {
- 	"sys_time",
- 	"sys_tty_config",
+--- linux-2.6.20/security/apparmor/capabilities.c~	2007-03-25 22:48:45.211484250 +0000
++++ linux-2.6.20/security/apparmor/capabilities.c	2007-03-25 22:49:42.059037000 +0000
+@@ -42,7 +42,8 @@ static const char *cap_names[] = {
  	"mknod",
--	"lease"
-+	"lease",
-+	"audit_write",
+ 	"lease",
+ 	"audit_write",
+-	"audit_control"
 +	"audit_control",
 +	"context"
  };
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-apparmor-caps.patch?r1=1.1.2.1&r2=1.1.2.1.2.1&f=u