diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:43:03 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:43:03 +0200 |
| commit | ba31ca0c288c71a714a93118acfb214879bf7b8f (patch) | |
| tree | 670c914437ba781f34d6ab37962cb337711f7f26 /runtime/msg.c | |
| parent | 050db3854d664b47b8b27d7877984500c8ba9568 (diff) | |
| parent | 7f109cca88816752a9c9cbe255df9e3a5b5a8b5a (diff) | |
| download | rsyslog-ba31ca0c288c71a714a93118acfb214879bf7b8f.tar.gz rsyslog-ba31ca0c288c71a714a93118acfb214879bf7b8f.tar.xz rsyslog-ba31ca0c288c71a714a93118acfb214879bf7b8f.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 01808ac0..e09b8705 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1633,7 +1633,7 @@ char *getPROCID(msg_t *pM, sbool bLockMutex) MsgLock(pM); preparePROCID(pM, MUTEX_ALREADY_LOCKED); if(pM->pCSPROCID == NULL) - pszRet = UCHAR_CONSTANT(""); + pszRet = UCHAR_CONSTANT("-"); else pszRet = rsCStrGetSzStrNoNULL(pM->pCSPROCID); if(bLockMutex == LOCK_MUTEX) |