Merge branch 'v7-stable' into v7-devel

Conflicts:
	ChangeLog
	plugins/imuxsock/imuxsock.c

4 files changed, 23 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index ec22f22b..a6daee5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 ---------------------------------------------------------------------------
-Version 7.5.7 [devel] 2013-11-??
+Version 7.5.7 [v7-devel] 2013-11-??
+- bugfix: segfault on startup when certain script constructs are used
+  e.g. "if not $msg ..."
 - bugfix: ommysql lost configfile/section parameters after first close
   This means that when a connection was broken, it was probably
   re-instantiated with different parameters than configured.
@@ -23,13 +25,6 @@ Version 7.5.7 [devel] 2013-11-??
 - bugfix: $SystemLogUseSysTimeStamp/$SystemLogUsePIDFromSystem did not work
   Thanks to Tomas Heinrich for the patch.
 ---------------------------------------------------------------------------
-Version 7.4.7  [v7.4-stable] 2013-11-??
-- bugfix: $SystemLogUseSysTimeStamp/$SystemLogUsePIDFromSystem did not work
-  Thanks to Tomas Heinrich for the patch.
-- improved checking of queue config parameters on startup
-- bugfix: call to ruleset with async queue did not use the queue
-  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=443
----------------------------------------------------------------------------
 Version 7.5.6 [devel] 2013-10-29
 - impstats: add capability to bind to a ruleset
 - improved performance of RainerScript variable access
@@ -226,6 +221,18 @@ Version 7.5.0 [devel] 2013-06-11
   connections
   Thanks to Axel Rau for the patch.
 ---------------------------------------------------------------------------
+Version 7.4.7  [v7.4-stable] 2013-11-??
+- bugfix: segfault on startup when certain script constructs are used
+  e.g. "if not $msg ..."
+- bugfix: imuxsock: UseSysTimeStamp config parameter did not work correctly
+  Thanks to Tomas Heinrich for alerting us and provinding a solution
+  suggestion.
+- bugfix: $SystemLogUseSysTimeStamp/$SystemLogUsePIDFromSystem did not work
+  Thanks to Tomas Heinrich for the patch.
+- improved checking of queue config parameters on startup
+- bugfix: call to ruleset with async queue did not use the queue
+  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=443
+---------------------------------------------------------------------------
 Version 7.4.6  [v7.4-stable] 2013-10-31
 - bugfix: potential abort during HUP
   This could happen when one of imklog, imzmq3, imkmsg, impstats,
diff --git a/doc/imuxsock.html b/doc/imuxsock.html
index 4e4500cc..02b2f187 100644
--- a/doc/imuxsock.html
+++ b/doc/imuxsock.html
@@ -94,7 +94,8 @@ burst in number of messages. Default is 200.
 <li><b>SysSock.RateLimit.Severity</b> [numerical severity] - specifies the severity of
 messages that shall be rate-limited.
 </li>
-<li><b>SysSock.UseSysTimeStamp</b> [<b>on</b>/off] the same as $InputUnixListenSocketUseSysTimeStamp, but for the system log socket.
+<li><b>SysSock.UseSysTimeStamp</b> [<b>on</b>/off] the same as the input parameter
+UseSysTimeStamp, but for the system log socket. See description there.
 </li>
 <li><b>SysSock.Annotate</b> &lt;on/<b>off</b>&gt; turn on annotation/trusted
 properties for the system log socket.</li>
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
index 0dad86cc..ecc23b54 100644
--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
@@ -2881,6 +2881,9 @@ cnfexprOptimize_CMP_severity_facility(struct cnfexpr *expr)
 {
 	struct cnffunc *func;
 
+	if(expr->l->nodetype != 'V')
+		FINALIZE;
+
 	if(!strcmp("$syslogseverity", ((struct cnfvar*)expr->l)->name)) {
 		if(expr->r->nodetype == 'N') {
 			int sev = (int) ((struct cnfnumval*)expr->r)->val;
@@ -2910,6 +2913,7 @@ cnfexprOptimize_CMP_severity_facility(struct cnfexpr *expr)
 			}
 		}
 	}
+finalize_it:
 	return expr;
 }
 
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 4b3556b1..4bce0c1c 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -985,7 +985,7 @@ static rsRetVal readSocket(lstn_t *pLstn)
 	if(iRcvd > 0) {
 		cred = NULL;
 		ts = NULL;
-		if(pLstn->bUseCreds || pLstn->bUseSysTimeStamp) {
+		if(pLstn->bUseCreds) {
 			for(cm = CMSG_FIRSTHDR(&msgh); cm; cm = CMSG_NXTHDR(&msgh, cm)) {
 #				if HAVE_SCM_CREDENTIALS
 				if(   pLstn->bUseCreds
@@ -1055,7 +1055,7 @@ activateListeners()
 	listeners[0].ratelimitInterval = runModConf->ratelimitIntervalSysSock;
 	listeners[0].ratelimitBurst = runModConf->ratelimitBurstSysSock;
 	listeners[0].ratelimitSev = runModConf->ratelimitSeveritySysSock;
-	listeners[0].bUseCreds = (runModConf->bWritePidSysSock || runModConf->ratelimitIntervalSysSock || runModConf->bAnnotateSysSock || runModConf->bDiscardOwnMsgs) ? 1 : 0;
+	listeners[0].bUseCreds = (runModConf->bWritePidSysSock || runModConf->ratelimitIntervalSysSock || runModConf->bAnnotateSysSock || runModConf->bDiscardOwnMsgs || runModConf->bUseSysTimeStamp) ? 1 : 0;
 	listeners[0].bWritePid = runModConf->bWritePidSysSock;
 	listeners[0].bAnnotate = runModConf->bAnnotateSysSock;
 	listeners[0].bParseTrusted = runModConf->bParseTrusted;