SOURCES (LINUX_2_6_20): grsecurity-2.1.10-2.6.20.3.patch - small c...

[zbyniu]

Author: zbyniu                       Date: Sun Mar 25 19:50:40 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_20
---- Log message:
- small corrections

---- Files affected:
SOURCES:
   grsecurity-2.1.10-2.6.20.3.patch (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SOURCES/grsecurity-2.1.10-2.6.20.3.patch
diff -u SOURCES/grsecurity-2.1.10-2.6.20.3.patch:1.1.2.2 SOURCES/grsecurity-2.1.10-2.6.20.3.patch:1.1.2.3
--- SOURCES/grsecurity-2.1.10-2.6.20.3.patch:1.1.2.2	Sat Mar 24 05:15:48 2007
+++ SOURCES/grsecurity-2.1.10-2.6.20.3.patch	Sun Mar 25 21:50:35 2007
@@ -21644,10 +21644,10 @@
 +{
 +#ifdef CONFIG_GRKERNSEC
 +	if (!gr_acl_is_enabled())
-+		return vx_mbcap(cap_effective);;
-+	else if (cap_raised(vx_mbcap(cap_effective);, CAP_NET_ADMIN) &&
++		return vx_mbcap(cap_effective);
++	else if (cap_raised(vx_mbcap(cap_effective), CAP_NET_ADMIN) &&
 +		 gr_task_is_capable(current, CAP_NET_ADMIN))
-+		vx_mbcap(cap_effective);;
++		vx_mbcap(cap_effective);
 +	else
 +		return 0;
 +#else
@@ -23983,8 +23983,8 @@
  };
  
 -extern struct i386_pda *_cpu_pda[];
-+extern struct i386_pda * const _cpu_pda[NR_CPUS];
-+extern struct i386_pda __cpu_pda[NR_CPUS];
++extern struct i386_pda * const _cpu_pda[];
++extern struct i386_pda __cpu_pda[];
  
  #define cpu_pda(i)	(_cpu_pda[i])
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/grsecurity-2.1.10-2.6.20.3.patch?r1=1.1.2.2&r2=1.1.2.3&f=u