diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-18 11:10:28 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-18 11:10:28 +0200 |
| commit | bca66bc1399d1b9bcc370c64b5a8befb2244695d (patch) | |
| tree | 19619f6a03d09b8d4aa58123451e5f4ebc603dd7 /runtime | |
| parent | 7f78b2ef65634d4320325cca4793caa3d50ef777 (diff) | |
| download | rsyslog-bca66bc1399d1b9bcc370c64b5a8befb2244695d.tar.gz rsyslog-bca66bc1399d1b9bcc370c64b5a8befb2244695d.tar.xz rsyslog-bca66bc1399d1b9bcc370c64b5a8befb2244695d.zip | |
some minor bugfixes
- bugfix: invalid error message issued if $inlcudeConfig was on an empty
set of files (e.g. *.conf, where none such files existed)
thanks to Michael Biebl for reporting this bug
- bugfix: when run in foreground (but not in debug mode), a
debug message ("DoDie called") was emitted at shutdown. Removed.
thanks to Michael Biebl for reporting this bug
- bugfix: some garbagge was emitted to stderr on shutdown. This
garbage consisted of file names, which were written during
startup (key point: not a pointer error)
thanks to Michael Biebl for reporting this bug
- bugfix: startup and shutdown message were emitted to stdout
thanks to Michael Biebl for reporting this bug
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 510927a2..ad2f4c15 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -206,7 +206,7 @@ doIncludeLine(uchar **pp, __attribute__((unused)) void* pVal) * Required by doIncludeDirectory(). */ result = glob(pattern, GLOB_MARK, NULL, &cfgFiles); - if(result != 0) { + if(result == GLOB_NOSPACE || result == GLOB_ABORTED) { char errStr[1024]; rs_strerror_r(errno, errStr, sizeof(errStr)); errmsg.LogError(0, RS_RET_FILE_NOT_FOUND, "error accessing config file or directory '%s': %s", |