diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/omfwd.c | 9 | ||||
| -rw-r--r-- | tools/rsyslogd.8 | 4 | ||||
| -rw-r--r-- | tools/syslogd.c | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/tools/omfwd.c b/tools/omfwd.c index 715457c9..30761a87 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -334,9 +334,10 @@ finalize_it: */ static rsRetVal doTryResume(instanceData *pData) { - DEFiRet; + int iErr; struct addrinfo *res; struct addrinfo hints; + DEFiRet; if(pData->bIsConnected) FINALIZE; @@ -348,8 +349,10 @@ static rsRetVal doTryResume(instanceData *pData) /* port must be numeric, because config file syntax requires this */ hints.ai_flags = AI_NUMERICSERV; hints.ai_family = glbl.GetDefPFFamily(); - hints.ai_socktype = pData->protocol == SOCK_DGRAM; - if((getaddrinfo(pData->f_hname, getFwdPt(pData), &hints, &res)) != 0) { + hints.ai_socktype = SOCK_DGRAM; + if((iErr = (getaddrinfo(pData->f_hname, getFwdPt(pData), &hints, &res))) != 0) { + dbgprintf("could not get addrinfo for hostname '%s':'%s': %d%s\n", + pData->f_hname, getFwdPt(pData), iErr, gai_strerror(iErr)); ABORT_FINALIZE(RS_RET_SUSPENDED); } dbgprintf("%s found, resuming.\n", pData->f_hname); diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8 index 2aa911d9..a1395d73 100644 --- a/tools/rsyslogd.8 +++ b/tools/rsyslogd.8 @@ -266,7 +266,7 @@ Disabling inet domain sockets will limit risk to the local machine. If remote logging is enabled, messages can easily be spoofed and replayed. As the messages are transmitted in clear-text, an attacker might use the information obtained from the packets for malicious things. Also, an -attacker might reply recorded messages or spoof a sender's IP address, +attacker might replay recorded messages or spoof a sender's IP address, which could lead to a wrong perception of system activity. These can be prevented by using GSS-API authentication and encryption. Be sure to think about syslog network security before enabling it. @@ -310,7 +310,7 @@ following options possible (all are case insensitive): .IP LogFuncFlow Print out the logical flow of functions (entering and exiting them) .IP FileTrace -Ppecifies which files to trace LogFuncFlow. If not set (the +Specifies which files to trace LogFuncFlow. If not set (the default), a LogFuncFlow trace is provided for all files. Set to limit it to the files specified.FileTrace may be specified multiple times, one file each (e.g. export RSYSLOG_DEBUG="LogFuncFlow diff --git a/tools/syslogd.c b/tools/syslogd.c index dda605a8..3f97a70f 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1601,7 +1601,7 @@ logmsg(msg_t *pMsg, int flags) assert(pMsg != NULL); assert(pMsg->pszUxTradMsg != NULL); msg = (char*) pMsg->pszUxTradMsg; - dbgprintf("logmsg: flags %x, from '%s', msg %s\n", flags, getRcvFrom(pMsg), msg); + dbgprintf("logmsg: flags %x, pri %s, from '%s', msg %s\n", flags, getPRI(pMsg), 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. |