diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-01-30 13:52:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-01-30 13:52:49 +0100 |
| commit | b54797da054a74144f10dfeb0daeca99decd9b12 (patch) | |
| tree | 99b173ac46ff792d7401d60a0e78846e4b4eda18 /tools | |
| parent | 2cfaf5f86a4fb40cc37ae71118c506f1d924df13 (diff) | |
| parent | a2bfabc1c0cb1afd02d53ae731779486b566ddb6 (diff) | |
| download | rsyslog-b54797da054a74144f10dfeb0daeca99decd9b12.tar.gz rsyslog-b54797da054a74144f10dfeb0daeca99decd9b12.tar.xz rsyslog-b54797da054a74144f10dfeb0daeca99decd9b12.zip | |
Merge branch 'v3-stable' into beta, conclude fix for race
Conflicts:
ChangeLog
runtime/msg.c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index bc1f71d3..1447d868 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1622,7 +1622,7 @@ logmsg(msg_t *pMsg, int flags) assert(pMsg != NULL); assert(pMsg->pszUxTradMsg != NULL); msg = (char*) pMsg->pszUxTradMsg; - dbgprintf("logmsg: flags %x, pri %s, from '%s', msg %s\n", flags, getPRI(pMsg), getRcvFrom(pMsg), msg); + dbgprintf("logmsg: flags %x, from '%s', msg %s\n", flags, getRcvFrom(pMsg), msg); /* rger 2005-11-24 (happy thanksgiving!): we now need to check if we have * a traditional syslog message or one formatted according to syslog-protocol. |