diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-18 11:11:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-18 11:11:07 +0200 |
| commit | 17133f2cd18a2b5376d40a01b87c970b3a47c265 (patch) | |
| tree | ef857337dc0db50271c7e30faae259d6fba3f0cd /runtime/conf.c | |
| parent | 3e2be47ed69d2b4ce21777a75ad6128592e84d1d (diff) | |
| parent | bca66bc1399d1b9bcc370c64b5a8befb2244695d (diff) | |
| download | rsyslog-17133f2cd18a2b5376d40a01b87c970b3a47c265.tar.gz rsyslog-17133f2cd18a2b5376d40a01b87c970b3a47c265.tar.xz rsyslog-17133f2cd18a2b5376d40a01b87c970b3a47c265.zip | |
Merge branch 'v3-stable' into beta
Diffstat (limited to 'runtime/conf.c')
| -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 55eb9800..126ea2b7 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -211,7 +211,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", |