diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-29 15:51:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-29 15:51:46 +0200 |
| commit | ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8 (patch) | |
| tree | 74dbe259b64d8f6e839e5c99a7d99f2edaf32f2b /runtime/rsyslog.h | |
| parent | 40334847b685e6058be562b4436f72426637f4d8 (diff) | |
| parent | b397a80c88be0de6e7450bcbeb3524be98e572b6 (diff) | |
| download | rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.tar.gz rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.tar.xz rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.zip | |
Merge branch 'beta'
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 778fcf68..d802536a 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -374,6 +374,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_CNF_INVLD_FRAMING = -2214, /**< invalid framing specified in config file */ 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) */ /* 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 */ |