Merge branch 'v4-stable' into v5-stable

NOTE: this merge has problems, to be fixed with follow-up commits
If file creation fails due to out of memory, we can enter a tight loop.

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/parser.c
	runtime/rsyslog.h
	tests/Makefile.am
	tests/tcpflood.c

3 files changed, 40 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index cba61744..718d776b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -315,6 +315,8 @@ Version 5.6.2  [V5-STABLE] (rgerhards), 2010-11-30
 - added the $InputFilePersistStateInterval config directive to imfile
 - changed imfile so that the state file is never deleted (makes imfile
   more robust in regard to fatal failures)
+- bugfix: a slightly more informative error message when a TCP
+  connections is aborted
 ---------------------------------------------------------------------------
 Version 5.6.1  [V5-STABLE] (rgerhards), 2010-11-24
 - bugfix(important): problem in TLS handling could cause rsyslog to loop
@@ -820,6 +822,32 @@ increase.
 - increased ompgsql performance by adapting to new transactional
   output module interface
 ---------------------------------------------------------------------------
+Version 4.8.1  [v4-beta], 2011-09-??
+- bugfix: potential abort if ultra-large file io buffers are used and
+  dynafile cache exhausts address space (primarily a problem on 32 bit
+  platforms)
+---------------------------------------------------------------------------
+Version 4.8.0  [v4-stable] (rgerhards), 2011-09-07
+***************************************************************************
+* This is a new stable v4 version. It contains all fixes and enhancements *
+* made during the 4.7.x phase as well as those listed below.              *
+* Note: major new development to v4 is concluded  and will only be done   *
+*       for custom projects.                                              *
+***************************************************************************
+There are no changes compared to 4.7.5, just a re-release with the new
+version number as new v4-stable. The most important new feature is Solaris
+support.
+---------------------------------------------------------------------------
+Version 4.7.5  [v4-beta], 2011-09-01
+- bugfix/security: off-by-two bug in legacy syslog parser, CVE-2011-3200
+- bugfix: potential misadressing in property replacer
+- bugfix: The NUL-Byte for the syslogtag was not copied in MsgDup (msg.c)
+---------------------------------------------------------------------------
+Version 4.7.4  [v4-beta] (rgerhards), 2011-07-11
+- added support for the ":omusrmsg:" syntax in configuring user messages
+- added support for the ":omfile:" syntax in configuring user messages
+- added $LocalHostName config directive
+- bugfix: PRI was invalid on Solaris for message from local log socket
 Version 4.7.3  [v4-devel] (rgerhards), 2010-11-25
 - added omuxsock, which permits to write message to local Unix sockets
   this is the counterpart to imuxsock, enabling fast local forwarding
diff --git a/tools/omfile.c b/tools/omfile.c
index 150848eb..6a2d5e24 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -388,6 +388,7 @@ prepareFile(instanceData *pData, uchar *newFileName)
 	int fd;
 	DEFiRet;
 
+	pData->pStrm = NULL;
 	if(access((char*)newFileName, F_OK) == 0) {
 		if(pData->bForceChown) {
 			/* Try to fix wrong ownership set by someone else. Note that this code
@@ -473,6 +474,11 @@ prepareFile(instanceData *pData, uchar *newFileName)
 	CHKiRet(strm.ConstructFinalize(pData->pStrm));
 	
 finalize_it:
+	if(iRet != RS_RET_OK) {
+		if(pData->pStrm != NULL) {
+			strm.Destruct(&pData->pStrm);
+		}
+	}
 	RETiRet;
 }
 
@@ -549,7 +555,7 @@ prepareDynFile(instanceData *pData, uchar *newFileName, unsigned iMsgOpts)
 	pData->iCurrElt = -1;
 	/* similarly, we need to set the current pStrm to NULL, because otherwise, if prepareFile() fails,
 	 * we may end up using an old stream. This bug depends on how exactly prepareFile fails,
-	 * but it* could be triggered in the common case of a failed open() system call.
+	 * but it could be triggered in the common case of a failed open() system call.
 	 * rgerhards, 2010-03-22
 	 */
 	pData->pStrm = NULL;
@@ -577,8 +583,8 @@ prepareDynFile(instanceData *pData, uchar *newFileName, unsigned iMsgOpts)
 	/* Ok, we finally can open the file */
 	localRet = prepareFile(pData, newFileName); /* ignore exact error, we check fd below */
 
-	/* file is either open now or an error state set */ // RG: better check localRet?
-	if(pData->pStrm == NULL) {
+	/* check if we had an error */
+	if(localRet != RS_RET_OK) {
 		/* do not report anything if the message is an internally-generated
 		 * message. Otherwise, we could run into a never-ending loop. The bad
 		 * news is that we also lose errors on startup messages, but so it is.
@@ -586,7 +592,7 @@ prepareDynFile(instanceData *pData, uchar *newFileName, unsigned iMsgOpts)
 		if(iMsgOpts & INTERNAL_MSG) {
 			DBGPRINTF("Could not open dynaFile, discarding message\n");
 		} else {
-			errmsg.LogError(0, NO_ERRCODE, "Could not open dynamic file '%s' - discarding message", newFileName);
+			errmsg.LogError(0, NO_ERRCODE, "Could not open dynamic file '%s' [state %d] - discarding message", newFileName, localRet);
 		}
 		ABORT_FINALIZE(localRet);
 	}
@@ -824,7 +830,7 @@ CODESTARTparseSelectorAct
 		        
 	  	if(pData->pStrm == NULL) {
 			DBGPRINTF("Error opening log file: %s\n", pData->f_fname);
-			errmsg.LogError(0, RS_RET_NO_FILE_ACCESS, "Could no open output file '%s'", pData->f_fname);
+			errmsg.LogError(0, RS_RET_NO_FILE_ACCESS, "Could not open output file '%s'", pData->f_fname);
 		}
 	}
 CODE_STD_FINALIZERparseSelectorAct
diff --git a/tools/ompipe.c b/tools/ompipe.c
index 58725fb9..469d7935 100644
--- a/tools/ompipe.c
+++ b/tools/ompipe.c
@@ -207,7 +207,7 @@ CODESTARTparseSelectorAct
 	if(pData->fd < 0 ) {
 		pData->fd = -1;
 		DBGPRINTF("Error opening log pipe: %s\n", pData->f_fname);
-		errmsg.LogError(0, RS_RET_NO_FILE_ACCESS, "Could no open output pipe '%s'", pData->f_fname);
+		errmsg.LogError(0, RS_RET_NO_FILE_ACCESS, "Could not open output pipe '%s'", pData->f_fname);
 	}
 CODE_STD_FINALIZERparseSelectorAct
 ENDparseSelectorAct