diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 15:13:33 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 15:13:33 +0200 |
commit | ada87cbaefecff9d32f3d008876f2eec59335ded (patch) | |
tree | c52339b2e2c2cbfc7a7152bf1cc65912b46932c2 /runtime/rsyslog.h | |
parent | 11ab3c800043b036132b0fc96d20bcba637a72b6 (diff) | |
parent | 9039fad4019cb9a0f96eb296835476841b453dd3 (diff) | |
download | rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.tar.gz rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.tar.xz rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.zip |
Merge branch 'v4-devel' into master
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/manual.html
runtime/debug.c
runtime/rsyslog.h
tests/Makefile.am
tests/diag.sh
tests/nettester.c
tools/syslogd.c
Diffstat (limited to 'runtime/rsyslog.h')
-rw-r--r-- | runtime/rsyslog.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 4cb20163..9f29c48d 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -394,6 +394,8 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_VAR_NOT_FOUND = -2142, /**< variable not found */ RS_RET_EMPTY_MSG = -2143, /**< provided (raw) MSG is empty */ RS_RET_PEER_CLOSED_CONN = -2144, /**< remote peer closed connection (information, no error) */ + RS_RET_ERR_OPEN_KLOG = -2145, /**< error opening the kernel log socket (primarily solaris) */ + RS_RET_ERR_AQ_CONLOG = -2146, /**< error aquiring console log (on solaris) */ RS_RET_NO_SRCNAME_TPL = -2150, /**< sourcename template was not specified where one was needed (omudpspoof spoof addr) */ RS_RET_HOST_NOT_SPECIFIED = -2151, /**< (target) host was not specified where it was needed */ RS_RET_ERR_LIBNET_INIT = -2152, /**< error initializing libnet */ |