diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-29 12:54:49 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-29 12:54:49 +0200 |
| commit | 8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024 (patch) | |
| tree | bdea958d43cef054f2d9eed45f09957a0a44ec85 /plugins | |
| parent | cb2a78b30bf55fd3d356cad7048b9e70968dbb95 (diff) | |
| parent | 10430a189af0ecdbdad6c2542280f6d397ec4752 (diff) | |
| download | rsyslog-8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024.tar.gz rsyslog-8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024.tar.xz rsyslog-8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024.zip | |
Merge branch 'beta' into master-module
Conflicts:
ChangeLog
configure.ac
plugins/imklog/imklog.c
plugins/imklog/imklog.h
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imklog/imklog.c | 5 |
1 files changed, 0 insertions, 5 deletions
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) { |