Merge branch 'beta' into master-module

Conflicts:
	ChangeLog
	configure.ac
	plugins/imklog/imklog.c
	plugins/imklog/imklog.h

6 files changed, 7 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index c4361d3a..3ac89c65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,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 5310a6a7..25fe380a 100644
--- a/action.c
+++ b/action.c
@@ -2010,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 fdebdc36..66ceaae5 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);
 rsRetVal actionProcessCnf(struct cnfobj *o);
diff --git a/configure.ac b/configure.ac
index 589b1715..80c086f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ case "${host}" in
     AC_DEFINE([OS_LINUX], [1], [Indicator for a Linux OS])
     os_type="linux"
   ;;
-  *-*-*darwin*|*-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+  *-*-*darwin*|*-*-dragonfly*|*-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
     AC_DEFINE([OS_BSD], [1], [Indicator for a BSD OS])
     os_type="bsd"
   ;;
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/plugins/imklog/imklog.c b/plugins/imklog/imklog.c
index ee0af59d..513619c5 100644
--- a/plugins/imklog/imklog.c
+++ b/plugins/imklog/imklog.c
@@ -121,7 +121,6 @@ initConfigSettings(void)
 	cs.bPermitNonKernel = 0;
 	cs.console_log_level = -1;
 	cs.pszPath = NULL;
-	cs.symfile = NULL; 
 	cs.iFacilIntMsg = klogFacilIntMsg();
 }
 
@@ -379,9 +378,6 @@ CODESTARTendCnfLoad
 	}
 
 	loadModConf = NULL; /* done loading */
-	/* free legacy config vars */
-	free(cs.symfile);
-	cs.symfile = NULL;
 ENDendCnfLoad
 
 
@@ -447,7 +443,6 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
 	cs.dbgPrintSymbols = 0;
 	cs.symbols_twice = 0;
 	cs.use_syscall = 0;
-	cs.symfile = NULL;
 	cs.symbol_lookup = 0;
 	cs.bPermitNonKernel = 0;
 	if(cs.pszPath != NULL) {