summaryrefslogtreecommitdiffstats
path: root/runtime/msg.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-06 15:12:51 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-06 15:12:51 +0200
commit29cd813960ed8e4f800cb9210d30888368587f1c (patch)
tree7fd216d79c33106fb12bf744f995480f8665f357 /runtime/msg.c
parentd6602c1a6cfd48ff1f5b7656eb429d60ce927ebc (diff)
parent7f109cca88816752a9c9cbe255df9e3a5b5a8b5a (diff)
downloadrsyslog-29cd813960ed8e4f800cb9210d30888368587f1c.tar.gz
rsyslog-29cd813960ed8e4f800cb9210d30888368587f1c.tar.xz
rsyslog-29cd813960ed8e4f800cb9210d30888368587f1c.zip
Merge branch 'v5-stable' into v5-beta
Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c
Diffstat (limited to 'runtime/msg.c')
-rw-r--r--runtime/msg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c
index 21de8e43..1b0f2323 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -1618,7 +1618,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)