diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-21 16:54:05 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-21 16:54:05 +0200 |
| commit | 88caccecf8dd8beaf46915df05241a44f7d635f6 (patch) | |
| tree | 7d6db5808b3bdd2453f041fef5c808b8fab36119 /plugins/imklog/linux.c | |
| parent | 6e410a76f64d74fec03de27a6ca1f3f996844917 (diff) | |
| parent | 8e536c5b25ca1a7106f541149cf0d76bdf9237da (diff) | |
| download | rsyslog-88caccecf8dd8beaf46915df05241a44f7d635f6.tar.gz rsyslog-88caccecf8dd8beaf46915df05241a44f7d635f6.tar.bz2 rsyslog-88caccecf8dd8beaf46915df05241a44f7d635f6.zip | |
Merge branch 'master' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/imklog/linux.c')
| -rw-r--r-- | plugins/imklog/linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/imklog/linux.c b/plugins/imklog/linux.c index 198b7c0e..0dd4320d 100644 --- a/plugins/imklog/linux.c +++ b/plugins/imklog/linux.c @@ -144,7 +144,7 @@ static enum LOGSRC GetKernelLogSrc(void) return(kernel); } - if ( (kmsg = open(_PATH_KLOG, O_RDONLY)) < 0 ) + if ( (kmsg = open(_PATH_KLOG, O_RDONLY|O_CLOEXEC)) < 0 ) { imklogLogIntMsg(LOG_ERR, "imklog: Cannot open proc file system, %d.\n", errno); ksyslog(7, NULL, 0); /* TODO: check this, implement more */ |