diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-29 10:25:06 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-29 10:25:06 +0100 |
| commit | e6424d4e52c204af2fdb8285b24a0219c759df51 (patch) | |
| tree | 5d7e0154f690ce5525b94dec6812716996eef597 /runtime/rsyslog.h | |
| parent | 6bc461367408fbd9abb74ac31619ad2cef490fda (diff) | |
| parent | cb12ed5dd211f9910860e86fd937180895c459de (diff) | |
| download | rsyslog-e6424d4e52c204af2fdb8285b24a0219c759df51.tar.gz rsyslog-e6424d4e52c204af2fdb8285b24a0219c759df51.tar.bz2 rsyslog-e6424d4e52c204af2fdb8285b24a0219c759df51.zip | |
Merge branch 'beta-jsonrt' into master-es
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'runtime/rsyslog.h')
| -rw-r--r-- | runtime/rsyslog.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 07d58d68..7712269a 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -376,6 +376,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_LEGA_ACT_NOT_SUPPORTED = -2215, /**< the module (no longer) supports legacy action syntax */ RS_RET_MAX_OMSR_REACHED = -2216, /**< max nbr of string requests reached, not supported by core */ RS_RET_UID_MISSING = -2217, /**< a user id is missing (but e.g. a password provided) */ + RS_RET_DATAFAIL = -2218, /**< data passed to action caused failure */ /* reserved for pre-v6.5 */ RS_RET_DUP_PARAM = -2220, /**< config parameter is given more than once */ RS_RET_MODULE_ALREADY_IN_CONF = -2221, /**< module already in current configuration */ |