diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2005-10-28 07:30:38 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2005-10-28 07:30:38 +0000 |
| commit | 892e359dceee0e99ced947d1bdb512e7a5733312 (patch) | |
| tree | c026500a8cd3df9c9f798a2c39e4726821c7db7c /syslogd.c | |
| parent | f6289f35a43ba5838d97ddf2ac9b96b196e68033 (diff) | |
| download | rsyslog-892e359dceee0e99ced947d1bdb512e7a5733312.tar.gz rsyslog-892e359dceee0e99ced947d1bdb512e7a5733312.tar.xz rsyslog-892e359dceee0e99ced947d1bdb512e7a5733312.zip | |
fixed a bug where a NULL-pointer was passed to printf in logmsg(); fixed a
bug in make install, where rfc3195d was not installed.
Diffstat (limited to 'syslogd.c')
| -rw-r--r-- | syslogd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3683,7 +3683,7 @@ void logmsg(int pri, struct msg *pMsg, int flags) assert(pMsg != NULL); assert(pMsg->pszUxTradMsg != NULL); msg = pMsg->pszUxTradMsg; - dprintf("logmsg: %s, flags %x, from %s, msg %s\n", textpri(pri), flags, pMsg->pszHOSTNAME, msg); + dprintf("logmsg: %s, flags %x, from '%s', msg %s\n", textpri(pri), flags, getRcvFrom(pMsg), msg); #ifndef SYSV omask = sigblock(sigmask(SIGHUP)|sigmask(SIGALRM)); @@ -4316,7 +4316,7 @@ void fprintlog(register struct filed *f) dprintf(" %s:%d/%s\n", f->f_un.f_forw.f_hname, f->f_un.f_forw.port, f->f_un.f_forw.protocol == FORW_UDP ? "udp" : "tcp"); iovCreate(f); - if ( strcmp(f->f_pMsg->pszHOSTNAME, LocalHostName) && NoHops ) + if ( strcmp(getHOSTNAME(f->f_pMsg), LocalHostName) && NoHops ) dprintf("Not sending message to remote.\n"); else { char *psz; |