Imported Upstream version 7.2.0upstream/7.2.0

13 files changed, 37 insertions, 36 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e481a2..dbabd9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 ----------------------------------------------------------------------------
+Version 7.2.0  [v7-stable] 2012-10-22
+This starts a new stable branch based on 7.1.12 plus the following changes:
+- bugfix: imuxsock did not properly honor $LocalHostIPIF
+- omruleset/omdiscard do no longer issue "deprecated" warings, as 7.1
+  grammar does not permit to use the replacements under all circumstances
+----------------------------------------------------------------------------
 Version 7.1.12  [beta] 2012-10-18
 - minor updates to better support newer systemd developments
   Thanks to Michael Biebl for the patches.
@@ -145,8 +151,6 @@ Version 6.5.1  [devel] 2012-08-??
 - added pure JSON output plugin parameter passing mode
 - ommongodb now supports templates
 - bugfix: imtcp could abort on exit due to invalid free()
-- bugfix: remove invalid socket option call from imuxsock
-  Thanks to Cristian Ionescu-Idbohrn and Jonny Törnbom 
 - bugfix: missing support for escape sequences in RainerScript
   only \' was supported. Now the usual set is supported. Note that v5
   used \x as escape where x was any character (e.g. "\n" meant "n" and NOT
@@ -207,6 +211,7 @@ Version 6.4.3  [V6-STABLE] 2012-??-??
   closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358
   This happend to filters of the style "local0,local1.*", where the 
   multiple facilities were comma-separated.
+- bugfix: imuxsock did not properly honor $LocalHostIPIF
 ---------------------------------------------------------------------------
 Version 6.4.2  [V6-STABLE] 2012-09-20
 - bugfix: potential abort, if action queue could not be properly started
diff --git a/configure b/configure
index b6436e1..09c8d1f 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.67 for rsyslog 7.1.12.
+# Generated by GNU Autoconf 2.67 for rsyslog 7.2.0.
 #
 # Report bugs to <rsyslog@lists.adiscon.com>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rsyslog'
 PACKAGE_TARNAME='rsyslog'
-PACKAGE_VERSION='7.1.12'
-PACKAGE_STRING='rsyslog 7.1.12'
+PACKAGE_VERSION='7.2.0'
+PACKAGE_STRING='rsyslog 7.2.0'
 PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com'
 PACKAGE_URL=''
 
@@ -1682,7 +1682,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 7.1.12 to adapt to many kinds of systems.
+\`configure' configures rsyslog 7.2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1752,7 +1752,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rsyslog 7.1.12:";;
+     short | recursive ) echo "Configuration of rsyslog 7.2.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1972,7 +1972,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rsyslog configure 7.1.12
+rsyslog configure 7.2.0
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2551,7 +2551,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 7.1.12, which was
+It was created by rsyslog $as_me 7.2.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -3366,7 +3366,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rsyslog'
- VERSION='7.1.12'
+ VERSION='7.2.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18804,7 +18804,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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 7.1.12, which was
+This file was extended by rsyslog $as_me 7.2.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18870,7 +18870,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-rsyslog config.status 7.1.12
+rsyslog config.status 7.2.0
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 3c5b676..5e92e34 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],[7.1.12],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[7.2.0],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index 45ba771..e645f2c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
 <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
 to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
 project goals.</p>
-<p><b>This documentation is for version 7.1.12 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 7.2.0 (v7-stable branch) of rsyslog.</b>
 Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
 to obtain current version information and project status.
 </p><p><b>If you like rsyslog, you might
diff --git a/doc/v3compatibility.html b/doc/v3compatibility.html
index ad8776b..1c15350 100644
--- a/doc/v3compatibility.html
+++ b/doc/v3compatibility.html
@@ -84,7 +84,7 @@ to support this feature (as long as it is not totally removed).
 To replace it, use the following config directives (compatibility mode
 auto-generates them):</p>
 <p><b>$ModLoad immark<br>
-$MarkMessageInterval 1800 # 30 minutes</b></p>
+$MarkMessagePeriod 1800 # 30 minutes</b></p>
 <h2>-r Option</h2>
 <p>Is no longer available in native mode. However, it
 is
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c
index 0dda30e..782d7be 100644
--- a/plugins/imudp/imudp.c
+++ b/plugins/imudp/imudp.c
@@ -574,7 +574,7 @@ rsRetVal rcvMainLoop(thrdInfo_t *pThrd)
 	for(lstn = lcnfRoot ; lstn != NULL ; lstn = lstn->next) {
 		if(lstn->sock != -1) {
 			udpEPollEvt[i].events = EPOLLIN | EPOLLET;
-			udpEPollEvt[i].data.u64 = (long long unsigned) lstn;
+			udpEPollEvt[i].data.ptr = lstn;
 			if(epoll_ctl(efd, EPOLL_CTL_ADD,  lstn->sock, &(udpEPollEvt[i])) < 0) {
 				rs_strerror_r(errno, errStr, sizeof(errStr));
 				errmsg.LogError(errno, NO_ERRCODE, "epoll_ctrl failed on fd %d with %s\n",
@@ -593,7 +593,7 @@ rsRetVal rcvMainLoop(thrdInfo_t *pThrd)
 			break; /* terminate input! */
 
 		for(i = 0 ; i < nfds ; ++i) {
-			processSocket(pThrd, (struct lstn_s*)currEvt[i].data.u64, &frominetPrev, &bIsPermitted);
+			processSocket(pThrd, currEvt[i].data.ptr, &frominetPrev, &bIsPermitted);
 		}
 	}
 
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 79d8c5d..d5e4bb3 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -1552,11 +1552,6 @@ CODEmodInit_QueryRegCFSLineHdlr
 		listeners[i].fd  = -1;
 	}
 
-	/* now init listen socket zero, the local log socket */
-	CHKiRet(prop.Construct(&pLocalHostIP));
-	CHKiRet(prop.SetString(pLocalHostIP, UCHAR_CONSTANT("127.0.0.1"), sizeof("127.0.0.1") - 1));
-	CHKiRet(prop.ConstructFinalize(pLocalHostIP));
-
 	/* register config file handlers */
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputunixlistensocketignoremsgtimestamp", 0, eCmdHdlrBinary,
 		NULL, &cs.bIgnoreTimestamp, STD_LOADABLE_MODULE_ID));
diff --git a/plugins/omruleset/omruleset.c b/plugins/omruleset/omruleset.c
index 6c770c9..d1d6eb0 100644
--- a/plugins/omruleset/omruleset.c
+++ b/plugins/omruleset/omruleset.c
@@ -165,8 +165,12 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
 	p += sizeof(":omruleset:") - 1; /* eat indicator sequence  (-1 because of '\0'!) */
 	CHKiRet(createInstance(&pData));
 
+	/* re-enable in v7.3: requires action list to support 
+	 * action-like statements, something that is too late to
+	 * do in 7.1.
 	errmsg.LogError(0, RS_RET_DEPRECATED, "warning: omruleset is deprecated, consider "
 			"using the 'call' statement instead");
+	 */
 
 	/* check if a non-standard template is to be applied */
 	if(*(p-1) == ';')
diff --git a/runtime/nsdpoll_ptcp.c b/runtime/nsdpoll_ptcp.c
index 8c90d7f..8d95811 100644
--- a/runtime/nsdpoll_ptcp.c
+++ b/runtime/nsdpoll_ptcp.c
@@ -66,7 +66,7 @@ addEvent(nsdpoll_ptcp_t *pThis, int id, void *pUsr, int mode, nsd_ptcp_t *pSock,
 	nsdpoll_epollevt_lst_t *pNew;
 	DEFiRet;
 
-	CHKmalloc(pNew = (nsdpoll_epollevt_lst_t*) malloc(sizeof(nsdpoll_epollevt_lst_t)));
+	CHKmalloc(pNew = (nsdpoll_epollevt_lst_t*) calloc(1, sizeof(nsdpoll_epollevt_lst_t)));
 	pNew->id = id;
 	pNew->pUsr = pUsr;
 	pNew->pSock = pSock;
@@ -76,7 +76,7 @@ addEvent(nsdpoll_ptcp_t *pThis, int id, void *pUsr, int mode, nsd_ptcp_t *pSock,
 		pNew->event.events |= EPOLLIN;
 	if(mode & NSDPOLL_OUT)
 		pNew->event.events |= EPOLLOUT;
-	pNew->event.data.u64 = (uint64) pNew;
+	pNew->event.data.ptr = pNew;
 	pthread_mutex_lock(&pThis->mutEvtLst);
 	pNew->pNext = pThis->pRoot;
 	pThis->pRoot = pNew;
@@ -254,7 +254,7 @@ Wait(nsdpoll_t *pNsdpoll, int timeout, int *numEntries, nsd_epworkset_t workset[
 	/* we got valid events, so tell the caller... */
 dbgprintf("epoll returned %d entries\n", nfds);
 	for(i = 0 ; i < nfds ; ++i) {
-		pOurEvt = (nsdpoll_epollevt_lst_t*) event[i].data.u64;
+		pOurEvt = (nsdpoll_epollevt_lst_t*) event[i].data.ptr;
 		workset[i].id = pOurEvt->id;
 		workset[i].pUsr = pOurEvt->pUsr;
 dbgprintf("epoll push ppusr[%d]: %p\n", i, pOurEvt->pUsr);
diff --git a/tests/diag.sh b/tests/diag.sh
index b278d2c..bd38b29 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -36,12 +36,12 @@ case $1 in
 		;;
    'startup')   # start rsyslogd with default params. $2 is the config file name to use
    		# returns only after successful startup, $3 is the instance (blank or 2!)
-		$valgrind ../tools/rsyslogd -c6 -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 &
+		$valgrind ../tools/rsyslogd -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 &
    		$srcdir/diag.sh wait-startup $3
 		;;
    'startup-vg') # start rsyslogd with default params under valgrind control. $2 is the config file name to use
    		# returns only after successful startup, $3 is the instance (blank or 2!)
-		valgrind --log-fd=1 --error-exitcode=10 --malloc-fill=ff --free-fill=fe --leak-check=full ../tools/rsyslogd -c6 -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 &
+		valgrind --log-fd=1 --error-exitcode=10 --malloc-fill=ff --free-fill=fe --leak-check=full ../tools/rsyslogd -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 &
    		$srcdir/diag.sh wait-startup $3
 		;;
    'wait-startup') # wait for rsyslogd startup ($2 is the instance)
diff --git a/tools/omdiscard.c b/tools/omdiscard.c
index 15c6ea8..08cd749 100644
--- a/tools/omdiscard.c
+++ b/tools/omdiscard.c
@@ -95,9 +95,13 @@ CODE_STD_STRING_REQUESTparseSelectorAct(0)
 
 	if(*p == '~') {
 		dbgprintf("discard\n");
+		/* re-enable in v7.3: requires action list to support 
+		 * action-like statements, something that is too late to
+		 * do in 7.1.
 		errmsg.LogError(0, RS_RET_DEPRECATED, "warning: ~ action "
 			"is deprecated, consider using the 'stop' "
 			"statement instead");
+		 */
 	} else {
 		iRet = RS_RET_CONFLINE_UNPROCESSED;
 	}
diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5
index dcc9b7c..641ba9b 100644
--- a/tools/rsyslog.conf.5
+++ b/tools/rsyslog.conf.5
@@ -17,7 +17,7 @@
 .\" along with this program; if not, write to the Free Software
 .\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
 .\"
-.TH RSYSLOG.CONF 5 "11 July 2008" "Version 3.18.0" "Linux System Administration"
+.TH RSYSLOG.CONF 5 "22 October 2012" "Version 7.2.0" "Linux System Administration"
 .SH NAME
 rsyslog.conf \- rsyslogd(8) configuration file
 .SH DESCRIPTION
@@ -335,13 +335,6 @@ Rsyslog offers three different types "filter conditions":
    * expression-based filters
 .RE
 
-.SS Blocks
-Rsyslogd supports BSD-style blocks inside rsyslog.conf. Each block of lines is separated from 
-the previous block by a program or hostname specification. A block will only log messages 
-corresponding to the most recent program and hostname specifications given. Thus, a block which 
-selects "ppp" as the program, directly followed by a block that selects messages from the 
-hostname "dialhost", then the second block will only log messages from the ppp program on dialhost.
-
 .SS Selectors
 .B Selectors are the traditional way of filtering syslog messages. 
 They have been kept in rsyslog with their original syntax, because it is well-known, highly 
diff --git a/tools/syslogd.c b/tools/syslogd.c
index edb546a..c580155 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -1858,7 +1858,7 @@ int realMain(int argc, char **argv)
 			CHKiRet(bufOptAdd(ch, optarg));
 			break;
 		case 'c':		/* compatibility mode */
-			fprintf(stderr, "rsyslogd: error: option -c is no longer supported - ignored");
+			fprintf(stderr, "rsyslogd: error: option -c is no longer supported - ignored\n");
 			break;
 		case 'd': /* debug - must be handled now, so that debug is active during init! */
 			debugging_on = 1;