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

« back to all changes in this revision

Viewing changes to runtime/net.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:
722
722
                                                SIN(allowIP.addr.NetAddr)->sin_port   = 0;
723
723
                                                memcpy(&(SIN(allowIP.addr.NetAddr)->sin_addr.s_addr),
724
724
                                                        &(SIN6(res->ai_addr)->sin6_addr.s6_addr32[3]),
725
 
                                                        sizeof (struct sockaddr_in));
 
725
                                                        sizeof (in_addr_t));
726
726
 
727
727
                                                if((iRet = AddAllowedSenderEntry(ppRoot, ppLast, &allowIP,
728
728
                                                                iSignificantBits))