Merge branch 'beta'

Conflicts:
	ChangeLog
	configure.ac

5 files changed, 8 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 08aad36b..1666f07c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,11 @@ Version 6.5.0  [devel] 2012-0?-??
 - added new 0mq plugins (via czmq lib)
   Thanks to David Kelly for contributing these modules
 ---------------------------------------------------------------------------
-Version 6.3.11  [BETA] 2012-06-??
+Version 6.3.12  [BETA] 2012-06-18
+- bugfix: $ActionName was not properly honored
+  Thanks to Abby Edwards for alerting us
+---------------------------------------------------------------------------
+Version 6.3.11  [BETA] 2012-06-18
 - bugfix: expression-based filters with AND/OR could segfault
   due to a problem with boolean shortcut operations. From the user's
   perspective, the segfault is almost non-deterministic (it occurs when
diff --git a/action.c b/action.c
index 652c0259..25fe380a 100644
--- a/action.c
+++ b/action.c
@@ -327,10 +327,6 @@ rsRetVal actionConstruct(action_t **ppThis)
 
 	ASSERT(ppThis != NULL);
 	
-	if(cs.pszActionName != NULL) {
-		free(cs.pszActionName);
-		cs.pszActionName = NULL;
-	}
 	CHKmalloc(pThis = (action_t*) calloc(1, sizeof(action_t)));
 	pThis->iResumeInterval = 30;
 	pThis->iResumeRetryCount = 0;
@@ -2014,34 +2010,6 @@ initConfigVariables(void)
 }
 
 
-/* save our config and create a new scope. Note that things are messed up if
- * this is called while the config is already saved (we currently do not
- * have a stack as the design is we need none!
- * rgerhards, 2010-07-23
- */
-rsRetVal
-actionNewScope(void)
-{
-	DEFiRet;
-	memcpy(&cs_save, &cs, sizeof(cs));
-	initConfigVariables();
-	RETiRet;
-}
-
-
-/* restore previously saved scope.
- * rgerhards, 2010-07-23
- */
-rsRetVal
-actionRestoreScope(void)
-{
-	DEFiRet;
-	memcpy(&cs, &cs_save, sizeof(cs));
-	RETiRet;
-}
-
-
-
 rsRetVal
 actionNewInst(struct nvlst *lst, action_t **ppAction)
 {
diff --git a/action.h b/action.h
index 4da0be24..5f142b00 100644
--- a/action.h
+++ b/action.h
@@ -107,8 +107,6 @@ rsRetVal actionWriteToAction(action_t *pAction);
 rsRetVal actionCallHUPHdlr(action_t *pAction);
 rsRetVal actionClassInit(void);
 rsRetVal addAction(action_t **ppAction, modInfo_t *pMod, void *pModData, omodStringRequest_t *pOMSR, struct cnfparamvals *actParams, struct cnfparamvals *queueParams, int bSuspended);
-rsRetVal actionNewScope(void);
-rsRetVal actionRestoreScope(void);
 rsRetVal activateActions(void);
 rsRetVal actionNewInst(struct nvlst *lst, action_t **ppAction);
 
diff --git a/doc/manual.html b/doc/manual.html
index 7af5c5eb..1bc8f1f7 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 6.3.10 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.3.11 (beta 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/runtime/cfsysline.c b/runtime/cfsysline.c
index d8c33169..fdbb8f2a 100644
--- a/runtime/cfsysline.c
+++ b/runtime/cfsysline.c
@@ -947,7 +947,8 @@ rsRetVal processCfSysLineCommand(uchar *pCmdName, uchar **p)
 	iRet = llFind(&llCmdList, (void *) pCmdName, (void*) &pCmd);
 
 	if(iRet == RS_RET_NOT_FOUND) {
-		errmsg.LogError(0, RS_RET_NOT_FOUND, "invalid or yet-unknown config file command - have you forgotten to load a module?");
+		errmsg.LogError(0, RS_RET_NOT_FOUND, "invalid or yet-unknown config file command '%s' - "
+			"have you forgotten to load a module?", pCmdName);
 	}
 
 	if(iRet != RS_RET_OK)