diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 14:47:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 14:47:18 +0200 |
| commit | f3d4d83ce5a921899775eb59997d9d954b2f423d (patch) | |
| tree | bb4af3cf3eea8733efa7ffd29586e23b54f1ff23 /runtime | |
| parent | bb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d (diff) | |
| parent | 5d67d98c35da731eab933dbfd858a0e009aa58de (diff) | |
| download | rsyslog-f3d4d83ce5a921899775eb59997d9d954b2f423d.tar.gz rsyslog-f3d4d83ce5a921899775eb59997d9d954b2f423d.tar.xz rsyslog-f3d4d83ce5a921899775eb59997d9d954b2f423d.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/conf.c | 2 | ||||
| -rw-r--r-- | runtime/rsyslog.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 1d28a884..b324e125 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -941,7 +941,7 @@ dbgprintf("XXX: fiop is %u\n", (unsigned) f->f_filterData.prop.operation); } /* skip to action part */ - if((iRet = parsSkipWhitespace(pPars)) != RS_RET_OK) { + if((iRet = parsSkipWhitespace(pPars, 1)) != RS_RET_OK) { errmsg.LogError(0, iRet, "error %d skipping to action part - ignoring selector", iRet); rsParsDestruct(pPars); return(iRet); diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 372453ce..04d14212 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -351,6 +351,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_ERR_WRKDIR = -2181, /**< problems with the rsyslog working directory */ RS_RET_WRN_WRKDIR = -2182, /**< correctable problems with the rsyslog working directory */ RS_RET_OUTDATED_STMT = -2184, /**< some outdated statement/functionality is being used in conf file */ + RS_RET_MISSING_WHITESPACE = -2185, /**< whitespace is missing in some config construct */ RS_RET_INVLD_CONF_OBJ= -2200, /**< invalid config object (e.g. $Begin conf statement) */ RS_RET_ERR_LIBEE_INIT = -2201, /**< cannot obtain libee ctx */ |