← Back to branch summary

~ubuntu-branches/ubuntu/trusty/syslog-ng/trusty-proposed

« back to all changes in this revision

Viewing changes to modules/affile/affile-grammar.ym

  • Committer: Package Import Robot
  • Author(s): Laszlo Boszormenyi (GCS), Gergely Nagy
  • Date: 2011-10-11 14:30:48 UTC
  • mfrom: (1.3.7)
  • Revision ID: package-import@ubuntu.com-20111011143048-r1iljux9xbvj3lwh
Tags: 3.3.1.dfsg-1
http://bugs.debian.org/496521
http://bugs.debian.org/616069
http://bugs.debian.org/630172
http://bugs.debian.org/609154
http://bugs.debian.org/608605
http://bugs.debian.org/644458
http://bugs.debian.org/634715
http://bugs.debian.org/589081
* New upstream release with important fixes from upstream git tree with
  non-free manpages removed.
* Drop syslog-ng.conf(5) (closes: #496521).
* syslog-ng(8) is generated, and does not mention -Q anymore
  (closes: #616069).
* Supports CAP_SYSLOG on recent kernels (closes: #630172).
* Does not use g_timeout_add_seconds anymore (closes: #609154).

[ Gergely Nagy <algernon@madhouse-project.org> ]
* Update debian/copyright to DEP-5 format.
* Simplified the logrotate file by merging identical entries.
* Include local configuration files from /etc/syslog-ng/conf.d/ (Closes:
  #609050).
* Update syslog-ng.conf to be fully 3.3 compliant.
* Compress both source and binaries (except the syslog-ng meta
  package) with xz, instead of gzip.
* Use dpkg triggers to restart syslog-ng when appropriate.
* Include DFSG-free manual pages for all binaries.
* Build with Hardening enabled.
* Mention syslog(3) in /etc/default/syslog-ng, instead of
  <linux/kernel.h> (Closes: #608605)
* Support 'status' in the init script.
  Patch from Peter Eisentraut <petere@debian.org> (Closes: #644458)
* Build-Depend on libevtlog-dev (>= 0.2.12-5~) for correct shlibs.
* Use [linux-any] in Build-Depends instead of hardcoded links.
  (Closes: #634715)
* Use $SYSLOGNG_OPTS in the init script when reloading syslog-ng.
  (Closes: #589081)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/affile/affile-grammar.ym
34
34
#include "affile-grammar.h"
35
35
#include "syslog-names.h"
36
36
#include "messages.h"
 
37
#include "plugin.h"
37
38
 
38
39
#include <string.h>
39
40
 
40
 
extern LogReaderOptions *last_reader_options;
41
 
extern LogWriterOptions *last_writer_options;
42
 
 
43
41
}
44
42
 
45
43
%name-prefix "affile_"
49
47
 
50
48
%lex-param {CfgLexer *lexer}
51
49
%parse-param {CfgLexer *lexer}
52
 
%parse-param {LogDriver **last_driver}
 
50
%parse-param {LogDriver **instance}
 
51
%parse-param {gpointer arg}
53
52
 
54
53
/* INCLUDE_DECLS */
55
54
 
82
81
source_affile_params
83
82
        : string
84
83
          {
85
 
            (*last_driver) = affile_sd_new($1, 0);
 
84
            last_driver = *instance = affile_sd_new($1, 0);
86
85
            free($1);
87
 
            last_reader_options = &((AFFileSourceDriver *) (*last_driver))->reader_options;
 
86
            last_reader_options = &((AFFileSourceDriver *) last_driver)->reader_options;
88
87
          }
89
 
          source_affile_options                 { $$ = (*last_driver); }
 
88
          source_affile_options                 { $$ = last_driver; }
90
89
        ;
91
90
 
92
91
source_affile_options
104
103
source_afpipe_params
105
104
        : string
106
105
          {
107
 
            (*last_driver) = affile_sd_new($1, AFFILE_PIPE);
 
106
            last_driver = *instance = affile_sd_new($1, AFFILE_PIPE);
108
107
            free($1);
109
 
            last_reader_options = &((AFFileSourceDriver *) (*last_driver))->reader_options;
 
108
            last_reader_options = &((AFFileSourceDriver *) last_driver)->reader_options;
110
109
          }
111
 
          source_afpipe_options                         { $$ = (*last_driver); }
 
110
          source_afpipe_options                         { $$ = last_driver; }
112
111
        ;
113
112
 
114
113
source_afpipe_options
117
116
        ;
118
117
 
119
118
source_afpipe_option
120
 
        : KW_OPTIONAL '(' yesno ')'                     { (*last_driver)->optional = $3; }
 
119
        : KW_OPTIONAL '(' yesno ')'                     { last_driver->optional = $3; }
121
120
        | source_reader_option
122
121
        ;
123
122
 
129
128
dest_affile_params
130
129
        : string
131
130
          {
132
 
            (*last_driver) = affile_dd_new($1, 0);
 
131
            last_driver = *instance = affile_dd_new($1, 0);
133
132
            free($1);
134
 
            last_writer_options = &((AFFileDestDriver *) (*last_driver))->writer_options;
 
133
            last_writer_options = &((AFFileDestDriver *) last_driver)->writer_options;
135
134
          }
136
 
          dest_affile_options                           { $$ = (*last_driver); }
 
135
          dest_affile_options                           { $$ = last_driver; }
137
136
        ;
138
137
 
139
138
dest_affile_options
143
142
 
144
143
dest_affile_option
145
144
        : dest_writer_option
146
 
        | KW_OPTIONAL '(' yesno ')'             { (*last_driver)->optional = $3; }
147
 
        | KW_OWNER '(' string_or_number ')'     { affile_dd_set_file_uid((*last_driver), $3); free($3); }
148
 
        | KW_GROUP '(' string_or_number ')'     { affile_dd_set_file_gid((*last_driver), $3); free($3); }
149
 
        | KW_PERM '(' LL_NUMBER ')'             { affile_dd_set_file_perm((*last_driver), $3); }
150
 
        | KW_DIR_OWNER '(' string_or_number ')' { affile_dd_set_dir_uid((*last_driver), $3); free($3); }
151
 
        | KW_DIR_GROUP '(' string_or_number ')' { affile_dd_set_dir_gid((*last_driver), $3); free($3); }
152
 
        | KW_DIR_PERM '(' LL_NUMBER ')'         { affile_dd_set_dir_perm((*last_driver), $3); }
153
 
        | KW_CREATE_DIRS '(' yesno ')'          { affile_dd_set_create_dirs((*last_driver), $3); }
154
 
        | KW_OVERWRITE_IF_OLDER '(' LL_NUMBER ')'       { affile_dd_set_overwrite_if_older((*last_driver), $3); }
155
 
        | KW_FSYNC '(' yesno ')'                { affile_dd_set_fsync((*last_driver), $3); }
156
 
        | KW_LOCAL_TIME_ZONE '(' string ')'     { affile_dd_set_local_time_zone((*last_driver), $3); free($3); }
 
145
        | dest_driver_option
 
146
        | KW_OPTIONAL '(' yesno ')'             { last_driver->optional = $3; }
 
147
        | KW_OWNER '(' string_or_number ')'     { affile_dd_set_file_uid(last_driver, $3); free($3); }
 
148
        | KW_OWNER '(' ')'                      { affile_dd_set_file_uid(last_driver, "-2"); }
 
149
        | KW_GROUP '(' string_or_number ')'     { affile_dd_set_file_gid(last_driver, $3); free($3); }
 
150
        | KW_GROUP '(' ')'                      { affile_dd_set_file_gid(last_driver, "-2"); }
 
151
        | KW_PERM '(' LL_NUMBER ')'             { affile_dd_set_file_perm(last_driver, $3); }
 
152
        | KW_PERM '(' ')'                       { affile_dd_set_file_perm(last_driver, -2); }
 
153
        | KW_DIR_OWNER '(' string_or_number ')' { affile_dd_set_dir_uid(last_driver, $3); free($3); }
 
154
        | KW_DIR_OWNER '(' ')'                  { affile_dd_set_dir_uid(last_driver, "-2"); }
 
155
        | KW_DIR_GROUP '(' string_or_number ')' { affile_dd_set_dir_gid(last_driver, $3); free($3); }
 
156
        | KW_DIR_GROUP '(' ')'                  { affile_dd_set_dir_gid(last_driver, "-2"); }
 
157
        | KW_DIR_PERM '(' LL_NUMBER ')'         { affile_dd_set_dir_perm(last_driver, $3); }
 
158
        | KW_DIR_PERM '(' ')'                   { affile_dd_set_dir_perm(last_driver, -2); }
 
159
        | KW_CREATE_DIRS '(' yesno ')'          { affile_dd_set_create_dirs(last_driver, $3); }
 
160
        | KW_OVERWRITE_IF_OLDER '(' LL_NUMBER ')'       { affile_dd_set_overwrite_if_older(last_driver, $3); }
 
161
        | KW_FSYNC '(' yesno ')'                { affile_dd_set_fsync(last_driver, $3); }
 
162
        | KW_LOCAL_TIME_ZONE '(' string ')'     { affile_dd_set_local_time_zone(last_driver, $3); free($3); }
157
163
        ;
158
164
 
159
165
dest_afpipe_params
160
166
        : string
161
167
          {
162
 
            (*last_driver) = affile_dd_new($1, AFFILE_PIPE);
 
168
            last_driver = *instance = affile_dd_new($1, AFFILE_PIPE);
163
169
            free($1);
164
 
            last_writer_options = &((AFFileDestDriver *) (*last_driver))->writer_options;
165
 
            last_writer_options->flush_lines = 0;
 
170
            last_writer_options = &((AFFileDestDriver *) last_driver)->writer_options;
166
171
          }
167
 
          dest_afpipe_options                   { $$ = (*last_driver); }
 
172
          dest_afpipe_options                   { $$ = last_driver; }
168
173
        ;
169
174
 
170
175
dest_afpipe_options
174
179
 
175
180
dest_afpipe_option
176
181
        : dest_writer_option
177
 
        | KW_OWNER '(' string_or_number ')'     { affile_dd_set_file_uid((*last_driver), $3); free($3); }
178
 
        | KW_GROUP '(' string_or_number ')'     { affile_dd_set_file_gid((*last_driver), $3); free($3); }
179
 
        | KW_PERM '(' LL_NUMBER ')'             { affile_dd_set_file_perm((*last_driver), $3); }
 
182
        | dest_driver_option
 
183
        | KW_OWNER '(' string_or_number ')'     { affile_dd_set_file_uid(last_driver, $3); free($3); }
 
184
        | KW_OWNER '(' ')'                      { affile_dd_set_file_uid(last_driver, "-2"); }
 
185
        | KW_GROUP '(' string_or_number ')'     { affile_dd_set_file_gid(last_driver, $3); free($3); }
 
186
        | KW_GROUP '(' ')'                      { affile_dd_set_file_gid(last_driver, "-2"); }
 
187
        | KW_PERM '(' LL_NUMBER ')'             { affile_dd_set_file_perm(last_driver, $3); }
 
188
        | KW_PERM '(' ')'                       { affile_dd_set_file_perm(last_driver, -2); }
180
189
        ;
181
190
 
182
191