summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-27 11:49:25 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-27 11:49:25 +0200
commit4e733fd8d868edd2bd97d9d4f6d6e207cf994230 (patch)
treed84d1b3f4b0bfc5a6651d9df42d8346d8d4eff23
parenta1ab5c0e7e7f8e9cf14ae26935e84719d0600fb8 (diff)
downloadrsyslog-4e733fd8d868edd2bd97d9d4f6d6e207cf994230.tar.gz
rsyslog-4e733fd8d868edd2bd97d9d4f6d6e207cf994230.tar.xz
rsyslog-4e733fd8d868edd2bd97d9d4f6d6e207cf994230.zip
bugfix: $ActionName was not properly honored
Thanks to Abby Edwards for alerting us.
-rw-r--r--ChangeLog4
-rw-r--r--action.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d43969d2..d577b765 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
---------------------------------------------------------------------------
+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
diff --git a/action.c b/action.c
index bcefe9e9..92c21cb3 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;