rpms/kernel/devel kernel-2.6.spec, 1.1626.2.1, 1.1626.2.2 linux-2.6.13-audit-SE-context.patch, 1.1.2.1, 1.1.2.2

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv547

Modified Files:
      Tag: private-rawhide-lspp-branch
	kernel-2.6.spec linux-2.6.13-audit-SE-context.patch 
Log Message:
fix Dustin's patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1626.2.1
retrieving revision 1.1626.2.2
diff -u -r1.1626.2.1 -r1.1626.2.2
--- kernel-2.6.spec	25 Oct 2005 16:44:13 -0000	1.1626.2.1
+++ kernel-2.6.spec	25 Oct 2005 16:51:48 -0000	1.1626.2.2
@@ -816,7 +816,7 @@
 %patch20001 -p1 -b .p20001
 %patch20002 -p1 -b .p20002
 %patch20003 -p1 -b .p20003
-#%patch20004 -p1 -b .p20004
+%patch20004 -p1 -b .p20004
 %patch20005 -p1 -b .p20005
 %patch20006 -p1 -b .p20006
 

linux-2.6.13-audit-SE-context.patch:
 include/linux/audit.h    |    8 ++
 include/linux/security.h |   27 ++++++++++
 ipc/msg.c                |    5 +
 ipc/sem.c                |    5 -
 ipc/shm.c                |    4 -
 ipc/util.c               |    2 
 kernel/audit.c           |    2 
 kernel/auditsc.c         |  126 +++++++++++++++++++++++++++++++++++++++++++++--
 security/dummy.c         |    6 ++
 security/selinux/hooks.c |   96 ++++++++++++++++-------------------
 10 files changed, 216 insertions(+), 65 deletions(-)

Index: linux-2.6.13-audit-SE-context.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6.13-audit-SE-context.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6.13-audit-SE-context.patch	25 Oct 2005 16:44:13 -0000	1.1.2.1
+++ linux-2.6.13-audit-SE-context.patch	25 Oct 2005 16:51:49 -0000	1.1.2.2
@@ -368,7 +368,7 @@
 +	if (!security_inode_xattr_getsuffix())
 +		return;
 +
-+	len = security_inode_getsecurity(inode, (char *)security_inode_xattr_getsuffix(), NULL, 0);
++	len = security_inode_getsecurity(inode, (char *)security_inode_xattr_getsuffix(), NULL, 0, 0);
 +	if (len < 0) 
 +		goto error_path;
 +
@@ -376,7 +376,7 @@
 +	if (!ctx) 
 +		goto error_path;
 +
-+	len = security_inode_getsecurity(inode, (char *)security_inode_xattr_getsuffix(), ctx, len);
++	len = security_inode_getsecurity(inode, (char *)security_inode_xattr_getsuffix(), ctx, len, 0);
 +	if (len < 0)
 +		goto error_path;
 +