diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-11 18:24:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-11 18:24:06 +0200 |
| commit | 2fed964c342f3e8a3737f4336c22af63fd82687e (patch) | |
| tree | f7d726768149acab0a801aa5a4177fcf74ba8685 /runtime/msg.c | |
| parent | ff429be0f6254d40c52150dbf8142330ba754ea7 (diff) | |
| parent | a59cbff7b32038f8b1f13072eb8e2693ff28fc4a (diff) | |
| download | rsyslog-2fed964c342f3e8a3737f4336c22af63fd82687e.tar.gz rsyslog-2fed964c342f3e8a3737f4336c22af63fd82687e.tar.bz2 rsyslog-2fed964c342f3e8a3737f4336c22af63fd82687e.zip | |
Merge branch 'beta'
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 4df13031..ec3dbfa1 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1004,11 +1004,15 @@ msg_t* MsgDup(msg_t* pOld) } else { tmpCOPYSZ(RawMsg); } - if(pOld->iLenHOSTNAME < CONF_HOSTNAME_BUFSIZE) { - memcpy(pNew->szHOSTNAME, pOld->szHOSTNAME, pOld->iLenHOSTNAME + 1); - pNew->pszHOSTNAME = pNew->szHOSTNAME; + if(pOld->pszHOSTNAME == NULL) { + pNew->pszHOSTNAME = NULL; } else { - tmpCOPYSZ(HOSTNAME); + if(pOld->iLenHOSTNAME < CONF_HOSTNAME_BUFSIZE) { + memcpy(pNew->szHOSTNAME, pOld->szHOSTNAME, pOld->iLenHOSTNAME + 1); + pNew->pszHOSTNAME = pNew->szHOSTNAME; + } else { + tmpCOPYSZ(HOSTNAME); + } } tmpCOPYCSTR(ProgName); @@ -2749,6 +2753,10 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, *pbMustBeFreed = 0; break; case PROP_SYS_UPTIME: +# ifdef OS_SOLARIS + pRes = (uchar*) "UPTIME NOT available under Solaris"; + *pbMustBeFreed = 0; +# else { struct sysinfo s_info; @@ -2764,6 +2772,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, snprintf((char*) pRes, sizeof(uchar) * 32, "%ld", s_info.uptime); } +# endif break; default: /* there is no point in continuing, we may even otherwise render the |