← Back to branch summary

~ubuntu-branches/ubuntu/lucid/rsyslog/lucid-updates

« back to all changes in this revision

Viewing changes to plugins/imuxsock/imuxsock.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2009-06-23 12:12:43 UTC
  • mfrom: (1.1.11 upstream) (3.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20090623121243-d2fejarzidywnn17
Tags: 4.2.0-1
http://bugs.debian.org/530228
* New upstream release of the now stable v4 branch.
  - Fix warnings when /etc/rsyslog.d/ is empty. Closes: #530228
* debian/patches/imudp_multiple_udp_sockets.patch
  - Removed, merged upstream.
* debian/rsyslog.default
  - Set default compat mode to '4'.
* debian/rsyslog.logcheck.ignore.server
  - Update logcheck rules files to also ignore rsyslogd and imklog stop
    messages.
* debian/control
  - Bump Standards-Version to 3.8.2. No further changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/imuxsock/imuxsock.c
42
42
#include "errmsg.h"
43
43
#include "net.h"
44
44
#include "glbl.h"
 
45
#include "msg.h"
45
46
 
46
47
MODULE_TYPE_INPUT
47
48
 
221
222
        if (iRcvd > 0) {
222
223
                parseAndSubmitMessage(funixHName[iSock] == NULL ? glbl.GetLocalHostName() : funixHName[iSock],
223
224
                                      (uchar*)"127.0.0.1", pRcv,
224
 
                                      iRcvd, funixParseHost[iSock], funixFlags[iSock], funixFlowCtl[iSock], (uchar*)"imuxsock");
 
225
                                      iRcvd, funixParseHost[iSock] ? (funixFlags[iSock] | PARSE_HOSTNAME) : funixFlags[iSock],
 
226
                                      funixFlowCtl[iSock], (uchar*)"imuxsock", NULL, 0);
225
227
        } else if (iRcvd < 0 && errno != EINTR) {
226
228
                char errStr[1024];
227
229
                rs_strerror_r(errno, errStr, sizeof(errStr));