diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 18:47:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 18:47:06 +0200 |
| commit | 527edddb4646c24fa9a587601cd90d7a57a1fcf0 (patch) | |
| tree | ff881cc053915d617f1ec6465b8d8c01897c6563 /runtime | |
| parent | d3eb89a5fe1dbcda028c0ab5e6753578716539d7 (diff) | |
| parent | 84084ea2a178f782184d75db10f252efdc62fb5f (diff) | |
| download | rsyslog-527edddb4646c24fa9a587601cd90d7a57a1fcf0.tar.gz rsyslog-527edddb4646c24fa9a587601cd90d7a57a1fcf0.tar.xz rsyslog-527edddb4646c24fa9a587601cd90d7a57a1fcf0.zip | |
Merge branch 'v4-devel'
Conflicts:
runtime/msg.h
runtime/rsyslog.h
runtime/stream.c
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/rsyslog.h | 1 | ||||
| -rw-r--r-- | runtime/stream.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 9f29c48d..61bfc122 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -396,6 +396,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth 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_ERR_DOOR = -2147, /**< some problems with handling the Solaris door functionality */ 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 */ diff --git a/runtime/stream.c b/runtime/stream.c index e3f020ae..e0b97f9f 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -215,7 +215,8 @@ doPhysOpen(strm_t *pThis) } pThis->fd = open((char*)pThis->pszCurrFName, iFlags, pThis->tOpenMode); - DBGPRINTF("file '%s' opened as #%d with mode %d\n", pThis->pszCurrFName, pThis->fd, (int) pThis->tOpenMode); + DBGPRINTF("file '%s' opened as #%d with mode %d\n", pThis->pszCurrFName, + pThis->fd, (int) pThis->tOpenMode); if(pThis->fd == -1) { char errStr[1024]; int err = errno; |