SOURCES: kernel-apparmor-common.patch - support for security= in cmdline

[zbyniu]

Author: zbyniu                       Date: Fri Oct 31 14:10:19 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- support for security= in cmdline

---- Files affected:
SOURCES:
   kernel-apparmor-common.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-apparmor-common.patch
diff -u SOURCES/kernel-apparmor-common.patch:1.1 SOURCES/kernel-apparmor-common.patch:1.2
--- SOURCES/kernel-apparmor-common.patch:1.1	Wed Oct 29 23:32:02 2008
+++ SOURCES/kernel-apparmor-common.patch	Fri Oct 31 15:10:13 2008
@@ -36,3 +36,18 @@
  
  int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
  			  struct vfsmount *old_mnt, struct inode *new_dir,
+===
+=== support for security= in cmdline
+===
+--- i/security/apparmor/lsm.c~	2008-10-31 14:35:08.000000000 +0100
++++ i/security/apparmor/lsm.c	2008-10-31 15:00:32.222153300 +0100
+@@ -988,6 +988,9 @@ void info_message(const char *str)
+ static int __init apparmor_init(void)
+ {
+ 	int error;
++
++	if (!security_module_enable(&apparmor_ops))
++			return 0;
+ 
+ 	if (!apparmor_enabled) {
+ 		info_message("AppArmor disabled by boottime parameter\n");
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-apparmor-common.patch?r1=1.1&r2=1.2&f=u