← Back to branch summary

~ubuntu-branches/debian/sid/rsyslog/sid

« back to all changes in this revision

Viewing changes to grammar/rainerscript.h

  • Committer: Package Import Robot
  • Author(s): Michael Biebl, Michael Biebl, Daniel Pocock
  • Date: 2014-03-11 19:52:49 UTC
  • mfrom: (1.1.37)
  • Revision ID: package-import@ubuntu.com-20140311195249-phbsh9be8lebawti
Tags: 7.4.8-1
http://bugs.debian.org/740869
http://bugs.debian.org/721277
[ Michael Biebl ]
* New upstream release.
* Update Build-Depends:
  - Bump libestr-dev to (>= 0.1.9).
  - Tighten liblognorm-dev to (<< 1.0.0).
  - Replace libjson0-dev with libjson-c-dev, we no longer need the
    transitional package.
* Bump Standards-Version to 3.9.5. No further changes.

[ Daniel Pocock ]
* Make template parameter not mandatory in mongodb output plugin. Patch
  cherry-picked from upstream Git. (Closes: #740869, #721277)
* Ensure JSON templates are NUL terminated. Patch cherry-picked from
  upstream Git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
grammar/rainerscript.h
5
5
#include <typedefs.h>
6
6
#include <sys/types.h>
7
7
#include <regex.h>
 
8
#include "typedefs.h"
8
9
 
9
10
 
10
11
#define LOG_NFACILITIES 24      /* current number of syslog facilities */
164
165
                struct {
165
166
                        es_str_t *name;
166
167
                        struct cnfstmt *stmt;
 
168
                        ruleset_t *ruleset;     /* non-NULL if the ruleset has a queue assigned */
167
169
                } s_call;
168
170
                struct {
169
171
                        uchar pmask[LOG_NFACILITIES+1]; /* priority mask */