diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-12 15:17:47 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-12 15:17:47 +0200 |
| commit | 1e819a8afe9494cc760196ac91f3b617bc073de9 (patch) | |
| tree | c0701f10aecefb3a60af67c310b33b3d2bedeb0a /runtime/rsyslog.h | |
| parent | 262f61d869b95f63b393ae48d683b13e70322478 (diff) | |
| parent | 4e86efaf0e20626d8f740fcff131bfd38453de4d (diff) | |
| download | rsyslog-1e819a8afe9494cc760196ac91f3b617bc073de9.tar.gz rsyslog-1e819a8afe9494cc760196ac91f3b617bc073de9.tar.xz rsyslog-1e819a8afe9494cc760196ac91f3b617bc073de9.zip | |
Merge branch 'beta'
Conflicts:
runtime/rsyslog.h
tools/syslogd.c
Diffstat (limited to 'runtime/rsyslog.h')
| -rw-r--r-- | runtime/rsyslog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index f75a5663..a1d1d9fc 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -171,7 +171,6 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_GSS_SEND_ERROR = -2024, /**< error during GSS (via TCP) send process */ RS_RET_TCP_SOCKCREATE_ERR = -2025, /**< error during creation of TCP socket */ RS_RET_GSS_SENDINIT_ERROR = -2024, /**< error during GSS (via TCP) send initialization process */ - RS_RET_QUEUE_FULL = -2025, /**< queue is full, operation could not be completed */ RS_RET_EOF = -2026, /**< end of file reached, not necessarily an error */ RS_RET_IO_ERROR = -2027, /**< some kind of IO error happened */ RS_RET_INVALID_OID = -2028, /**< invalid object ID */ @@ -221,7 +220,6 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_MAIL_NO_FROM = -2072, /**< sender for mail destination is missing */ RS_RET_INVALID_PRI = -2073, /**< PRI value is invalid */ RS_RET_MALICIOUS_HNAME = -2074, /**< remote peer is trying malicious things with its hostname */ - RS_RET_ACCEPT_ERR = -2074, /**< error during accept() system call */ RS_RET_INVALID_HNAME = -2075, /**< remote peer's hostname invalid or unobtainable */ RS_RET_INVALID_PORT = -2076, /**< invalid port value */ RS_RET_COULD_NOT_BIND = -2077, /**< could not bind socket, defunct */ @@ -251,6 +249,8 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_CERTLESS = -2102, /**< state: we run without machine cert (this may be OK) */ RS_RET_NO_ACTIONS = -2103, /**< no active actions are configured (no output will be created) */ RS_RET_CONF_FILE_NOT_FOUND = -2104, /**< config file or directory not found */ + RS_RET_QUEUE_FULL = -2105, /**< queue is full, operation could not be completed */ + RS_RET_ACCEPT_ERR = -2106, /**< error during accept() system call */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |