Imported Upstream version 2.0.1upstream/2.0.1

9 files changed, 38 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index b460338..1a28dbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 ---------------------------------------------------------------------------
+Version 2.0.1 STABLE (rgerhards), 2008-01-24
+- fixed a bug in integer conversion - but this function was never called,
+  so it is not really a useful bug fix ;)
+- fixed a bug with standard template definitions (not a big deal) - thanks
+  to varmojfekoj for spotting it
+- fixed a bug that caused a potential hang in file and fwd output module
+  varmojfekoj provided the patch - many thanks!
+---------------------------------------------------------------------------
 Version 2.0.0 STABLE (rgerhards), 2008-01-02
 - re-release of 1.21.2 as STABLE with no modifications except some
   doc updates
diff --git a/configure b/configure
index e8baaee..d4772f1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for rsyslog 2.0.0.
+# Generated by GNU Autoconf 2.61 for rsyslog 2.0.1.
 #
 # Report bugs to <rsyslog@lists.adiscon.com.>.
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='rsyslog'
 PACKAGE_TARNAME='rsyslog'
-PACKAGE_VERSION='2.0.0'
-PACKAGE_STRING='rsyslog 2.0.0'
+PACKAGE_VERSION='2.0.1'
+PACKAGE_STRING='rsyslog 2.0.1'
 PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com.'
 
 ac_unique_file="syslogd.c"
@@ -1409,7 +1409,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures rsyslog 2.0.0 to adapt to many kinds of systems.
+\`configure' configures rsyslog 2.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1479,7 +1479,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rsyslog 2.0.0:";;
+     short | recursive ) echo "Configuration of rsyslog 2.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1593,7 +1593,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rsyslog configure 2.0.0
+rsyslog configure 2.0.1
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1607,7 +1607,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by rsyslog $as_me 2.0.0, which was
+It was created by rsyslog $as_me 2.0.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2297,7 +2297,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rsyslog'
- VERSION='2.0.0'
+ VERSION='2.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -24997,7 +24997,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by rsyslog $as_me 2.0.0, which was
+This file was extended by rsyslog $as_me 2.0.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25050,7 +25050,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-rsyslog config.status 2.0.0
+rsyslog config.status 2.0.1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 4659f49..c2fd803 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rsyslog],[2.0.0],[rsyslog@lists.adiscon.com.])
+AC_INIT([rsyslog],[2.0.1],[rsyslog@lists.adiscon.com.])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([syslogd.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/doc/status.html b/doc/status.html
index 86d1844..f8b6c7a 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -4,13 +4,17 @@
 </head>
 <body>
 <h2>rsyslog status page</h2>
-<p>This page reflects the status as of 2008-01-01.</p>
+<p>This page reflects the status as of 2008-01-24.</p>
 <h2>Current Releases</h2>
-<p><b>development:</b> 1.21.2 -
-<a href="http://www.rsyslog.com/Article153.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-69.phtml">download</a></p>
-<p><b>stable:</b> 2.0.0 - <a href="http://www.rsyslog.com/Article155.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-70.phtml">download</a></p>
+<p><b>development:</b> 3.10.2 -
+<a href="http://www.rsyslog.com/Article161.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-73.phtml">download</a></p>
+<p><b><font color="#FF0000"><a href="v3compatibility.html">Be sure to read the 
+rsyslog v3 compatibility document!</a></font></b><br>
+Documentation for 3.x is currently sparse. If you need assistance, please
+<a href="http://www.rsyslog.com/PNphpBB2.phtml">post in the rsyslog forums</a>!</p>
+<p><b>stable:</b> 2.0.1 - <a href="http://www.rsyslog.com/Article165.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-73.phtml">download</a></p>
 <p>&nbsp;(<a href="version_naming.html">How are versions named?</a>)</p>
 <h2>Platforms</h2>
 <p>Thankfully, a number of folks have begin to build packages and help port 
diff --git a/omfile.c b/omfile.c
index 3691d98..cd5e23c 100644
--- a/omfile.c
+++ b/omfile.c
@@ -357,6 +357,7 @@ static void prepareFile(instanceData *pData, uchar *newFileName)
 		pData->fd = open((char*) newFileName, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY,
 				pData->fCreateMode);
 	} else {
+		pData->fd = -1;
 		/* file does not exist, create it (and eventually parent directories */
 		if(pData->bCreateDirs) {
 			/* we fist need to create parent dirs if they are missing
@@ -596,6 +597,7 @@ again:
 
 BEGINcreateInstance
 CODESTARTcreateInstance
+	pData->fd = -1;
 ENDcreateInstance
 
 
diff --git a/omfwd.c b/omfwd.c
index f01e045..9b56acd 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -116,6 +116,7 @@ typedef struct _instanceData {
 
 BEGINcreateInstance
 CODESTARTcreateInstance
+	pData->sock = -1;
 ENDcreateInstance
 
 
@@ -278,8 +279,8 @@ static rsRetVal TCPSendInit(void *pvData)
 	instanceData *pData = (instanceData *) pvData;
 
 	assert(pData != NULL);
-	if(pData->sock <= 0) {
-		if((pData->sock = TCPSendCreateSocket(pData->f_addr)) <= 0)
+	if(pData->sock < 0) {
+		if((pData->sock = TCPSendCreateSocket(pData->f_addr)) < 0)
 			iRet = RS_RET_TCP_SOCKCREATE_ERR;
 	}
 
diff --git a/rsyslogd.8 b/rsyslogd.8
index 0c4fcf3..58aec52 100644
--- a/rsyslogd.8
+++ b/rsyslogd.8
@@ -78,7 +78,7 @@ While the
 .B rsyslogd
 sources have been heavily modified a couple of notes
 are in order.  First of all there has been a systematic attempt to
-insure that rsyslogd follows its default, standard BSD behavior. Of course,
+ensure that rsyslogd follows its default, standard BSD behavior. Of course,
 some configuration file changes are necessary in order to support the
 template system. However, rsyslogd should be able to use a standard
 syslog.conf and act like the orginal syslogd. However, an original syslogd
diff --git a/srUtils.c b/srUtils.c
index acd8edd..9dcea29 100755
--- a/srUtils.c
+++ b/srUtils.c
@@ -78,9 +78,10 @@ rsRetVal srUtilItoA(char *pBuf, int iLenBuf, int iToConv)
 	i = 0;
 	do
 	{
-		szBuf[i] = iToConv % 10 + '0';
+		szBuf[i++] = iToConv % 10 + '0';
 		iToConv /= 10;
 	} while(iToConv > 0);	/* warning: do...while()! */
+	--i; /* undo last increment - we were pointing at NEXT location */
 
 	/* make sure we are within bounds... */
 	if(i + 2 > iLenBuf)	/* +2 because: a) i starts at zero! b) the \0 byte */
diff --git a/syslogd.c b/syslogd.c
index c562b4e..818f5f3 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -6222,7 +6222,7 @@ static void mainThread()
 	pTmp = template_StdUsrMsgFmt;
 	tplAddLine(" StdUsrMsgFmt", &pTmp);
 	pTmp = template_StdDBFmt;
-	tplLastStaticInit(tplAddLine(" StdDBFmt", &pTmp));
+	tplAddLine(" StdDBFmt", &pTmp);
         pTmp = template_StdPgSQLFmt;
         tplLastStaticInit(tplAddLine(" StdPgSQLFmt", &pTmp));