diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-18 11:14:14 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-18 11:14:14 +0200 |
| commit | f529e8b2c3bb2c087bfba3fc5610a66fdbe1a8ae (patch) | |
| tree | 01d936d7497a0c8ab4ba8e73b521042e2bee510f /runtime/conf.c | |
| parent | d2d54013aebb756169182ed8716b142d27134a70 (diff) | |
| parent | a6ed4b59cc39fe802d06f113f238f1ffe90b7cf6 (diff) | |
| download | rsyslog-f529e8b2c3bb2c087bfba3fc5610a66fdbe1a8ae.tar.gz rsyslog-f529e8b2c3bb2c087bfba3fc5610a66fdbe1a8ae.tar.xz rsyslog-f529e8b2c3bb2c087bfba3fc5610a66fdbe1a8ae.zip | |
Merge branch 'master' into newmsg
Conflicts:
tools/omfile.c
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 581254f0..d70bc281 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -216,7 +216,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", |