summaryrefslogtreecommitdiffstats
path: root/plugins/imklog/imklog.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-06-12 08:25:05 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-06-12 08:25:05 +0200
commitb003f8509150cd3a694610edb0ec72d8ca86b667 (patch)
tree3dd0a905dbebcc9f2c494b1b5125d8991055e5ec /plugins/imklog/imklog.c
parent7b93d930f2f194969ec24528c2c42d4eebba29f3 (diff)
parent8080d3fef6c9d3f1452ff605e05748999b25aa32 (diff)
downloadrsyslog-b003f8509150cd3a694610edb0ec72d8ca86b667.tar.gz
rsyslog-b003f8509150cd3a694610edb0ec72d8ca86b667.tar.xz
rsyslog-b003f8509150cd3a694610edb0ec72d8ca86b667.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html plugins/imklog/linux.c
Diffstat (limited to 'plugins/imklog/imklog.c')
-rw-r--r--plugins/imklog/imklog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c
index 3faed2fe..f6935a34 100644
--- a/plugins/imklog/imklog.c
+++ b/plugins/imklog/imklog.c
@@ -65,7 +65,7 @@ DEFobjCurrIf(glbl)
int dbgPrintSymbols = 0; /* this one is extern so the helpers can access it! */
int symbols_twice = 0;
int use_syscall = 0;
-int symbol_lookup = 1;
+int symbol_lookup = 0; /* on recent kernels > 2.6, the kernel does this */
int bPermitNonKernel = 0; /* permit logging of messages not having LOG_KERN facility */
int iFacilIntMsg; /* the facility to use for internal messages (set by driver) */
/* TODO: configuration for the following directives must be implemented. It
@@ -245,7 +245,7 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
symbols_twice = 0;
use_syscall = 0;
symfile = NULL;
- symbol_lookup = 1;
+ symbol_lookup = 0;
bPermitNonKernel = 0;
iFacilIntMsg = klogFacilIntMsg();
return RS_RET_OK;