diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 12:58:32 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 12:58:32 +0100 |
commit | 2a813afa41cfda63896002b037742a67678584ad (patch) | |
tree | 3b27af879f8e87fb5b60204ecdd512cb15803556 /runtime/rsyslog.h | |
parent | 1ae52ee0e386ee7991d65cd2ac46add2b84f3099 (diff) | |
parent | 8716e36b12a851cbe6a8a3949dfdcad31aa5fc37 (diff) | |
download | rsyslog-2a813afa41cfda63896002b037742a67678584ad.tar.gz rsyslog-2a813afa41cfda63896002b037742a67678584ad.tar.xz rsyslog-2a813afa41cfda63896002b037742a67678584ad.zip |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
plugins/omprog/omprog.c
runtime/rsyslog.h
Diffstat (limited to 'runtime/rsyslog.h')
-rw-r--r-- | runtime/rsyslog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 04d14212..0922c1bb 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -357,7 +357,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_ERR_LIBEE_INIT = -2201, /**< cannot obtain libee ctx */ RS_RET_ERR_LIBLOGNORM_INIT = -2202,/**< cannot obtain liblognorm ctx */ RS_RET_ERR_LIBLOGNORM_SAMPDB_LOAD = -2203,/**< liblognorm sampledb load failed */ - + RS_RET_CONF_RQRD_PARAM_MISSING = -2208,/**< required parameter in config object is missing */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |