← Back to branch summary

~ubuntu-branches/ubuntu/precise/rsyslog/precise

« back to all changes in this revision

Viewing changes to runtime/nsd_ptcp.c

  • Committer: Package Import Robot
  • Author(s): Scott Moser
  • Date: 2011-11-07 13:54:56 UTC
  • mfrom: (16.1.25 sid)
  • Revision ID: package-import@ubuntu.com-20111107135456-cwt6mu19ski1h2qf
Tags: 5.8.6-1ubuntu1
* Resynchronise with Debian. Remaining changes:
  - Run as rsyslog:rsyslog, set $FileOwner to syslog
  - Replace init script with debian/rsyslog.upstart.
  - debian/rsyslog.logrotate: Use reload command to restart rsyslog
  - debian/rsyslog.conf: enable $RepeatedMsgReduction 
    to avoid bloating the syslog file (LP #453444)
  - Add debian/rsyslog.dmesg.upstart to save initial dmesg into a file.
    Install it in debian/rules.
  - debian/50-default.conf: set of default rules for syslog (forwarded to
    Debian #603160). remove file in postrm on purge. manage with ucf.
  - debian/rules: build with LDFLAGS=""
* Dropped:
  - debian/patches/02-CVE-2011-3200.patch (fixed in upstream release)

Show diffs side-by-side

added added

removed removed

Lines of Context:
runtime/nsd_ptcp.c
334
334
 
335
335
        iNewSock = accept(pThis->sock, (struct sockaddr*) &addr, &addrlen);
336
336
        if(iNewSock < 0) {
 
337
                if(Debug) {
 
338
                        char errStr[1024];
 
339
                        rs_strerror_r(errno, errStr, sizeof(errStr));
 
340
                        dbgprintf("nds_ptcp: error accepting connection on socket %d, errno %d: %s\n",
 
341
                                  pThis->sock, errno, errStr);
 
342
                }
337
343
                ABORT_FINALIZE(RS_RET_ACCEPT_ERR);
338
344
        }
339
345