← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tools/syslogd.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:
tools/syslogd.c
799
799
                DBGPRINTF("flush %s: repeated %d times, %d sec.\n",
800
800
                    module.GetStateName(pAction->pMod), pAction->f_prevcount,
801
801
                    repeatinterval[pAction->f_repeatcount]);
802
 
                actionWriteToAction(pAction, NULL, 0);
 
802
                actionWriteToAction(pAction);
803
803
                BACKOFF(pAction);
804
804
        }
805
805
        UnlockObj(pAction);
2129
2129
#else
2130
2130
        printf("\t32bit Atomic operations supported:\tNo\n");
2131
2131
#endif
2132
 
#ifdef  HAVE_ATOMIC_BUILTINS64
 
2132
#ifdef  HAVE_ATOMIC_BUILTINS_64BIT
2133
2133
        printf("\t64bit Atomic operations supported:\tYes\n");
2134
2134
#else
2135
2135
        printf("\t64bit Atomic operations supported:\tNo\n");