From a1ab5c0e7e7f8e9cf14ae26935e84719d0600fb8 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 18 Jun 2012 09:53:58 +0200 Subject: preparing for 6.3.11 --- ChangeLog | 2 +- configure.ac | 2 +- doc/manual.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3950ab80..d43969d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 6.3.11 [BETA] 2012-06-?? +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/configure.ac b/configure.ac index 498b59d8..540c731b 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],[6.3.10],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[6.3.11],[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 7af5c5eb..1bc8f1f7 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support available directly from the source!

Please visit the rsyslog sponsor's page to honor the project sponsors or become one yourself! We are very grateful for any help towards the project goals.

-

This documentation is for version 6.3.10 (beta branch) of rsyslog. +

This documentation is for version 6.3.11 (beta branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might -- cgit v1.2.3 From 4e733fd8d868edd2bd97d9d4f6d6e207cf994230 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 27 Jun 2012 11:49:25 +0200 Subject: bugfix: $ActionName was not properly honored Thanks to Abby Edwards for alerting us. --- ChangeLog | 4 ++++ action.c | 4 ---- 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; -- cgit v1.2.3 From 85c7f63eee765f44baf828b94a02ea6ee0b09747 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 27 Jun 2012 11:59:33 +0200 Subject: improve invalid config command error message --- runtime/cfsysline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3 From 6812fceef4f955610e6075c798f729e7a0617b24 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 27 Jun 2012 12:01:08 +0200 Subject: cleanup: remove config scoping system left-over this was an experiment in early v6 that did not work out. I forgot to remove this code when I undid it. --- action.c | 28 ---------------------------- action.h | 2 -- 2 files changed, 30 deletions(-) diff --git a/action.c b/action.c index 92c21cb3..9bf43d6f 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 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); -- cgit v1.2.3 From 0253f5ea381d1ff5da162359e16ec7c010fc18a3 Mon Sep 17 00:00:00 2001 From: Bartosz Kuzma Date: Wed, 27 Jun 2012 21:33:11 +0200 Subject: Added dragonfly to configure.ac --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7d1d98b0..6be773a5 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ case "${host}" in *-*-linux*) 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" ;; -- cgit v1.2.3 From 99e4bbc0e4bbb6235ccdc7482bb1329880add9c1 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 29 Jun 2012 12:47:13 +0200 Subject: imklog: cleanup of no longer used code --- plugins/imklog/imklog.c | 16 ---------------- plugins/imklog/imklog.h | 16 ---------------- 2 files changed, 32 deletions(-) diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c index 6a607a74..f476c5ff 100644 --- a/plugins/imklog/imklog.c +++ b/plugins/imklog/imklog.c @@ -82,7 +82,6 @@ typedef struct configSettings_s { int iFacilIntMsg; /* the facility to use for internal messages (set by driver) */ uchar *pszPath; int console_log_level; - char *symfile; /* TODO: actually unsued currently! */ } configSettings_t; static configSettings_t cs; @@ -104,7 +103,6 @@ initConfigSettings(void) cs.bPermitNonKernel = 0; cs.console_log_level = -1; cs.pszPath = NULL; - cs.symfile = NULL; cs.iFacilIntMsg = klogFacilIntMsg(); } @@ -300,21 +298,8 @@ CODESTARTendCnfLoad loadModConf->pszPath = cs.pszPath; } cs.pszPath = NULL; - if((cs.symfile == NULL) || (cs.symfile[0] == '\0')) { - loadModConf->symfile = NULL; - if(cs.symfile != NULL) - free(cs.symfile); - } else { - loadModConf->symfile = cs.symfile; - } - cs.symfile = NULL; loadModConf = NULL; /* done loading */ - /* free legacy config vars */ - free(cs.pszPath); - cs.pszPath = NULL; - free(cs.symfile); - cs.symfile = NULL; ENDendCnfLoad @@ -378,7 +363,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) { diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index 7f6c810a..795dd68c 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -39,7 +39,6 @@ struct modConfData_s { int iFacilIntMsg; uchar *pszPath; int console_log_level; - char *symfile; rsconf_t *pConf; }; @@ -54,21 +53,6 @@ rsRetVal klogWillRun(modConfData_t *pModConf); rsRetVal klogAfterRun(modConfData_t *pModConf); int klogFacilIntMsg(); -/* the following data members may be accessed by the "drivers" - * I admit this is not the cleanest way to doing things, but I honestly - * believe it is appropriate for the job that needs to be done. - * rgerhards, 2008-04-09 - */ -#if 0 -extern int symbols_twice; -extern int use_syscall; -extern int symbol_lookup; -extern char *symfile; -extern int console_log_level; -extern int dbgPrintSymbols; -extern uchar *pszPath; -#endif - /* the functions below may be called by the drivers */ rsRetVal imklogLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); rsRetVal Syslog(int priority, uchar *msg, struct timeval *tp); -- cgit v1.2.3