rpms/rsyslog/F-8 rsyslog-2.0.2-omfile.patch, NONE, 1.1 rsyslog.spec, 1.25, 1.26

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/rsyslog/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25843

Modified Files:
	rsyslog.spec 
Added Files:
	rsyslog-2.0.2-omfile.patch 
Log Message:
fix config file parsing (#436722)


rsyslog-2.0.2-omfile.patch:

--- NEW FILE rsyslog-2.0.2-omfile.patch ---
diff -up rsyslog-2.0.2/omfile.c.orig rsyslog-2.0.2/omfile.c
--- rsyslog-2.0.2/omfile.c.orig	2008-03-10 16:51:01.000000000 +0100
+++ rsyslog-2.0.2/omfile.c	2008-03-10 18:16:24.000000000 +0100
@@ -344,7 +344,8 @@ static void dynaFileFreeCache(instanceDa
 		dynaFileDelCacheEntry(pData->dynCache, i, 1);
 	}
 
-	free(pData->dynCache);
+	if(pData->dynCache != NULL)
+		free(pData->dynCache);
 }
 
 
@@ -605,7 +606,7 @@ BEGINfreeInstance
 CODESTARTfreeInstance
 	if(pData->bDynamicName) {
 		dynaFileFreeCache(pData);
-	} else 
+	} else if(pData->fd != -1)
 		close(pData->fd);
 ENDfreeInstance
 
diff -up rsyslog-2.0.2/syslogd.c.orig rsyslog-2.0.2/syslogd.c
--- rsyslog-2.0.2/syslogd.c.orig	2008-03-10 18:10:59.000000000 +0100
+++ rsyslog-2.0.2/syslogd.c	2008-03-10 18:11:11.000000000 +0100
@@ -5220,6 +5220,7 @@ static rsRetVal cflineDoAction(uchar **p
 	/* loop through all modules and see if one picks up the line */
 	pMod = omodGetNxt(NULL);
 	while(pMod != NULL) {
+		pOMSR = NULL;
 		iRet = pMod->mod.om.parseSelectorAct(p, &pModData, &pOMSR);
 		dbgprintf("tried selector action for %s: %d\n", modGetName(pMod), iRet);
 		if(iRet == RS_RET_OK || iRet == RS_RET_SUSPENDED) {
diff -up rsyslog-2.0.2/module-template.h.orig rsyslog-2.0.2/module-template.h
--- rsyslog-2.0.2/module-template.h.orig	2008-03-10 18:39:45.000000000 +0100
+++ rsyslog-2.0.2/module-template.h	2008-03-10 18:45:24.000000000 +0100
@@ -260,7 +260,7 @@ finalize_it:\
 			*ppOMSR = NULL;\
 		}\
 		if(pData != NULL)\
-			freeInstance(&pData);\
+			freeInstance(pData);\
 	}
 
 #define ENDparseSelectorAct \


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/F-8/rsyslog.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rsyslog.spec	18 Feb 2008 12:34:15 -0000	1.25
+++ rsyslog.spec	11 Mar 2008 13:08:23 -0000	1.26
@@ -3,13 +3,14 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 2.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
 Source0: http://download.rsyslog.com/rsyslog/%{name}-%{version}.tar.gz
 Source1: rsyslog.init
 Source2: rsyslog.sysconfig
+Patch1: rsyslog-2.0.2-omfile.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake libtool
 Requires: logrotate >= 3.5.2
@@ -54,6 +55,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .omfile
 
 %build
 %configure --sbindir=%{sbindir} --disable-static --enable-mysql --enable-pgsql
@@ -131,6 +133,9 @@
 %{_libdir}/rsyslog/ompgsql.so
 
 %changelog
+* Tue Mar 11 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.2-3
+- fix config file parsing (#436722)
+
 * Mon Feb 18 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.2-2
 - include createDB.sql in PostgresSQL plugin