rpms/audit/devel audit-1.5.2-segfault.patch, NONE, 1.1 audit.spec, 1.132, 1.133

[fedora-cvs-commits at redhat.com]

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2113

Modified Files:
	audit.spec 
Added Files:
	audit-1.5.2-segfault.patch 
Log Message:
* Thu Mar 29 2007 Steve Grubb <sgrubb at redhat.com> 1.5.1-2
- Remove requires kernel-headers for python-libs
- Apply patch to prevent segfaults on auditd reload


audit-1.5.2-segfault.patch:
 auditd-event.c |   45 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 13 deletions(-)

--- NEW FILE audit-1.5.2-segfault.patch ---
diff -urp audit-1.5.2.orig/src/auditd-event.c audit-1.5.2/src/auditd-event.c
--- audit-1.5.2.orig/src/auditd-event.c	2007-02-20 18:01:42.000000000 -0500
+++ audit-1.5.2/src/auditd-event.c	2007-03-23 11:36:34.000000000 -0400
@@ -1006,10 +1006,16 @@ static void reconfigure(struct auditd_co
 	}
 
 	// space left exe
-	if (strcmp(oconf->space_left_exe, nconf->space_left_exe))
-		need_space_check = 1;
-	free(oconf->space_left_exe);
-	oconf->space_left_exe = nconf->space_left_exe;
+	if (oconf->space_left_exe || nconf->space_left_exe) {
+		if (nconf->space_left_exe == NULL)
+			; /* do nothing if new one is blank */
+		else if (oconf->space_left_exe == NULL && nconf->space_left_exe)
+			need_space_check = 1;
+		else if (strcmp(oconf->space_left_exe, nconf->space_left_exe))
+			need_space_check = 1;
+		free(oconf->space_left_exe);
+		oconf->space_left_exe = nconf->space_left_exe;
+	}
 
 	// admin space left
 	if (oconf->admin_space_left != nconf->admin_space_left) {
@@ -1024,11 +1030,18 @@ static void reconfigure(struct auditd_co
 	}
 
 	// admin space left exe
-	if (strcmp(oconf->admin_space_left_exe, nconf->admin_space_left_exe))
-		need_space_check = 1;
-	free(oconf->admin_space_left_exe);
-	oconf->admin_space_left_exe = nconf->admin_space_left_exe;
-
+	if (oconf->admin_space_left_exe || nconf->admin_space_left_exe) {
+		if (nconf->admin_space_left_exe == NULL)
+			; /* do nothing if new one is blank */
+		else if (oconf->admin_space_left_exe == NULL &&
+					 nconf->admin_space_left_exe)
+			need_space_check = 1;
+		else if (strcmp(oconf->admin_space_left_exe,
+					nconf->admin_space_left_exe))
+			need_space_check = 1;
+		free(oconf->admin_space_left_exe);
+		oconf->admin_space_left_exe = nconf->admin_space_left_exe;
+	}
 	// disk full action
 	if (oconf->disk_full_action != nconf->disk_full_action) {
 		oconf->disk_full_action = nconf->disk_full_action;
@@ -1036,10 +1049,16 @@ static void reconfigure(struct auditd_co
 	}
 
 	// disk full exe
-	if (strcmp(oconf->disk_full_exe, nconf->disk_full_exe))
-		need_space_check = 1;
-	free(oconf->disk_full_exe);
-	oconf->disk_full_exe = nconf->disk_full_exe;
+	if (oconf->disk_full_exe || nconf->disk_full_exe) {
+		if (nconf->disk_full_exe == NULL)
+			; /* do nothing if new one is blank */
+		else if (oconf->disk_full_exe == NULL && nconf->disk_full_exe)
+			need_space_check = 1;
+		else if (strcmp(oconf->disk_full_exe, nconf->disk_full_exe))
+			need_space_check = 1;
+		free(oconf->disk_full_exe);
+		oconf->disk_full_exe = nconf->disk_full_exe;
+	}
 
 	if (need_space_check) {
 		/* note save suspended flag, then do space_left. If suspended


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- audit.spec	20 Mar 2007 16:34:48 -0000	1.132
+++ audit.spec	29 Mar 2007 12:19:50 -0000	1.133
@@ -1,11 +1,12 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
+Patch1: audit-1.5.2-segfault.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool swig python-devel pkgconfig
 BuildRequires: kernel-headers >= 2.6.18
@@ -46,7 +47,6 @@
 License: LGPL
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: kernel-headers >= 2.6.18
 
 %description libs-python
 The audit-libs-python package contains the bindings so that libaudit
@@ -62,6 +62,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 autoreconf -fv --install
@@ -191,6 +192,10 @@
 %doc %attr(640,root,root) /etc/audispd/policies.d/README-CONF_POLICIES_D
 
 %changelog
+* Thu Mar 29 2007 Steve Grubb <sgrubb at redhat.com> 1.5.1-2
+- Remove requires kernel-headers for python-libs
+- Apply patch to prevent segfaults on auditd reload
+
 * Tue Mar 20 2007 Steve Grubb <sgrubb at redhat.com> 1.5.1-1
 - Updated autrace to monitor *at syscalls
 - Add support in libaudit for AUDIT_BIT_TEST(^) and AUDIT_MASK_TEST (&)