--- syslog-ng-2.0.6.orig/doc/examples/syslog-ng-anon.conf +++ syslog-ng-2.0.6/doc/examples/syslog-ng-anon.conf @@ -0,0 +1,243 @@ +# +# Configuration file for syslog-ng under Debian. +# Customized for riseup.net using syslog-ng-anon patch +# (http://dev.riseup.net/patches/syslog-ng/) +# +# see http://www.campin.net/syslog-ng/expanded-syslog-ng.conf +# for examples. +# +# levels: emerg alert crit err warning notice info debug +# + +############################################################ +## global options + +options { + chain_hostnames(0); + time_reopen(10); + time_reap(360); + sync(0); + log_fifo_size(2048); + create_dirs(yes); + group(adm); + perm(0640); + dir_perm(0755); + use_dns(no); +}; + +############################################################ +## universal source + +source s_all { + internal(); + unix-stream("/dev/log"); + file("/proc/kmsg" log_prefix("kernel: ")); +}; + +############################################################ +## generic destinations + +destination df_facility_dot_info { file("/var/log/$FACILITY.info"); }; +destination df_facility_dot_notice { file("/var/log/$FACILITY.notice"); }; +destination df_facility_dot_warn { file("/var/log/$FACILITY.warn"); }; +destination df_facility_dot_err { file("/var/log/$FACILITY.err"); }; +destination df_facility_dot_crit { file("/var/log/$FACILITY.crit"); }; + +############################################################ +## generic filters + +filter f_strip { strip(ips); }; +filter f_at_least_info { level(info..emerg); }; +filter f_at_least_notice { level(notice..emerg); }; +filter f_at_least_warn { level(warn..emerg); }; +filter f_at_least_err { level(err..emerg); }; +filter f_at_least_crit { level(crit..emerg); }; + +############################################################ +## auth.log + +filter f_auth { facility(auth, authpriv); }; +destination df_auth { file("/var/log/auth.log"); }; +log { + source(s_all); + filter(f_auth); + destination(df_auth); +}; + +############################################################ +## daemon.log + +filter f_daemon { facility(daemon); }; +destination df_daemon { file("/var/log/daemon.log"); }; +log { + source(s_all); + filter(f_daemon); + destination(df_daemon); +}; + +############################################################ +## kern.log + +filter f_kern { facility(kern); }; +destination df_kern { file("/var/log/kern.log"); }; +log { + source(s_all); + filter(f_kern); + destination(df_kern); +}; + +############################################################ +## user.log + +filter f_user { facility(user); }; +destination df_user { file("/var/log/user.log"); }; +log { + source(s_all); + filter(f_user); + destination(df_user); +}; + +############################################################ +## sympa.log + +filter f_sympa { program("^(sympa|bounced|archived|task_manager)"); }; +destination d_sympa { file("/var/log/sympa.log"); }; +log { + source(s_all); + filter(f_sympa); + destination(d_sympa); + flags(final); +}; + +############################################################ +## wwsympa.log + +filter f_wwsympa { program("^wwsympa"); }; +destination d_wwsympa { file("/var/log/wwsympa.log"); }; +log { + source(s_all); + filter(f_wwsympa); + filter(f_strip); + destination(d_wwsympa); + flags(final); +}; + +############################################################ +## ldap.log + +filter f_ldap { program("slapd"); }; +destination d_ldap { file("/var/log/ldap.log"); }; +log { + source(s_all); + filter(f_ldap); + destination(d_ldap); + flags(final); +}; + +############################################################ +## postfix.log + +# special source because of chroot jail +#source s_postfix { unix-stream("/var/spool/postfix/dev/log" keep-alive(yes)); }; +filter f_postfix { program("^postfix/"); }; +destination d_postfix { file("/var/log/postfix.log"); }; +log { + source(s_all); + filter(f_postfix); + filter(f_strip); + destination(d_postfix); + flags(final); +}; + +############################################################ +## courier.log + +filter f_courier { program("courier|imap|pop"); }; +destination d_courier { file("/var/log/courier.log"); }; +log { + source(s_all); + filter(f_courier); + filter(f_strip); + destination(d_courier); + flags(final); +}; + +############################################################ +## maildrop.log + +filter f_maildrop { program("^maildrop"); }; +destination d_maildrop { file("/var/log/maildrop.log"); }; +log { + source(s_all); + filter(f_maildrop); + destination(d_courier); + flags(final); +}; + +############################################################ +## mail.log + +filter f_mail { facility(mail); }; +destination df_mail { file("/var/log/mail.log"); }; + +log { + source(s_all); + filter(f_mail); + destination(df_mail); +}; + +############################################################ +## messages.log + +filter f_messages { + level(debug,info,notice) + and not facility(auth,authpriv,daemon,mail,user,kern); +}; +destination df_messages { file("/var/log/messages.log"); }; +log { + source(s_all); + filter(f_messages); + destination(df_messages); +}; + +############################################################ +## errors.log + +filter f_errors { + level(warn,err,crit,alert,emerg) + and not facility(auth,authpriv,daemon,mail,user,kern); +}; +destination df_errors { file("/var/log/errors.log"); }; +log { + source(s_all); + filter(f_errors); + destination(df_errors); +}; + +############################################################ +## emergencies + +filter f_emerg { level(emerg); }; +destination du_all { usertty("*"); }; +log { + source(s_all); + filter(f_emerg); + destination(du_all); +}; + +############################################################ +## console messages + +filter f_xconsole { + facility(daemon,mail) + or level(debug,info,notice,warn) + or (facility(news) + and level(crit,err,notice)); +}; +destination dp_xconsole { pipe("/dev/xconsole"); }; +log { + source(s_all); + filter(f_xconsole); + destination(dp_xconsole); +}; + --- syslog-ng-2.0.6.orig/doc/reference/README.syslog-ng-anon +++ syslog-ng-2.0.6/doc/reference/README.syslog-ng-anon @@ -0,0 +1,88 @@ +syslog-ng-anon + + This patch adds the capability to syslog-ng that allows you to strip + out any given regexp or all IP addresses from log messages before + they are written to disk. The goal is to give the system administrator + the means to implement site logging policies, by allowing them easy + control over exactly what data they retain in their logfiles, + regardless of what a particular daemon might think is best. + +Background: + + Data retention has become a hot legal topic for ISPs and other Online + Service Providers (OSPs). There are many instances where it is preferable + to keep less information on users than is collected by default on many + systems. In the United States it is not currently required to retain + data on users of a server, but you may be required to provide all data + on a user which you have retained. OSPs can protect themselves from legal + hassles and added work by choosing what data they wish to retain. + + From "Best Practices for Online Service Providers" + (http://www.eff.org/osp): + + As an intermediary, the OSP [Online Service Provider] finds itself in + a position to collect and store detailed information about its users + and their online activities that may be of great interest to third + parties. The USA PATRIOT Act also provides the government with + expanded powers to request this information. As a result, OSP owners + must deal with requests from law enforcement and lawyers to hand over + private user information and logs. Yet, compliance with these demands + takes away from an OSP's goal of providing users with reliable, + secure network services. In this paper, EFF offers some suggestions, + both legal and technical, for best practices that balance the needs + of OSPs and their users' privacy and civil liberties. + + Rather than scrubbing the information you don't want in logs, this patch + ensures that the information is never written to disk. Also, for those + daemons which log through syslog facilities, this patch provides a + convenient single configuration to limit what you wish to log. + + Here are some related links: + + Best Practices for Online Service Providers + http://www.eff.org/osp + http://www.eff.org/osp/20040819_OSPBestPractices.pdf + + EPIC International Data Retention Page + http://www.epic.org/privacy/intl/data_retention.html + + Working Paper on Usage Log Data Management (from Computer, Freedom, and + Privacy conference) http://cryptome.org/usage-logs.htm + + +Installing syslog-ng-anon + + Applying the patch + + This patch has been tested against the following versions of syslog-ng: + . Debian package syslog-ng_2.0.5-2 + + To use this patch, obtain the source for syslog-ng + (apt-get source syslog-ng) and the + syslog-ng-anon patch (http://dev.riseup.net/patches/syslog-ng/). + Apply the patch the patch: + + % cd syslog-ng-2.0.5 + % patch -p1 < ../syslog-ng-anon.diff + + Then compile and install syslog-ng: + + % dpkg-buildpackage -rfakeroot -b + % dpkg -i ../syslog-ng_2.0.5-2_i386.deb + + How to use it + + This patch adds the filter "strip". For example: + + filter f_strip {strip();}; + + This will strip out all matches of the regular expression on logs to + which the filter is applied and replaces all matches with the fixed length + four dashes ("----"). + + In place of a regular expression, you can put "ips", which will replace all + internet addresses with 0.0.0.0. For example: + + filter f_strip {strip(ips);}; + + You can alter what the replacement strings are by using replace: --- syslog-ng-2.0.6.orig/doc/Makefile.am +++ syslog-ng-2.0.6/doc/Makefile.am @@ -6,6 +6,8 @@ reference/syslog-ng.xml \ reference/syslog-ng.txt \ reference/syslog-ng.xsl \ + reference/README.syslog-ng-anon \ + examples/syslog-ng-anon.conf \ examples/syslog-ng.conf.sample \ examples/syslog-ng.conf.solaris --- syslog-ng-2.0.6.orig/doc/Makefile.in +++ syslog-ng-2.0.6/doc/Makefile.in @@ -135,6 +135,8 @@ reference/syslog-ng.xml \ reference/syslog-ng.txt \ reference/syslog-ng.xsl \ + reference/README/syslog-ng-anon \ + examples/syslog-ng-anon.conf \ examples/syslog-ng.conf.sample \ examples/syslog-ng.conf.solaris --- syslog-ng-2.0.6.orig/debian/syslog-ng.logcheck.violations.ignore +++ syslog-ng-2.0.6/debian/syslog-ng.logcheck.violations.ignore @@ -0,0 +1 @@ +^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ syslog-ng\[[[:digit:]]{1,5}\]: Log statistics;( (processed='(source|destination|center)\([-_[:alnum:]]+\)=[[:digit:]]+'|dropped='pipe\([-/_[:alnum:]]+\)=[[:digit:]]+'|dropped='(ud|tc)p\(AF_INET\([.[:digit:]]{7,15}:[[:digit:]]{1,5}\)\)=[[:digit:]]+'),)+[^,]*$ --- syslog-ng-2.0.6.orig/debian/syslog-ng.default +++ syslog-ng-2.0.6/debian/syslog-ng.default @@ -4,6 +4,6 @@ # syslog-ng's init script will set them using dmesg. # log level of messages which should go to console -# see klogctl(8) or for details +# see for details # #CONSOLE_LOG_LEVEL=1 --- syslog-ng-2.0.6.orig/debian/syslog-ng.postinst +++ syslog-ng-2.0.6/debian/syslog-ng.postinst @@ -34,9 +34,9 @@ fi if [ -x "/etc/init.d/syslog-ng" ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d syslog-ng $COMMAND || exit 0 + invoke-rc.d syslog-ng $COMMAND ||true else - /etc/init.d/syslog-ng $COMMAND || exit 0 + /etc/init.d/syslog-ng $COMMAND ||true fi fi fi --- syslog-ng-2.0.6.orig/debian/control +++ syslog-ng-2.0.6/debian/control @@ -2,12 +2,12 @@ Section: admin Priority: extra Maintainer: SZALAY Attila -Build-depends: debhelper (>=3.0.0), libevtlog-dev, libnet1-dev, libglib2.0-dev (>= 2.2), pkg-config -Standards-Version: 3.6.1 +Build-depends: debhelper (>=5), libevtlog-dev, pkg-config, libglib2.0-dev, flex, bison +Standards-Version: 3.7.2 Package: syslog-ng Architecture: any -Depends: ${shlibs:Depends}, util-linux (>= 2.12-10) +Depends: ${shlibs:Depends}, lsb-base (>= 3.0-6) Recommends: logrotate Provides: system-log-daemon, linux-kernel-log-daemon Conflicts: system-log-daemon, linux-kernel-log-daemon --- syslog-ng-2.0.6.orig/debian/rules +++ syslog-ng-2.0.6/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DH_COMPAT=3 +#export DH_COMPAT=5 DDEBUG=`if (echo $(DEB_BUILD_OPTIONS) | grep -q debug) then \ echo "--enable-debug"; \ @@ -26,8 +26,6 @@ $(MAKE) -# (cd doc/sgml; $(MAKE) syslog-ng.html.tar.gz) - touch build-stamp clean: dh_testdir @@ -36,9 +34,8 @@ # Add here commands to clean up after the build process. -$(MAKE) distclean -# rm -f doc/sgml/syslog-ng.dvi doc/sgml/syslog-ng.html.tar.gz doc/sgml/syslog-ng.ps -# rm -rf doc/sgml/syslog-ng.html doc/sgml/syslog-ng.txt -# rm -rf src/cfg-grammar.c + -rm -f tests/functional/test.conf tests/functional/test-output.log + -rm -f config.log dh_clean @@ -49,21 +46,15 @@ dh_installdirs # Add here commands to install the package into debian/tmp. - $(MAKE) install DESTDIR=`pwd`/debian/tmp - - dh_movefiles + $(MAKE) install DESTDIR=`pwd`/debian/syslog-ng -# install -d -m 755 debian/syslog-ng/etc/default -# install -m 644 debian/syslog-ng.default debian/syslog-ng/etc/default/syslog-ng -# install -d -m 700 debian/syslog-ng/etc/syslog-ng -# install -m 644 debian/syslog-ng.conf debian/syslog-ng/etc/syslog-ng - -# install -d -m 700 debian/syslog-ng/etc/logcheck/ignore.d.paranoid -# install -m 644 debian/syslog-ng.logcheck.ignore debian/syslog-ng/etc/logcheck/ignore.d.paranoid/syslog-ng -# install -d -m 700 debian/syslog-ng/etc/logcheck/ignore.d.server -# install -m 644 debian/syslog-ng.logcheck.ignore debian/syslog-ng/etc/logcheck/ignore.d.server/syslog-ng -# install -d -m 700 debian/syslog-ng/etc/logcheck/ignore.d.workstation -# install -m 644 debian/syslog-ng.logcheck.ignore debian/syslog-ng/etc/logcheck/ignore.d.workstation/syslog-ng + install -d -m 755 debian/syslog-ng/etc/default + install -m 644 debian/syslog-ng.default debian/syslog-ng/etc/default/syslog-ng + install -d -m 700 debian/syslog-ng/etc/syslog-ng + install -m 644 debian/syslog-ng.conf debian/syslog-ng/etc/syslog-ng + install -d -m 700 debian/syslog-ng/usr/share/doc/syslog-ng/html + install -m 644 NEWS debian/syslog-ng/usr/share/doc/syslog-ng + (cd debian/syslog-ng/usr/share/doc/syslog-ng/html; tar -xzvf ../../../../../../../doc/reference/syslog-ng.html.tar.gz; mv syslog-ng.html/* .; rmdir syslog-ng.html) # Build architecture-independent files here. binary-indep: build install @@ -71,35 +62,20 @@ # Build architecture-dependent files here. binary-arch: build install -# dh_testversion dh_testdir dh_testroot dh_installdocs -# rm debian/syslog-ng/usr/share/doc/syslog-ng/sgml/Makefile* -# (cd debian/syslog-ng/usr/share/doc/syslog-ng/sgml; mv syslog-ng.html ../html; ls) -# rm debian/syslog-ng/usr/share/doc/syslog-ng/sgml/syslog-ng.html.tar.gz -# (cd debian/syslog-ng/usr/share/doc/syslog-ng/sgml; mv syslog-ng.* ..) -# rm -rf debian/syslog-ng/usr/share/doc/syslog-ng/sgml -# rm -f debian/syslog-ng/usr/share/doc/syslog-ng/INSTALL -# rm -f debian/syslog-ng/usr/share/doc/syslog-ng/syslog-ng.conf.demo -# rm -f debian/syslog-ng/usr/share/doc/syslog-ng/syslog-ng.conf.sample -# rm -f debian/syslog-ng/usr/share/doc/syslog-ng/syslog-ng.conf.solaris + rm -f debian/syslog-ng/usr/share/doc/syslog-ng/INSTALL dh_installexamples -# dh_installmenu -# dh_installemacsen - dh_installinit -r --no-start -- defaults 10 90 + dh_installinit --no-start -- defaults 10 90 dh_installcron dh_installlogrotate + dh_installlogcheck # dh_installmanpages -# dh_undocumented dh_installchangelogs ChangeLog -# dh_link dh_strip dh_compress dh_fixperms - # You may want to make some executables suid here -# dh_suidregister -# dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol --- syslog-ng-2.0.6.orig/debian/syslog-ng.logcheck.ignore.paranoid +++ syslog-ng-2.0.6/debian/syslog-ng.logcheck.ignore.paranoid @@ -0,0 +1,2 @@ +^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ syslog-ng\[[[:digit:]]{1,5}\]: Log statistics;( (processed='(source|destination|center)\([-_[:alnum:]]+\)=[[:digit:]]+'|dropped='pipe\([-/_[:alnum:]]+\)=[[:digit:]]+'|dropped='(ud|tc)p\(AF_INET\([.[:digit:]]{7,15}:[[:digit:]]{1,5}\)\)=[[:digit:]]+'),)+[^,]*$ +^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ syslog-ng\[[[:digit:]]{1,5}\]: STATS: dropped 0$ --- syslog-ng-2.0.6.orig/debian/syslog-ng.prerm +++ syslog-ng-2.0.6/debian/syslog-ng.prerm @@ -0,0 +1,17 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + if [ -x "/etc/init.d/syslog-ng" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d syslog-ng stop ||true + else + /etc/init.d/syslog-ng stop ||true + fi + fi +fi + +#DEBHELPER# + +exit 0 --- syslog-ng-2.0.6.orig/debian/watch +++ syslog-ng-2.0.6/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://www.balabit.hu/downloads/files/syslog-ng/sources/2.0/src/syslog-ng-(.*).tar.gz --- syslog-ng-2.0.6.orig/debian/syslog-ng.conf +++ syslog-ng-2.0.6/debian/syslog-ng.conf @@ -63,6 +63,16 @@ # example -- syslogd accepts only 1024 bytes # (default is 2048) #log_msg_size(2048); + + #Disable statistic log messages. + stats_freq(0); + + # Some program send log messages through a private implementation. + # and sometimes that implementation is bad. If this happen syslog-ng + # may recognise the program name as hostname. Whit this option + # we tell the syslog-ng that if a hostname match this regexp than that + # is not a real hostname. + bad_hostname("^gconfd$"); }; --- syslog-ng-2.0.6.orig/debian/changelog +++ syslog-ng-2.0.6/debian/changelog @@ -1,9 +1,715 @@ -syslog-ng (2.0.6) syslogng20; urgency=low +syslog-ng (2.0.6-2~bpo40+1) etch-backports; urgency=high + + * Backport testing version for backports.org + * Urgency high due to CVE-2007-6437 + + -- Micah Anderson Mon, 31 Dec 2007 14:09:11 -0500 + +syslog-ng (2.0.6-1) unstable; urgency=high + + * New upstream version. + * This release addresses the following security issue: + - A remote attacker can cause a denial of service (crash) + via a crafted log message that is missing a whitespace + at the end of the timestamp (CVE-2007-6437; Closes: #457334) + + -- SZALAY Attila Sat, 22 Dec 2007 15:54:58 +0100 + +syslog-ng (2.0.5-3) unstable; urgency=low + + * Added watchfile. + * Added anonymizer patch created by Micah Anderson. (Closes: #449569) + + -- SZALAY Attila Thu, 08 Nov 2007 00:16:38 +0100 + +syslog-ng (2.0.5-2) unstable; urgency=low + + * Changed init information printing method to lsb. (applied the patch from + Michael Biebl ) (Closes: #419165) + * When removing syslog-ng stop it in prerm. (Closes: #436521) + * Added a new option into the default config to circumvent a logging bug + in gconfd. (Closes: #409620) + + -- SZALAY Attila Sun, 21 Oct 2007 22:42:09 +0200 + +syslog-ng (2.0.5-1) unstable; urgency=low + + * New upstream version. + + -- SZALAY Attila Fri, 14 Sep 2007 23:46:07 +0200 + +syslog-ng (2.0.0-1) unstable; urgency=low + + * New upstream version. I hope it's really fix it. (Closes: #384021) + * Remove util-linux dependecy. This dependency won't needed because + util-linux is essential. (Closes: #398640) + + -- SZALAY Attila Fri, 17 Nov 2006 09:37:45 +0100 + +syslog-ng (2.0rc3-3) unstable; urgency=low + + * This is a try-only version. + * Removed versioned dependency to util-linux. + + -- SZALAY Attila Tue, 14 Nov 2006 22:02:07 +0100 + +syslog-ng (2.0rc3-2) unstable; urgency=medium + + * Fixed NULL dereference when (Closes: #384021) + + -- SZALAY Attila Wed, 25 Oct 2006 22:06:48 +0200 + +syslog-ng (2.0rc3-1) unstable; urgency=low + + * New upstream version. + * Print a message in reload function. (Closes: #384174) + + -- SZALAY Attila Wed, 20 Sep 2006 22:07:27 +0200 + +syslog-ng (2.0rc1-2) unstable; urgency=low + + * Added upstream fix about filters in powerpc. (Closes: #380207) + * Added upstream fix to prevent DOS with zero size UDP packets. + * Created and modified logcheck rules by artin f. krafft added (Closes: #380628) + + -- SZALAY Attila Wed, 2 Aug 2006 16:38:26 +0200 + +syslog-ng (2.0rc1-1) unstable; urgency=low + + * New upstream version. + - Bazsi swear that this release really fix facility and priority + problems. (Closes: #350120, #350344, #374056) + - Do not reconnect to target immediately but wait for time_reopen first. + (Closes: #352695) + - dir_gid was not initialized because of a typo, thus dir_group() did + not take effect, fixed. (Closes: #351095) + * Added logcheck rules created by martin f krafft with two one exception (Closes: #369489, #376750, #355213) + - I do not remove Log statistics line from logcheck.ignore.paranoid. + + -- SZALAY Attila Tue, 18 Jul 2006 23:37:28 +0000 + +syslog-ng (1.9.11-1.1) unstable; urgency=low + + * Non-maintainer upload + * Update license file (Closes: #375236) + * Updated Standard Version to 3.7.2 + * Fix invoke-rc.d call to remove lintian warnings + + -- Pierre Chifflier Mon, 10 Jul 2006 21:51:03 +0200 + +syslog-ng (1.9.11-1) unstable; urgency=low + + * New upstream version + - Fixed log facility and priority detecting. (Closes: #350120, #350344, #357071, #367256) + * Added bison to Build-Dependency. (Closes: #368765) + + -- SZALAY Attila Thu, 25 May 2006 11:21:50 +0200 + +syslog-ng (1.9.9-2) unstable; urgency=low + + * Switch to the latest snapshot version, with some un-released + upstream bug-fixes. (Closes: #352362) + * Fixed misspelled KERNEL_RINGBUF_SIZE. Again. (Closes: #324813) + * Stop syslog-ng when removing. (Closes: #356002) + * Added some new logckeck lines. (Closes: #357692) + * Disable statistic messages in default config file. (Closes: #355833) + + -- SZALAY Attila Thu, 30 Mar 2006 18:25:11 +0200 + +syslog-ng (1.9.9-1) unstable; urgency=low + + * New upstream version. + - Added missing macro definitions. (Closes: #349571) + - Fixed Source reference counting. (Closes: #351312) + + -- SZALAY Attila Tue, 28 Feb 2006 22:34:33 +0100 + +syslog-ng (1.9.8.1+20060128-1) unstable; urgency=low + + * New upstream version. (Closes: #349697, #349840, #350014) + * Added html documentatuin again. (Closes: #344028) + * Added NEWS file to the package. (Closes: #349912) + + -- SZALAY Attila Sat, 28 Jan 2006 17:51:38 +0100 + +syslog-ng (1.9.8.1) unstable; urgency=low + + * Added flex to Build-depends. + + -- SZALAY Attila Mon, 23 Jan 2006 19:50:19 +0000 + +syslog-ng (1.9.8) unstable; urgency=low + + * New upstream version + * First not experimental version. + * Added pkg-confg and libglib2.0-0 dependencies. (Closes: #344795) + * Fixed config file place back to /etc/syslog-ng/ (Closes: #336981) + + -- SZALAY Attila Sat, 21 Jan 2006 16:33:19 +0000 + +syslog-ng (1.9.6) experimental; urgency=low + + * New upstream version. + * Upstream version changed a lot so 3rd party patches dropped out. + + -- SZALAY Attila Tue, 20 Sep 2005 19:49:18 +0000 + +syslog-ng (1.6.8-1) unstable; urgency=low + + * New upstream version. + * Debian patch cleaned up. If something needed dropped out please tell me! + * Create /dev/xconsole if not exists. (Closes: #312690) + * Check the config file for syntax errors before reload. (Closes: #294888) + * Fixed a typo in syslog-ng.conf (Closes: #312114) + * Created a directory. Put debian specific patches into it. + * Added the new version of syslog-ng-annon patch. (Closes: #303808) + + -- SZALAY Attila Thu, 9 Jun 2005 20:10:54 +0000 + +syslog-ng (1.6.7-2) unstable; urgency=high + + * Added syslog-ng-anon IP anonymizing patch, see + /usr/share/doc/README.syslog-ng-anon for more information (Closes: #303808) + * Restart syslog-ng manually and start it only if installed and not upgraded. (Closes: #297190) + Set urgency to high because of this. + * In int change start-stop-damon call parameter from --exec to --name to + enable restart syslog-ng after upgrade. + + -- SZALAY Attila Tue, 24 May 2005 11:43:11 +0200 + +syslog-ng (1.6.7-1) unstable; urgency=low + + * New upstream version. (Closes: #301617, #304894, #304966, #282782) + * Check if CONSOLE_LOG_LEVEL and KERNEL_RINGBUF_SIZE has value and not + complain about wrong value, if not. (Closes: #296315, #304215) + * Removed unneeded code from postrm. (This code was to remove divertion, + but syslog-ng does not divert any file any more.) + * Removed KERNEL_RINGBUF_SIZE option. (Closes: #298022) + * Added AC_PREREQ(2.50) to configure.in. (Closes: #299543) + + -- SZALAY Attila Sun, 22 May 2005 01:13:49 +0200 + +syslog-ng (1.6.5-2.2) unstable; urgency=low + + * Fixed missing space in versioned-depends on util-linux + * Fixed improper UTF-8 conversion of debian/changelog, thanks + cjwatson@debian.org + + -- Micah Anderson Tue, 10 May 2005 14:49:20 -0500 + +syslog-ng (1.6.5-2.1) unstable; urgency=high + + * Non-maintainer upload to fix security hole for sarge + * Added upstream patch to fix log messages getting dropped which allowed + certain forms of attacks to be performed without getting logged. + (Closes: #304894) + * Changed debian/control to use a versioned depends on util-linux + to fix lintian error + * Converted debian/changelog to be valid UTF-8 by to fix lintian + error + * Updated documentation: doc/syslog-ng.conf.5, doc/syslog-ng.8 to fix + outdated information and typos and language clarification on klogd + in doc/sgml/syslog-ng.sgml + + -- Micah Anderson Mon, 9 May 2005 23:41:48 -0500 + +syslog-ng (1.6.5-2) unstable; urgency=low + + * Checks if UDP ends in NL or NUL. Closes: #282782 + * Merged in _second_ version of Loic's syslog-ng.conf. Closes: #268686 + * Made kernel logging parameters configureable through /etc/defaults/syslog-ng. Closes: #283091 + + -- Magosányi Árpád (mag) Sat, 11 Dec 2004 22:16:43 +0100 + +syslog-ng (1.6.5-1) unstable; urgency=low + + * New upstream version + + -- Magosányi Árpád (mag) Tue, 2 Nov 2004 01:53:53 +0100 + +syslog-ng (1.6.4-2) unstable; urgency=low + + * Added patch from Loic Minier to make init script more sane. Closes: #268820 + * Added PATH to init script. Closes: #262224 + * Only one instance of html documentation. Patch from Loic Minier. Closes: #268685 + * Stops only once in prerm. Closes: #268848 + * New syslog-ng.conf. Closes: #268686 + * Added Nate Campi's FAQ. Closes: #268998 + + -- Magosányi Árpád (mag) Mon, 13 Sep 2004 17:19:50 +0200 + +syslog-ng (1.6.4-1) unstable; urgency=low + + * New upstream version + + -- Magosányi Árpád (mag) Sat, 24 Jul 2004 17:45:51 +0200 + +syslog-ng (1.6.2-4) unstable; urgency=low + + * fixed permissions of default syslog-ng.conf. Closes: #242531 + * added Nate Campi's expanded syslog-ng.conf to docs. Closes: #241783 + * fixed cut-and-paste errors in manpage of syslog-ng.conf. Closes: #260845 + + -- Magosányi Árpád (mag) Sat, 12 Jun 2004 23:27:45 +0200 + +syslog-ng (1.6.2-3) unstable; urgency=low + + * changed manpage to better reflect -v. Closes: #228377 + * fixed build-depends, hopefully correctly now:( Closes: #237668 + + -- Magosányi Árpád (mag) Sat, 13 Mar 2004 18:35:37 +0100 + +syslog-ng (1.6.2-2) unstable; urgency=low + + * Automake build-dependency added. Closes: #237668 + + -- Magosányi Árpád (mag) Fri, 12 Mar 2004 21:44:56 +0100 + +syslog-ng (1.6.2-1) unstable; urgency=low + + * New upstream version: + * added PRI macro + * fixed a problem in PIX log parsing, + * have a FAQ. documented STATS (#192054) + * (1.6.0rc4-4) Now you can tell that destination file permissions shall not changed. closes: #65456 + * (1.6.0rc4-2) removed logrotate configuration for ppp.log. Closes: #207411 + * (1.6.0rc4-2) corrected documentation of match in syslog-ng.conf(5) . Closes: #206819 + + -- Magosányi Árpád (mag) Fri, 12 Mar 2004 15:04:15 +0100 + +syslog-ng (1.6.0rc4-4) unstable; urgency=low + + * Now you can tell that destination file permissions shall not changed. closes: 65456 + * rolled back changes related to gnu arch (gnu arch is a good idea, but + the changes were not.) + * Regenerating non-source documentation. + + -- Magosányi Árpád (mag) Thu, 11 Dec 2003 23:05:11 +0100 + +syslog-ng (1.6.0rc4-3) unstable; urgency=low + + * debian/rules changes to utilize gnu arch (tla) + + -- Magosányi Árpád (mag) Wed, 15 Oct 2003 17:05:20 +0200 + +syslog-ng (1.6.0rc4-2) unstable; urgency=low + + * documentation patch with faq. Closes: #192054 + * removed logrotate configuration for ppp.log. Closes: #207411 + * corrected documentation of match in syslog-ng.conf(5) . Closes: #206819 + * added documentation to faq about log ownership. closes: #65456 + + -- Magosányi Árpád (mag) Tue, 14 Oct 2003 16:30:01 +0200 + +syslog-ng (1.6.0rc4-1) unstable; urgency=low + + * New upstream version + * New libol version + * removed duplicate restart in postinst. Closes: #204631 + * added Mag as co-maintainer + * incremented Standards-Version to 3.6.1 + * language fix in postinst, thanks to Marcus Crafter . + Closes: #171792 + * cut reference to future features. Closes: #215197 + + -- Magosányi Árpád (mag) Tue, 14 Oct 2003 13:30:34 +0200 + +syslog-ng (1.6.0rc1+20030310-2) unstable; urgency=low + + * Forward port bugfix. Log every new log. + * Remove unwanted 'x' char from conffile. Closes: #184985 + + -- Szalay Attila Sun, 16 Mar 2003 11:02:16 +0000 + +syslog-ng (1.6.0rc1+20030310-1) unstable; urgency=low + + * New upstream version. Closes: #184026. + * Set gconfd as bad hostname. Closes: #107189. + * Fix a typo in postinst srcipt (becouse->because). Closes: #170499. + + -- Szalay Attila Tue, 11 Mar 2003 05:42:29 +0000 + +syslog-ng (1.5.23-1) unstable; urgency=low + + * New upstream version. + * Change file ownership in /var/log/news dir to news.news. Closes: #169621 + + -- SZALAY Attila Thu, 21 Nov 2002 00:08:56 +0100 + +syslog-ng (1.5.22-1) unstable; urgency=low + + * New upstream version. + * Close buffer overflow bug. See changelog for 1.5.21-1. Closes: #164487 + * Wait a second to flushing buffers, but after that syslog-ng exit. + Closes: #164504, #164703 + + -- SZALAY Attila Wed, 16 Oct 2002 22:55:51 +0200 + +syslog-ng (1.5.21-2) unstable; urgency=low + + * Rewrite debian/syslog-ng.conffiles. That file disappear somewhere + between woody and sid. Closes: #165030 + + -- SZALAY Attila Wed, 16 Oct 2002 17:22:13 +0200 + +syslog-ng (1.5.21-1) unstable; urgency=low + + * New upstream version. + * security fix, decrement 'left' counter when appending a constant character Close: #164487 + * implemented a workaround for Linux 2.2 and 2.4 (unix domain sockets and recvfrom) + * Change --with-debug to --enable debug, reflect to upstream changes. + + -- SZALAY Attila Sun, 13 Oct 2002 19:00:00 +0200 + +syslog-ng (1.5.20-1) unstable; urgency=low + + * New upstream version. + * Upstream fix mixing message bug. Closes: #147161 + + -- SZALAY Attila Sun, 8 Sep 2002 08:56:56 +0200 + +syslog-ng (1.5.19-3) unstable; urgency=low + + * Change to --compare-versions. Close: #156112, #156136 + * Include example written by from Jörg Sommer . + Close: #156114 + * Change the if statement from `timeout <= 0' to `timeout > 0' and + therefore log STATS message only if timeout > 0. Close: #156045 + * Becouse I'm change main.c touch main.c.x to not break compile. + + -- SZALAY Attila Sun, 11 Aug 2002 17:15:43 +0200 + +syslog-ng (1.5.19-2) unstable; urgency=low + + * Include ignore files for logcheck. + * Move examples files to right directory. + + -- SZALAY Attila Thu, 8 Aug 2002 15:28:04 +0200 + +syslog-ng (1.5.19-1) unstable; urgency=low + + * New upstream version. + * Doesn't touch main.c, so scsh doesn't needed. Close: #150118 + * Change to unix-stream, becouse programs like it more. :) + + -- SZALAY Attila Sat, 3 Aug 2002 21:06:54 +0200 + +syslog-ng (1.5.18-1) unstable; urgency=low + + * New upstream version. + * Remove dependency of automake becouse upstream author upgrade to woody. :) + * Read /proc/kmsg directly again. It's eliminate all the problem around klogd. + * Upgrade Standards-Version to 3.5.6.0 + + -- SZALAY Attila Thu, 6 Jun 2002 08:34:02 +0200 + +syslog-ng (1.5.15-1.1) unstable; urgency=high + + * Non-maintainer upload + * Modified init script to optionally restart klogd. This is + the 'wrong' fix for #129819, but better than doing nothing + at all with woody release approaching. + + -- Stephen Frost Sun, 28 Apr 2002 05:14:42 -0400 + +syslog-ng (1.5.15-1) unstable; urgency=high + + * New upstream version. + * Doesn't drop connections to the floor on reload. Closes: #129819, #132708 + + -- SZALAY Attila Mon, 4 Mar 2002 21:29:11 +0100 + +syslog-ng (1.5.13-2) unstable; urgency=low + + * Now 0 or less frequency for STAT will disable it. Closes: #122482 + * Bugfix. When reload STAT timer set the value before reload not the new. + + -- SZALAY Attila Tue, 25 Dec 2001 01:56:38 +0100 + +syslog-ng (1.5.13-1) unstable; urgency=low + + * New upstream version. + + -- SZALAY Attila Sun, 4 Nov 2001 08:41:15 +0100 + +syslog-ng (1.5.9-2) unstable; urgency=low + + * Oooopss. Now really remove /proc/kmsg from src. Closes: #111176 + + -- SZALAY Attila Wed, 5 Sep 2001 09:43:41 +0200 + +syslog-ng (1.5.9-1) unstable; urgency=low + + * New upstream version. Now log if a message cannnot write to a destination + (for example if network is broken or HDD is too slow) + * Change priority to extra. Closes: #110116 + * Remove klogctl from ditribution, becouse unneeded. (see dmesg) Closes: #101997 + * Now syslog-ng work together with klogd. (Change /dev/log from stream-oriented + connection to datagram-oriented.) (It was done earlyer, but becouse I + doesn't have time I can't test it) Closes: #94383 + * Becouse of the above I must remove reading /proc/kmsg. And becouse of this + syslog-ng now recommend klogd. (again) + * And again becouse af the above, I can't revert the changes about /dev/log. + Closes: #108111 + * Becouse now klogd read /proc/kmsg this bug not bug any more. :) Closes: #90166 + * This is honeymoon release. :) + + -- SZALAY Attila Sun, 2 Sep 2001 16:22:19 +0200 + +syslog-ng (1.5.8-2) unstable; urgency=low + + * Include libtool in Build-depend. Closes: #105872 + + -- SZALAY Attila Thu, 19 Jul 2001 16:15:50 +0200 + +syslog-ng (1.5.8-1) unstable; urgency=low + + * New upstream version. Now record wich connection is broken, and + record when connection is reestablished. Closes: #92588 + * Put debhelper into build-depend. Closes: #104302 + * syslog-ng just recommend logrotate. Closes: #92129 + * Use autoconf/automaker for building. Closes: #99126 + + -- SZALAY Attila Fri, 13 Jul 2001 12:58:14 +0200 + +syslog-ng (1.5.6-1) unstable; urgency=low + + * New upstream version. Applied the patch, therfore Closes: #94898 + + -- SZALAY Attila Fri, 4 May 2001 23:11:07 +0200 + +syslog-ng (1.5.5a-1) unstable; urgency=low + + * New upstream version. + Hopefully fixed -HUP problem. Closes: #65455 + * Put flex, autoconf and m4 into build-depend. Closes: #91875 + * In logrotate files put { into the log file names line. Closes: #95614 + * Apply the cosmeting init script patch. Closes: #92094 + + -- SZALAY Attila Thu, 3 May 2001 11:37:52 +0200 + +syslog-ng (1.5.4-3) unstable; urgency=low + + * Now really remove doc/syslog-ng/INSTALL.gz (I hope) + * Now uucp filter filtering messages from uucp. Closes: #90610 + + -- SZALAY Attila Wed, 21 Mar 2001 23:04:57 +0100 + +syslog-ng (1.5.4-2) unstable; urgency=low + + * Change '==' to '=' in postinst. Closes: #87863 + * I forgot to link it to sysklogd. Now it's done Closes: #75643 + * Remove doc/syslog-ng/INSTALL.gz. Closes: #88281 + * Disable logrotate script when removed. Closes: #77314 + * Full upload, becouse I made a mistake with .orig.tgz + + -- SZALAY Attila Thu, 15 Mar 2001 22:37:25 +0100 + +syslog-ng (1.5.4-1) unstable; urgency=low + + * New upstream version. + * Now syslog-ng read /proc/kmsg and therefore it not need klog any more. + (Of course we loose Ooops decoding :(( + Closes: #86074, #80793, #85118, #78316, #78620 + + -- SZALAY Attila Tue, 20 Feb 2001 22:02:40 +0100 + +syslog-ng (1.4.10-1) unstable; urgency=low + + * New upstream version. + * Change Recommend line from kernel-log-daemon to linux-kernel-log-daemon + + -- SZALAY Attila Tue, 5 Dec 2000 09:21:39 +0100 + +syslog-ng (1.4.9a-1) unstable; urgency=low + + * New upstream version. (Solve a DoS attack.) + + -- SZALAY Attila Sun, 26 Nov 2000 16:12:14 +0100 + +syslog-ng (1.4.8-1) unstable; urgency=low + + * New upstream version + * Clean some bugreport. + * syslog-ng no longer contain klogd. Closes: #70784 + * It's a network problem, not syslog-ng. Closes: #60747 + * This bug solved upstream somewhere between 1.4.5 and 1.4.8. Closes: #74594 + * syslog-ng no longer renames /etc/init.d/sysklogd to + /etc/init.d/sysklogd.syslog-ng. Closes: #74864 + + -- SZALAY Attila Wed, 8 Nov 2000 15:11:45 +0100 + +syslog-ng (1.4.7-2) unstable; urgency=low + + * Change depend line to Recommend. But now syslog-ng Conflicts with sysklogd. + It's a bit bad, beacause I loose klogd, for a while. Closes: #74513 + + -- SZALAY Attila Sat, 21 Oct 2000 12:29:05 +0200 + +syslog-ng (1.4.7-1) unstable; urgency=low + + * New upstream version. (It's solve memory leak!) + * Provide virtual package: system-log-daemon. Closes: #67603 + * Replace chars under chr(32) with spaces. Closes: #69026 + * syslog-ng now Conflicts with other system-log-daemons: Closes: #72122, #72195, #72483 + * Old, closed bugs: Closes: #55275, #58415 + * Put some notifempy and missingok to logrotate file. Closes: #72308 + * I Depend on kernel-log daemon now becouse installing it before sysklogd + split is dangerous + + -- SZALAY Attila Sun, 8 Oct 2000 17:34:17 +0200 + +syslog-ng (1.4.5-1) unstable; urgency=low + + * New upstream version. Closes: #67752 + + -- SZALAY Attila Thu, 10 Aug 2000 18:01:39 +0200 + +syslog-ng (1.4.4-1) unstable; urgency=low + + * New upstream version. + * Change logfile-s ownership to root.adm + * Restart syslog-ng in postinst. Closes: #64692 + * log local2.* to /var/log/ppp.log Closes: #63741 + + -- SZALAY Attila Sat, 10 Jun 2000 11:06:01 +0200 + +syslog-ng (1.4.3-1) unstable; urgency=low + + * New upstream version. + * Test the existence of conffiles. Closes: #62229 + + -- SZALAY Attila Sat, 10 Jun 2000 10:44:50 +0200 + +syslog-ng (1.4.0rc3-2) frozen unstable; urgency=low + + * Fix a typo in syslog-ng.conf Closes: #59361 + + -- SZALAY Attila Mon, 6 Mar 2000 09:51:04 +0100 + +syslog-ng (1.4.0rc3-1) frozen unstable; urgency=high + + * New upstream version + * This version is from the new stable branch, hopefully + without bug. :)) + * It's should compile in Alpha. Closes: #5575, #53728 + + -- SZALAY Attila Sun, 27 Feb 2000 23:09:22 +0100 + +syslog-ng (1.3.17-1) unstable; urgency=low + + * New upstream version. + + -- SZALAY Attila Sat, 19 Feb 2000 12:39:04 +0100 + +syslog-ng (1.3.14-1) unstable; urgency=low + + * New upstream version. Now it run with 2.3.X kernels. + + -- SZALAY Attila Tue, 8 Feb 2000 13:18:33 +0100 + +syslog-ng (1.3.13-1) frozen; urgency=low + + * New upstream version, with bugfix (notable in sun port), + and documentation upgrades. + + -- SZALAY Attila Tue, 18 Jan 2000 23:15:49 +0100 + +syslog-ng (1.3.12-2) unstable; urgency=low + + * move dpkg-divert to postinst, preventing deadlock. Closes: #54608 + * But it's not protect sysklogd to go to unconfigurable state + when upgrade (update-rc fails becouse the divert) + (may it's a bug in update-rc, or it must handle in postinst?) + (and therfore its bug in debhelper? :)) + + -- SZALAY Attila Tue, 11 Jan 2000 12:02:14 +0100 + +syslog-ng (1.3.12-1) unstable; urgency=low + + * New upstream version. + * Look for diversions, and if doesn't exists, make it! + (Even when upgrade). Closes: #53731 + * Write warning about remote logging into README.Debian, and + to console, when install syslog-ng, and in sysklogd remote + logging was enabled. Closes: #53170 + + -- SZALAY Attila Thu, 6 Jan 2000 12:51:24 +0100 + +syslog-ng (1.3.10-3) unstable; urgency=low + + * Write a warning message about remote logging + * Make the first steps to write comments into conf file. + + -- SZALAY Attila Wed, 22 Dec 1999 01:44:10 +0100 + +syslog-ng (1.3.10-2) unstable; urgency=high + + * Remove a buggy line from syslog-ng.conf, what is inhibit + syslog-ng to start. Closes: #53162 + + -- SZALAY Attila Mon, 20 Dec 1999 20:41:40 +0100 + +syslog-ng (1.3.10-1) unstable; urgency=low + + * New upstream version, with fixing a bug in pipe handling. + * Now syslog-ng usable with Debian default compatible + /etc/syslog-ng/syslog-ng.conf. Closes: #52638 + + -- SZALAY Attila Sun, 19 Dec 1999 10:56:42 +0100 + +syslog-ng (1.3.9-1) unstable; urgency=low + + * New upstream version. + + -- SZALAY Attila Fri, 17 Dec 1999 22:38:46 +0100 + +syslog-ng (1.3.8-1) unstable; urgency=low * New upstream version. - -- BalaBit Development Team Tue, 27 Nov 2007 10:47:15 +0100 + -- SZALAY Attila Wed, 15 Dec 1999 22:49:44 +0100 + +syslog-ng (1.3.7-2) unstable; urgency=low + + * Rewrite /etc/syslog-ng/syslog-ng.conf to be really compatible + with Debian default. + * Remove v from tar -xzvf in debian/rules + + -- SZALAY Attila Mon, 13 Dec 1999 20:58:44 +0100 + +syslog-ng (1.3.7-1) unstable; urgency=low + + * New upstream version. + * Restart sysklogd when remove syslog-ng. + * replace --prefix with DESTDIR Closes: #52573 + * Change to rfakeroot from rsudo. + + -- SZALAY Attila Sun, 12 Dec 1999 23:54:34 +0100 + +syslog-ng (1.3.6-2) unstable; urgency=low + + * Fix some bug. + + -- SZALAY Attila Thu, 9 Dec 1999 00:57:47 +0100 + +syslog-ng (1.3.6-1) unstable; urgency=low + + * New upstream version. + * Changed to development branch + * Change to logrotate + + -- SZALAY Attila Wed, 8 Dec 1999 00:23:46 +0100 + +syslog-ng (1.2.3-1) unstable; urgency=low + + * New upstream version. + + -- SZALAY Attila Tue, 7 Dec 1999 16:30:38 +0100 + +syslog-ng (1.2.2-1) unstable; urgency=low + + * Initial Release. + + -- SZALAY Attila Thu, 2 Dec 1999 01:38:28 +0200 -Local variables: -mode: debian-changelog -End: --- syslog-ng-2.0.6.orig/debian/compat +++ syslog-ng-2.0.6/debian/compat @@ -0,0 +1 @@ +5 --- syslog-ng-2.0.6.orig/debian/syslog-ng.logcheck.ignore.server +++ syslog-ng-2.0.6/debian/syslog-ng.logcheck.ignore.server @@ -0,0 +1,5 @@ +^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ syslog-ng\[[[:digit:]]{1,5}\]: new configuration initialized$ +^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ syslog-ng\[[[:digit:]]{1,5}\]: SIGHUP received, reloading configuration;$ +^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ syslog-ng\[[[:digit:]]{1,5}\]: Duplicate stats counter; (counter='[^']+'(, )?)$ +^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ syslog-ng\[[[:digit:]]{1,5}\]: Changing permissions on special file /dev/xconsole$ +^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ syslog-ng\[[[:digit:]]{1,5}\]: Cannot open file /dev/xconsole for writing \(No such file or directory\)$ --- syslog-ng-2.0.6.orig/debian/copyright +++ syslog-ng-2.0.6/debian/copyright @@ -2,8 +2,22 @@ on Fri, 28 May 1999 15:47:28 +0200. The original source can always be found at: - http://www.balabit.hu/downloads/syslog-ng/source + http://www.balabit.com/downloads/syslog-ng/ Copyright (C) 1999 BalaBit Computing -FIXMEE \ No newline at end of file +License: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + + +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL'. --- syslog-ng-2.0.6.orig/debian/syslog-ng.docs +++ syslog-ng-2.0.6/debian/syslog-ng.docs @@ -0,0 +1 @@ +doc/reference/README.syslog-ng-anon --- syslog-ng-2.0.6.orig/debian/syslog-ng.init +++ syslog-ng-2.0.6/debian/syslog-ng.init @@ -1,4 +1,14 @@ #! /bin/sh +### BEGIN INIT INFO +# Provides: syslog +# Required-Start: $local_fs $network $time +# Required-Stop: $local_fs $network $time +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Starting system logging daemon +# Description: Starting syslog-NG, the next generation +# syslog daemon. +### END INIT INFO# # # skeleton example file to build /etc/init.d/ scripts. # This file should be used to construct scripts for /etc/init.d. @@ -8,7 +18,6 @@ # by Ian Murdock . # # Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl -# # This file was customized by SZALAY Attila PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -16,6 +25,10 @@ #we source /etc/default/syslog-ng if exists [ -r /etc/default/syslog-ng ] && . /etc/default/syslog-ng +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + case "x$CONSOLE_LOG_LEVEL" in x[1-8]) dmesg -n $CONSOLE_LOG_LEVEL @@ -23,13 +36,13 @@ x) ;; *) - echo "CONSOLE_LOG_LEVEL is of unaccepted value." + log_warning_msg "CONSOLE_LOG_LEVEL is of unaccepted value." ;; esac -if [ -n "$KERNEL_RIGNBUF_SIZE" ] +if [ -n "$KERNEL_RINGBUF_SIZE" ] then - echo "KERNEL_RINGBUF_SIZE option is useless and therefore removed." + log_warning_msg "KERNEL_RINGBUF_SIZE option is useless and therefore removed." fi # stop syslog-ng before changing its PID file! @@ -46,28 +59,35 @@ } syslogng_start() { - echo -n "Starting system logging: $NAME" - start-stop-daemon --start --quiet --exec "$SYSLOGNG" --pidfile "$PIDFILE" -- -p "$PIDFILE" \ - || { echo " start failed."; return 1; } - echo "." - return 0 + log_daemon_msg "Starting system logging" "$NAME" + start-stop-daemon --start --quiet --exec "$SYSLOGNG" \ + --pidfile "$PIDFILE" -- -p "$PIDFILE" + RET="$?" + log_end_msg $RET + return $RET } syslogng_stop() { - echo -n "Stopping system logging: $NAME" - start-stop-daemon --stop --quiet --name "$NAME" --retry 3 --pidfile "$PIDFILE" || { echo " not running."; return 1; } - echo "." + log_daemon_msg "Stopping system logging" "$NAME" + start-stop-daemon --stop --quiet --name "$NAME" --retry 3 \ + --pidfile "$PIDFILE" + RET="$?" + log_end_msg $RET rm -f "$PIDFILE" - return 0 + return $RET } syslogng_reload() { + log_daemon_msg "Reload system logging" "$NAME" if /sbin/syslog-ng -s then - start-stop-daemon --stop --signal 1 --quiet --exec "$SYSLOGNG" --pidfile "$PIDFILE" || return 1 - return 0 + start-stop-daemon --stop --signal 1 --quiet --exec "$SYSLOGNG" \ + --pidfile "$PIDFILE" + RET="$?" + log_end_msg $RET + return $RET else - echo "Cannot load /etc/syslog-ng/syslog-ng.conf" + log_end_msg 1 return 1 fi } --- syslog-ng-2.0.6.orig/src/cfg-grammar.c +++ syslog-ng-2.0.6/src/cfg-grammar.c @@ -158,24 +158,26 @@ KW_HOST = 347, KW_MATCH = 348, KW_NETMASK = 349, - KW_YES = 350, - KW_NO = 351, - KW_REQUIRED = 352, - KW_ALLOW = 353, - KW_DENY = 354, - KW_GC_IDLE_THRESHOLD = 355, - KW_GC_BUSY_THRESHOLD = 356, - KW_COMPRESS = 357, - KW_MAC = 358, - KW_AUTH = 359, - KW_ENCRYPT = 360, - DOTDOT = 361, - IDENTIFIER = 362, - NUMBER = 363, - STRING = 364, - KW_OR = 365, - KW_AND = 366, - KW_NOT = 367 + KW_STRIP = 350, + KW_REPLACE = 351, + KW_YES = 352, + KW_NO = 353, + KW_REQUIRED = 354, + KW_ALLOW = 355, + KW_DENY = 356, + KW_GC_IDLE_THRESHOLD = 357, + KW_GC_BUSY_THRESHOLD = 358, + KW_COMPRESS = 359, + KW_MAC = 360, + KW_AUTH = 361, + KW_ENCRYPT = 362, + DOTDOT = 363, + IDENTIFIER = 364, + NUMBER = 365, + STRING = 366, + KW_OR = 367, + KW_AND = 368, + KW_NOT = 369 }; #endif /* Tokens. */ @@ -271,30 +273,32 @@ #define KW_HOST 347 #define KW_MATCH 348 #define KW_NETMASK 349 -#define KW_YES 350 -#define KW_NO 351 -#define KW_REQUIRED 352 -#define KW_ALLOW 353 -#define KW_DENY 354 -#define KW_GC_IDLE_THRESHOLD 355 -#define KW_GC_BUSY_THRESHOLD 356 -#define KW_COMPRESS 357 -#define KW_MAC 358 -#define KW_AUTH 359 -#define KW_ENCRYPT 360 -#define DOTDOT 361 -#define IDENTIFIER 362 -#define NUMBER 363 -#define STRING 364 -#define KW_OR 365 -#define KW_AND 366 -#define KW_NOT 367 +#define KW_STRIP 350 +#define KW_REPLACE 351 +#define KW_YES 352 +#define KW_NO 353 +#define KW_REQUIRED 354 +#define KW_ALLOW 355 +#define KW_DENY 356 +#define KW_GC_IDLE_THRESHOLD 357 +#define KW_GC_BUSY_THRESHOLD 358 +#define KW_COMPRESS 359 +#define KW_MAC 360 +#define KW_AUTH 361 +#define KW_ENCRYPT 362 +#define DOTDOT 363 +#define IDENTIFIER 364 +#define NUMBER 365 +#define STRING 366 +#define KW_OR 367 +#define KW_AND 368 +#define KW_NOT 369 /* Copy the first part of user declarations. */ -#line 1 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 1 "cfg-grammar.y" #include "syslog-ng.h" @@ -363,7 +367,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 49 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 49 "cfg-grammar.y" { guint num; char *cptr; @@ -371,7 +375,7 @@ FilterExprNode *node; } /* Line 187 of yacc.c. */ -#line 375 "cfg-grammar.c" +#line 379 "cfg-grammar.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -384,7 +388,7 @@ /* Line 216 of yacc.c. */ -#line 388 "cfg-grammar.c" +#line 392 "cfg-grammar.c" #ifdef short # undef short @@ -599,20 +603,20 @@ /* YYFINAL -- State number of the termination state. */ #define YYFINAL 24 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 762 +#define YYLAST 768 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 118 +#define YYNTOKENS 120 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 110 /* YYNRULES -- Number of rules. */ -#define YYNRULES 278 +#define YYNRULES 280 /* YYNRULES -- Number of states. */ -#define YYNSTATES 721 +#define YYNSTATES 730 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 367 +#define YYMAXUTOK 369 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -624,15 +628,15 @@ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 116, 117, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 113, + 118, 119, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 115, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 114, 2, 115, 2, 2, 2, 2, + 2, 2, 2, 116, 2, 117, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -656,7 +660,7 @@ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 109, 110, 111, 112 + 105, 106, 107, 108, 109, 110, 111, 112, 113, 114 }; #if YYDEBUG @@ -690,114 +694,116 @@ 814, 819, 824, 829, 834, 839, 844, 849, 854, 859, 864, 869, 874, 879, 884, 889, 894, 899, 904, 909, 915, 917, 920, 924, 928, 932, 937, 942, 947, 952, - 957, 962, 967, 972, 975, 977, 979, 982, 984, 988, - 990, 992, 994, 996, 998, 1000, 1002, 1004, 1006 + 957, 962, 967, 973, 978, 983, 986, 988, 990, 993, + 995, 999, 1001, 1003, 1005, 1007, 1009, 1011, 1013, 1015, + 1017 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 119, 0, -1, 120, -1, 121, 113, 120, -1, -1, - 3, 122, -1, 4, 123, -1, 5, 124, -1, 7, - 217, -1, 71, 126, -1, 6, 125, -1, 226, 114, - 132, 115, -1, 226, 114, 170, 115, -1, 114, 210, - 212, 115, -1, 114, 215, 115, -1, -1, 226, 127, - 114, 128, 115, -1, 129, 113, 128, -1, -1, 71, - 116, 226, 117, -1, 72, 116, 224, 117, -1, 85, - 116, 108, 117, -1, 86, 116, 108, 117, -1, 83, - 116, 224, 117, -1, 87, 116, 224, 117, -1, 130, - -1, 82, 116, 108, 117, -1, 84, 116, 108, 117, - -1, 133, 113, 132, -1, -1, 134, -1, 135, -1, - 141, -1, 162, -1, 8, 116, 117, -1, 9, 116, - 136, 117, -1, 10, 116, 138, 117, -1, -1, 226, - 137, 167, -1, -1, 226, 139, 140, -1, 63, 116, - 224, 117, -1, 167, -1, 12, 116, 146, 117, -1, - 11, 116, 148, 117, -1, -1, 14, 142, 116, 152, - 117, -1, -1, 13, 143, 116, 157, 117, -1, -1, - 16, 144, 116, 152, 117, -1, -1, 15, 145, 116, - 157, 117, -1, -1, 226, 147, 150, -1, -1, 226, - 149, 150, -1, 151, 150, -1, -1, 65, 116, 227, - 117, -1, 66, 116, 227, 117, -1, 67, 116, 108, - 117, -1, 63, 116, 224, 117, -1, 161, -1, 168, - -1, 130, -1, -1, 153, 154, -1, 155, 154, -1, - -1, 156, -1, 79, 116, 227, 117, -1, 80, 116, - 227, 117, -1, 77, 116, 226, 117, -1, 78, 116, - 226, 117, -1, 168, -1, 131, -1, -1, 158, 159, - -1, 160, 159, -1, -1, 156, -1, 79, 116, 227, - 117, -1, 80, 116, 227, 117, -1, 161, -1, 75, - 116, 224, 117, -1, 76, 116, 108, 117, -1, 19, - 116, 163, 117, -1, -1, 226, 164, 165, -1, 166, - 165, -1, -1, 18, 116, 226, 117, -1, 168, 167, - -1, -1, 50, 116, 169, 117, -1, 26, 116, 108, - 117, -1, 48, 116, 108, 117, -1, 47, 116, 108, - 117, -1, 49, 116, 226, 117, -1, 55, 116, 108, - 117, -1, 73, 116, 108, 117, -1, 56, 116, 226, - 117, -1, 34, 116, 224, 117, -1, 107, 169, -1, - -1, 171, 113, 170, -1, -1, 172, -1, 177, -1, - 182, -1, 202, -1, 203, -1, 9, 116, 173, 117, - -1, -1, 226, 174, 175, -1, 176, 175, -1, -1, - 207, -1, 63, 116, 224, 117, -1, 65, 116, 227, - 117, -1, 66, 116, 227, 117, -1, 67, 116, 108, - 117, -1, 68, 116, 227, 117, -1, 69, 116, 227, - 117, -1, 70, 116, 108, 117, -1, 64, 116, 224, - 117, -1, 74, 116, 108, 117, -1, 10, 116, 178, - 117, -1, -1, 226, 179, 180, -1, 181, 180, -1, - -1, 207, -1, 65, 116, 227, 117, -1, 66, 116, - 227, 117, -1, 67, 116, 108, 117, -1, 12, 116, - 187, 117, -1, 11, 116, 189, 117, -1, -1, 14, - 183, 116, 193, 117, -1, -1, 13, 184, 116, 198, - 117, -1, -1, 16, 185, 116, 193, 117, -1, -1, - 15, 186, 116, 198, 117, -1, -1, 226, 188, 191, - -1, -1, 226, 190, 191, -1, 191, 192, -1, -1, - 207, -1, 130, -1, -1, 226, 194, 195, -1, 195, - 197, -1, -1, 77, 116, 226, 117, -1, 131, -1, - 207, -1, 196, -1, 79, 116, 227, 117, -1, 80, - 116, 227, 117, -1, 81, 116, 227, 117, -1, 88, - 116, 224, 117, -1, -1, 226, 199, 200, -1, 200, - 201, -1, -1, 196, -1, 79, 116, 227, 117, -1, - 80, 116, 227, 117, -1, 81, 116, 227, 117, -1, - 17, 116, 226, 117, -1, 20, 116, 204, 117, -1, - -1, 226, 205, 206, -1, 207, 206, -1, -1, 50, - 116, 208, 117, -1, 46, 116, 108, 117, -1, 24, - 116, 108, 117, -1, 25, 116, 108, 117, -1, 71, - 116, 226, 117, -1, 72, 116, 224, 117, -1, 21, - 116, 224, 117, -1, 56, 116, 226, 117, -1, 44, - 116, 226, 117, -1, 45, 116, 108, 117, -1, 209, - 208, -1, -1, 62, -1, 211, 113, 210, -1, -1, - 3, 116, 226, 117, -1, 7, 116, 226, 117, -1, - 4, 116, 226, 117, -1, 50, 116, 213, 117, 113, - -1, -1, 214, 213, -1, -1, 51, -1, 52, -1, - 53, -1, 54, -1, 216, 113, 215, -1, -1, 22, - 116, 108, 117, -1, 23, 116, 108, 117, -1, 24, - 116, 108, 117, -1, 25, 116, 108, 117, -1, 29, - 116, 224, 117, -1, 30, 116, 224, 117, -1, 31, - 116, 224, 117, -1, 32, 116, 224, 117, -1, 33, - 116, 109, 117, -1, 89, 116, 224, 117, -1, 36, - 116, 224, 117, -1, 35, 116, 225, 117, -1, 59, - 116, 108, 117, -1, 60, 116, 108, 117, -1, 61, - 116, 108, 117, -1, 46, 116, 108, 117, -1, 48, - 116, 108, 117, -1, 47, 116, 108, 117, -1, 26, - 116, 108, 117, -1, 34, 116, 224, 117, -1, 44, - 116, 226, 117, -1, 45, 116, 108, 117, -1, 101, - 116, 108, 117, -1, 100, 116, 108, 117, -1, 64, - 116, 224, 117, -1, 65, 116, 227, 117, -1, 66, - 116, 227, 117, -1, 67, 116, 108, 117, -1, 68, - 116, 227, 117, -1, 69, 116, 227, 117, -1, 70, - 116, 108, 117, -1, 37, 116, 224, 117, -1, 38, - 116, 108, 117, -1, 39, 116, 108, 117, -1, 40, - 116, 108, 117, -1, 41, 116, 226, 117, -1, 27, - 116, 226, 117, -1, 28, 116, 226, 117, -1, 57, - 116, 226, 117, -1, 58, 116, 226, 117, -1, 226, - 114, 218, 113, 115, -1, 219, -1, 112, 218, -1, - 218, 110, 218, -1, 218, 111, 218, -1, 116, 218, - 117, -1, 90, 116, 220, 117, -1, 90, 116, 108, - 117, -1, 91, 116, 222, 117, -1, 20, 116, 226, - 117, -1, 92, 116, 226, 117, -1, 93, 116, 226, - 117, -1, 7, 116, 226, 117, -1, 94, 116, 226, - 117, -1, 221, 220, -1, 221, -1, 107, -1, 223, - 222, -1, 223, -1, 107, 106, 107, -1, 107, -1, - 95, -1, 96, -1, 108, -1, 224, -1, 42, -1, - 107, -1, 109, -1, 226, -1, 108, -1 + 121, 0, -1, 122, -1, 123, 115, 122, -1, -1, + 3, 124, -1, 4, 125, -1, 5, 126, -1, 7, + 219, -1, 71, 128, -1, 6, 127, -1, 228, 116, + 134, 117, -1, 228, 116, 172, 117, -1, 116, 212, + 214, 117, -1, 116, 217, 117, -1, -1, 228, 129, + 116, 130, 117, -1, 131, 115, 130, -1, -1, 71, + 118, 228, 119, -1, 72, 118, 226, 119, -1, 85, + 118, 110, 119, -1, 86, 118, 110, 119, -1, 83, + 118, 226, 119, -1, 87, 118, 226, 119, -1, 132, + -1, 82, 118, 110, 119, -1, 84, 118, 110, 119, + -1, 135, 115, 134, -1, -1, 136, -1, 137, -1, + 143, -1, 164, -1, 8, 118, 119, -1, 9, 118, + 138, 119, -1, 10, 118, 140, 119, -1, -1, 228, + 139, 169, -1, -1, 228, 141, 142, -1, 63, 118, + 226, 119, -1, 169, -1, 12, 118, 148, 119, -1, + 11, 118, 150, 119, -1, -1, 14, 144, 118, 154, + 119, -1, -1, 13, 145, 118, 159, 119, -1, -1, + 16, 146, 118, 154, 119, -1, -1, 15, 147, 118, + 159, 119, -1, -1, 228, 149, 152, -1, -1, 228, + 151, 152, -1, 153, 152, -1, -1, 65, 118, 229, + 119, -1, 66, 118, 229, 119, -1, 67, 118, 110, + 119, -1, 63, 118, 226, 119, -1, 163, -1, 170, + -1, 132, -1, -1, 155, 156, -1, 157, 156, -1, + -1, 158, -1, 79, 118, 229, 119, -1, 80, 118, + 229, 119, -1, 77, 118, 228, 119, -1, 78, 118, + 228, 119, -1, 170, -1, 133, -1, -1, 160, 161, + -1, 162, 161, -1, -1, 158, -1, 79, 118, 229, + 119, -1, 80, 118, 229, 119, -1, 163, -1, 75, + 118, 226, 119, -1, 76, 118, 110, 119, -1, 19, + 118, 165, 119, -1, -1, 228, 166, 167, -1, 168, + 167, -1, -1, 18, 118, 228, 119, -1, 170, 169, + -1, -1, 50, 118, 171, 119, -1, 26, 118, 110, + 119, -1, 48, 118, 110, 119, -1, 47, 118, 110, + 119, -1, 49, 118, 228, 119, -1, 55, 118, 110, + 119, -1, 73, 118, 110, 119, -1, 56, 118, 228, + 119, -1, 34, 118, 226, 119, -1, 109, 171, -1, + -1, 173, 115, 172, -1, -1, 174, -1, 179, -1, + 184, -1, 204, -1, 205, -1, 9, 118, 175, 119, + -1, -1, 228, 176, 177, -1, 178, 177, -1, -1, + 209, -1, 63, 118, 226, 119, -1, 65, 118, 229, + 119, -1, 66, 118, 229, 119, -1, 67, 118, 110, + 119, -1, 68, 118, 229, 119, -1, 69, 118, 229, + 119, -1, 70, 118, 110, 119, -1, 64, 118, 226, + 119, -1, 74, 118, 110, 119, -1, 10, 118, 180, + 119, -1, -1, 228, 181, 182, -1, 183, 182, -1, + -1, 209, -1, 65, 118, 229, 119, -1, 66, 118, + 229, 119, -1, 67, 118, 110, 119, -1, 12, 118, + 189, 119, -1, 11, 118, 191, 119, -1, -1, 14, + 185, 118, 195, 119, -1, -1, 13, 186, 118, 200, + 119, -1, -1, 16, 187, 118, 195, 119, -1, -1, + 15, 188, 118, 200, 119, -1, -1, 228, 190, 193, + -1, -1, 228, 192, 193, -1, 193, 194, -1, -1, + 209, -1, 132, -1, -1, 228, 196, 197, -1, 197, + 199, -1, -1, 77, 118, 228, 119, -1, 133, -1, + 209, -1, 198, -1, 79, 118, 229, 119, -1, 80, + 118, 229, 119, -1, 81, 118, 229, 119, -1, 88, + 118, 226, 119, -1, -1, 228, 201, 202, -1, 202, + 203, -1, -1, 198, -1, 79, 118, 229, 119, -1, + 80, 118, 229, 119, -1, 81, 118, 229, 119, -1, + 17, 118, 228, 119, -1, 20, 118, 206, 119, -1, + -1, 228, 207, 208, -1, 209, 208, -1, -1, 50, + 118, 210, 119, -1, 46, 118, 110, 119, -1, 24, + 118, 110, 119, -1, 25, 118, 110, 119, -1, 71, + 118, 228, 119, -1, 72, 118, 226, 119, -1, 21, + 118, 226, 119, -1, 56, 118, 228, 119, -1, 44, + 118, 228, 119, -1, 45, 118, 110, 119, -1, 211, + 210, -1, -1, 62, -1, 213, 115, 212, -1, -1, + 3, 118, 228, 119, -1, 7, 118, 228, 119, -1, + 4, 118, 228, 119, -1, 50, 118, 215, 119, 115, + -1, -1, 216, 215, -1, -1, 51, -1, 52, -1, + 53, -1, 54, -1, 218, 115, 217, -1, -1, 22, + 118, 110, 119, -1, 23, 118, 110, 119, -1, 24, + 118, 110, 119, -1, 25, 118, 110, 119, -1, 29, + 118, 226, 119, -1, 30, 118, 226, 119, -1, 31, + 118, 226, 119, -1, 32, 118, 226, 119, -1, 33, + 118, 111, 119, -1, 89, 118, 226, 119, -1, 36, + 118, 226, 119, -1, 35, 118, 227, 119, -1, 59, + 118, 110, 119, -1, 60, 118, 110, 119, -1, 61, + 118, 110, 119, -1, 46, 118, 110, 119, -1, 48, + 118, 110, 119, -1, 47, 118, 110, 119, -1, 26, + 118, 110, 119, -1, 34, 118, 226, 119, -1, 44, + 118, 228, 119, -1, 45, 118, 110, 119, -1, 103, + 118, 110, 119, -1, 102, 118, 110, 119, -1, 64, + 118, 226, 119, -1, 65, 118, 229, 119, -1, 66, + 118, 229, 119, -1, 67, 118, 110, 119, -1, 68, + 118, 229, 119, -1, 69, 118, 229, 119, -1, 70, + 118, 110, 119, -1, 37, 118, 226, 119, -1, 38, + 118, 110, 119, -1, 39, 118, 110, 119, -1, 40, + 118, 110, 119, -1, 41, 118, 228, 119, -1, 27, + 118, 228, 119, -1, 28, 118, 228, 119, -1, 57, + 118, 228, 119, -1, 58, 118, 228, 119, -1, 228, + 116, 220, 115, 117, -1, 221, -1, 114, 220, -1, + 220, 112, 220, -1, 220, 113, 220, -1, 118, 220, + 119, -1, 90, 118, 222, 119, -1, 90, 118, 110, + 119, -1, 91, 118, 224, 119, -1, 20, 118, 228, + 119, -1, 92, 118, 228, 119, -1, 93, 118, 228, + 119, -1, 95, 118, 228, 119, -1, 96, 118, 228, + 228, 119, -1, 7, 118, 228, 119, -1, 94, 118, + 228, 119, -1, 223, 222, -1, 223, -1, 109, -1, + 225, 224, -1, 225, -1, 109, 108, 109, -1, 109, + -1, 97, -1, 98, -1, 110, -1, 226, -1, 42, + -1, 109, -1, 111, -1, 228, -1, 110, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -829,8 +835,9 @@ 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 779, 780, 781, 782, 783, 787, 791, 792, 793, 794, 795, 799, 800, 801, 802, 803, - 804, 805, 806, 810, 811, 815, 832, 833, 837, 857, - 874, 875, 876, 880, 881, 885, 886, 890, 891 + 804, 805, 806, 807, 808, 812, 813, 817, 834, 835, + 839, 859, 876, 877, 878, 882, 883, 887, 888, 892, + 893 }; #endif @@ -862,16 +869,16 @@ "KW_LOCALPORT", "KW_PORT", "KW_DESTPORT", "KW_IP_TTL", "KW_SO_BROADCAST", "KW_IP_TOS", "KW_SO_SNDBUF", "KW_SO_RCVBUF", "KW_SO_KEEPALIVE", "KW_SPOOF_SOURCE", "KW_USE_TIME_RECVD", "KW_FACILITY", "KW_LEVEL", - "KW_HOST", "KW_MATCH", "KW_NETMASK", "KW_YES", "KW_NO", "KW_REQUIRED", - "KW_ALLOW", "KW_DENY", "KW_GC_IDLE_THRESHOLD", "KW_GC_BUSY_THRESHOLD", - "KW_COMPRESS", "KW_MAC", "KW_AUTH", "KW_ENCRYPT", "DOTDOT", "IDENTIFIER", - "NUMBER", "STRING", "KW_OR", "KW_AND", "KW_NOT", "';'", "'{'", "'}'", - "'('", "')'", "$accept", "start", "stmts", "stmt", "source_stmt", - "dest_stmt", "log_stmt", "options_stmt", "template_stmt", "@1", - "template_items", "template_item", "socket_option", "inet_socket_option", - "source_items", "source_item", "source_afinter", "source_affile", - "source_affile_params", "@2", "source_afpipe_params", "@3", - "source_afpipe_options", "source_afsocket", "@4", "@5", "@6", "@7", + "KW_HOST", "KW_MATCH", "KW_NETMASK", "KW_STRIP", "KW_REPLACE", "KW_YES", + "KW_NO", "KW_REQUIRED", "KW_ALLOW", "KW_DENY", "KW_GC_IDLE_THRESHOLD", + "KW_GC_BUSY_THRESHOLD", "KW_COMPRESS", "KW_MAC", "KW_AUTH", "KW_ENCRYPT", + "DOTDOT", "IDENTIFIER", "NUMBER", "STRING", "KW_OR", "KW_AND", "KW_NOT", + "';'", "'{'", "'}'", "'('", "')'", "$accept", "start", "stmts", "stmt", + "source_stmt", "dest_stmt", "log_stmt", "options_stmt", "template_stmt", + "@1", "template_items", "template_item", "socket_option", + "inet_socket_option", "source_items", "source_item", "source_afinter", + "source_affile", "source_affile_params", "@2", "source_afpipe_params", + "@3", "source_afpipe_options", "source_afsocket", "@4", "@5", "@6", "@7", "source_afunix_dgram_params", "@8", "source_afunix_stream_params", "@9", "source_afunix_options", "source_afunix_option", "source_afinet_udp_params", "@10", "source_afinet_udp_options", @@ -916,41 +923,42 @@ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, - 365, 366, 367, 59, 123, 125, 40, 41 + 365, 366, 367, 368, 369, 59, 123, 125, 40, 41 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 118, 119, 120, 120, 121, 121, 121, 121, 121, - 121, 122, 123, 124, 125, 127, 126, 128, 128, 129, - 129, 130, 130, 130, 130, 131, 131, 131, 132, 132, - 133, 133, 133, 133, 134, 135, 135, 137, 136, 139, - 138, 140, 140, 141, 141, 142, 141, 143, 141, 144, - 141, 145, 141, 147, 146, 149, 148, 150, 150, 151, - 151, 151, 151, 151, 151, 151, 153, 152, 154, 154, - 155, 155, 155, 156, 156, 156, 156, 158, 157, 159, - 159, 160, 160, 160, 160, 161, 161, 162, 164, 163, - 165, 165, 166, 167, 167, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 169, 169, 170, 170, 171, 171, - 171, 171, 171, 172, 174, 173, 175, 175, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 177, 179, - 178, 180, 180, 181, 181, 181, 181, 182, 182, 183, - 182, 184, 182, 185, 182, 186, 182, 188, 187, 190, - 189, 191, 191, 192, 192, 194, 193, 195, 195, 196, - 196, 196, 197, 197, 197, 197, 197, 199, 198, 200, - 200, 201, 201, 201, 201, 202, 203, 205, 204, 206, - 206, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 208, 208, 209, 210, 210, 211, 211, 211, 212, - 212, 213, 213, 214, 214, 214, 214, 215, 215, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 217, - 218, 218, 218, 218, 218, 219, 219, 219, 219, 219, - 219, 219, 219, 220, 220, 221, 222, 222, 223, 223, - 224, 224, 224, 225, 225, 226, 226, 227, 227 + 0, 120, 121, 122, 122, 123, 123, 123, 123, 123, + 123, 124, 125, 126, 127, 129, 128, 130, 130, 131, + 131, 132, 132, 132, 132, 133, 133, 133, 134, 134, + 135, 135, 135, 135, 136, 137, 137, 139, 138, 141, + 140, 142, 142, 143, 143, 144, 143, 145, 143, 146, + 143, 147, 143, 149, 148, 151, 150, 152, 152, 153, + 153, 153, 153, 153, 153, 153, 155, 154, 156, 156, + 157, 157, 157, 158, 158, 158, 158, 160, 159, 161, + 161, 162, 162, 162, 162, 163, 163, 164, 166, 165, + 167, 167, 168, 169, 169, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 171, 171, 172, 172, 173, 173, + 173, 173, 173, 174, 176, 175, 177, 177, 178, 178, + 178, 178, 178, 178, 178, 178, 178, 178, 179, 181, + 180, 182, 182, 183, 183, 183, 183, 184, 184, 185, + 184, 186, 184, 187, 184, 188, 184, 190, 189, 192, + 191, 193, 193, 194, 194, 196, 195, 197, 197, 198, + 198, 198, 199, 199, 199, 199, 199, 201, 200, 202, + 202, 203, 203, 203, 203, 204, 205, 207, 206, 208, + 208, 209, 209, 209, 209, 209, 209, 209, 209, 209, + 209, 210, 210, 211, 212, 212, 213, 213, 213, 214, + 214, 215, 215, 216, 216, 216, 216, 217, 217, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 219, + 220, 220, 220, 220, 220, 221, 221, 221, 221, 221, + 221, 221, 221, 221, 221, 222, 222, 223, 224, 224, + 225, 225, 226, 226, 226, 227, 227, 228, 228, 229, + 229 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -982,8 +990,9 @@ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 1, 2, 3, 3, 3, 4, 4, 4, 4, 4, - 4, 4, 4, 2, 1, 1, 2, 1, 3, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1 + 4, 4, 5, 4, 4, 2, 1, 1, 2, 1, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -992,7 +1001,7 @@ static const yytype_uint16 yydefact[] = { 4, 0, 0, 0, 0, 0, 0, 0, 2, 0, - 275, 276, 5, 0, 6, 0, 195, 7, 208, 10, + 277, 278, 5, 0, 6, 0, 195, 7, 208, 10, 8, 0, 9, 15, 1, 4, 29, 107, 0, 0, 0, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1007,175 +1016,175 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 208, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 250, - 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 11, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 12, 107, 0, 0, 0, 202, 13, - 194, 0, 0, 0, 0, 0, 0, 0, 270, 271, - 272, 0, 0, 0, 0, 0, 0, 274, 273, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 278, 277, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 207, 0, - 0, 0, 0, 0, 0, 0, 251, 0, 0, 0, - 0, 0, 0, 0, 0, 34, 0, 37, 0, 39, - 0, 55, 0, 53, 77, 66, 77, 66, 0, 88, - 28, 0, 114, 0, 129, 0, 149, 0, 147, 0, - 0, 0, 0, 0, 0, 177, 106, 196, 198, 197, - 203, 204, 205, 206, 0, 202, 209, 210, 211, 212, - 227, 245, 246, 213, 214, 215, 216, 217, 228, 220, - 219, 240, 241, 242, 243, 244, 229, 230, 224, 226, - 225, 247, 248, 221, 222, 223, 233, 234, 235, 236, - 237, 238, 239, 218, 232, 231, 0, 0, 265, 0, - 0, 264, 269, 0, 267, 0, 0, 0, 254, 252, - 253, 249, 0, 0, 16, 18, 35, 94, 36, 94, - 44, 58, 43, 58, 0, 80, 0, 69, 0, 0, - 87, 91, 113, 117, 128, 132, 138, 152, 137, 152, - 0, 167, 0, 155, 0, 0, 175, 176, 180, 0, - 201, 261, 258, 256, 255, 263, 0, 257, 266, 259, - 260, 262, 0, 0, 17, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 38, 94, 0, 40, 42, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, - 56, 58, 63, 64, 54, 48, 0, 0, 0, 0, - 0, 0, 25, 76, 81, 78, 80, 84, 75, 46, - 0, 0, 67, 69, 70, 52, 50, 0, 89, 91, + 0, 250, 18, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 11, 29, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 12, 107, 0, 0, 0, + 202, 13, 194, 0, 0, 0, 0, 0, 0, 0, + 272, 273, 274, 0, 0, 0, 0, 0, 0, 276, + 275, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 280, + 279, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 207, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 251, 0, 0, 0, 0, 0, 0, 0, 0, 34, + 0, 37, 0, 39, 0, 55, 0, 53, 77, 66, + 77, 66, 0, 88, 28, 0, 114, 0, 129, 0, + 149, 0, 147, 0, 0, 0, 0, 0, 0, 177, + 106, 196, 198, 197, 203, 204, 205, 206, 0, 202, + 209, 210, 211, 212, 227, 245, 246, 213, 214, 215, + 216, 217, 228, 220, 219, 240, 241, 242, 243, 244, + 229, 230, 224, 226, 225, 247, 248, 221, 222, 223, + 233, 234, 235, 236, 237, 238, 239, 218, 232, 231, + 0, 0, 267, 0, 0, 266, 271, 0, 269, 0, + 0, 0, 0, 0, 254, 252, 253, 249, 0, 0, + 16, 18, 35, 94, 36, 94, 44, 58, 43, 58, + 0, 80, 0, 69, 0, 0, 87, 91, 113, 117, + 128, 132, 138, 152, 137, 152, 0, 167, 0, 155, + 0, 0, 175, 176, 180, 0, 201, 263, 258, 256, + 255, 265, 0, 257, 268, 259, 260, 264, 261, 0, + 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 38, 94, 0, 40, 42, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 65, 56, 58, + 63, 64, 54, 48, 0, 0, 0, 0, 0, 0, + 25, 76, 81, 78, 80, 84, 75, 46, 0, 0, + 67, 69, 70, 52, 50, 0, 89, 91, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 115, - 117, 118, 0, 0, 0, 130, 132, 133, 150, 148, - 142, 170, 140, 158, 146, 144, 178, 180, 199, 268, - 19, 20, 0, 0, 0, 0, 0, 105, 0, 0, - 0, 93, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 57, 0, 0, 0, 0, 0, 0, - 79, 0, 0, 68, 0, 90, 0, 0, 0, 0, - 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 116, 0, 0, 0, 131, - 154, 151, 153, 168, 156, 179, 0, 0, 0, 0, - 0, 105, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 115, 117, 118, + 0, 0, 0, 130, 132, 133, 150, 148, 142, 170, + 140, 158, 146, 144, 178, 180, 199, 270, 262, 19, + 20, 0, 0, 0, 0, 0, 105, 0, 0, 0, + 93, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 57, 0, 0, 0, 0, 0, 0, 79, + 0, 0, 68, 0, 90, 0, 0, 0, 0, 0, + 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 116, 0, 0, 0, 131, 154, + 151, 153, 168, 156, 179, 0, 0, 0, 0, 0, + 105, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 193, 0, 192, 0, 0, 0, 0, 0, + 0, 193, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 160, 171, 169, 161, 0, 0, - 0, 0, 162, 157, 96, 103, 98, 97, 99, 104, - 95, 100, 102, 101, 41, 62, 59, 60, 61, 85, - 86, 23, 21, 22, 24, 73, 74, 82, 83, 26, - 27, 71, 72, 92, 187, 183, 184, 189, 190, 182, - 181, 191, 188, 119, 126, 120, 121, 122, 123, 124, - 125, 185, 186, 127, 134, 135, 136, 0, 0, 0, + 0, 0, 0, 160, 171, 169, 161, 0, 0, 0, + 0, 162, 157, 96, 103, 98, 97, 99, 104, 95, + 100, 102, 101, 41, 62, 59, 60, 61, 85, 86, + 23, 21, 22, 24, 73, 74, 82, 83, 26, 27, + 71, 72, 92, 187, 183, 184, 189, 190, 182, 181, + 191, 188, 119, 126, 120, 121, 122, 123, 124, 125, + 185, 186, 127, 134, 135, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 159, 172, 173, 174, 163, 164, 165, - 166 + 0, 0, 159, 172, 173, 174, 163, 164, 165, 166 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 7, 8, 9, 12, 14, 17, 19, 22, 76, - 263, 264, 452, 453, 88, 89, 90, 91, 266, 367, - 268, 369, 427, 92, 177, 176, 179, 178, 272, 373, - 270, 371, 440, 441, 376, 377, 462, 463, 454, 374, - 375, 455, 456, 442, 93, 278, 381, 468, 469, 424, - 458, 582, 104, 105, 106, 281, 383, 489, 490, 107, - 283, 385, 495, 496, 108, 188, 187, 190, 189, 287, - 389, 285, 387, 498, 571, 392, 503, 574, 635, 643, - 390, 501, 573, 636, 109, 110, 294, 398, 506, 491, - 613, 614, 31, 32, 115, 304, 305, 73, 74, 20, - 168, 169, 350, 351, 353, 354, 211, 219, 238, 239 + 267, 268, 460, 461, 88, 89, 90, 91, 270, 373, + 272, 375, 435, 92, 179, 178, 181, 180, 276, 379, + 274, 377, 448, 449, 382, 383, 470, 471, 462, 380, + 381, 463, 464, 450, 93, 282, 387, 476, 477, 432, + 466, 591, 104, 105, 106, 285, 389, 497, 498, 107, + 287, 391, 503, 504, 108, 190, 189, 192, 191, 291, + 395, 289, 393, 506, 580, 398, 511, 583, 644, 652, + 396, 509, 582, 645, 109, 110, 298, 404, 514, 499, + 622, 623, 31, 32, 115, 308, 309, 73, 74, 20, + 170, 171, 354, 355, 357, 358, 213, 221, 240, 241 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -455 +#define YYPACT_NINF -509 static const yytype_int16 yypact[] = { - 36, -55, -55, -87, -81, -55, -55, 37, -455, -65, - -455, -455, -455, -58, -455, -54, 55, -455, 235, -455, - -455, -39, -455, -455, -455, 36, 149, 184, -38, -36, - -34, 35, -14, -25, 1, 7, 17, 18, 21, 22, - 23, 27, 28, 29, 32, 33, 34, 38, 50, 51, - 54, 62, 64, 70, 72, 73, 76, 89, 93, 104, - 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, -2, 15, 2, 16, -455, 118, 119, - 120, 121, 122, -455, -455, -455, -455, 123, 125, 40, - -455, -455, -455, -455, 126, 127, 129, 130, -455, -455, - -455, -455, 134, 135, 132, 56, -455, -455, -455, -455, - -455, -55, -55, -55, 139, 141, 55, 43, 133, 169, - 170, 176, -55, -55, -51, -51, -51, -51, 177, -51, - -22, -51, -51, 179, 189, 190, -55, -55, 198, 199, - 201, 202, -55, -55, 205, 206, 207, -51, -40, -40, - 208, -40, -40, 209, -51, 210, 211, -455, 235, 204, - 214, 218, 222, 223, 224, 225, 2, 2, 14, -455, - 26, 168, -55, -55, -55, -55, 226, 228, 229, 230, - -55, -455, 149, -55, -55, -55, -55, 231, 236, 237, - 239, -55, -55, -455, 184, 234, 240, 245, 12, -455, - -455, 246, 248, 260, 261, 262, 263, 264, -455, -455, - -455, 265, 266, 267, 268, 269, 270, -455, -455, 271, - 274, 275, 276, 278, 279, 280, 281, 282, 283, 288, - 292, 294, 295, 298, 299, 302, 303, -455, -455, 306, - 309, 311, 312, 313, 316, 317, 323, 324, -455, -55, - -55, -3, 215, -55, -55, -55, -455, -64, 2, 2, - 212, 326, 330, 241, 213, -455, 331, -455, 333, -455, - 334, -455, 335, -455, -455, -455, -455, -455, 337, -455, - -455, 338, -455, 339, -455, 340, -455, 341, -455, -55, - -55, -55, -55, 342, 343, -455, -455, -455, -455, -455, - -455, -455, -455, -455, 344, 12, -455, -455, -455, -455, - -455, -455, -455, -455, -455, -455, -455, -455, -455, -455, - -455, -455, -455, -455, -455, -455, -455, -455, -455, -455, - -455, -455, -455, -455, -455, -455, -455, -455, -455, -455, - -455, -455, -455, -455, -455, -455, 345, 346, -455, 353, - 354, 216, 366, 356, 215, 360, 364, 365, -455, 336, - -455, -455, -55, -51, -455, 26, -455, 53, -455, 474, - -455, 523, -455, 523, 367, 419, 368, 566, 369, 370, - -455, 465, -455, 610, -455, 5, -455, -455, -455, -455, - 371, -455, 372, -455, 373, 374, -455, -455, 304, 380, - -455, -455, -455, -455, -455, -455, 400, -455, -455, -455, - -455, -455, 392, 394, -455, 396, 397, 398, 401, 403, - 404, 409, 410, 411, -455, 53, 412, -455, -455, 415, - 416, 420, 422, 423, 424, 425, 426, 428, 429, -455, - -455, 523, -455, -455, -455, -455, 430, 434, 435, 437, - 438, 439, -455, -455, -455, -455, 419, -455, -455, -455, - 440, 442, -455, 566, -455, -455, -455, 443, -455, 465, - 444, 446, 453, 458, 459, 460, 461, 464, 466, 467, - 468, 471, 475, 477, 478, 479, 481, 485, 486, -455, - 610, -455, 487, 488, 489, -455, 5, -455, 393, 393, - -455, -455, -455, -455, -455, -455, -455, 304, -455, -455, - -455, -455, 402, -51, 408, 427, -55, 500, 473, -55, - 503, -455, -51, -51, -40, -40, 504, -51, 509, -51, - 510, 511, -51, -455, -55, -55, -40, -40, 512, 515, - -455, -40, -40, -455, -55, -455, -51, 516, 517, -55, - 518, 519, 259, -55, -51, -51, -40, -40, 520, -40, - -40, 521, -55, -51, 522, -455, -40, -40, 524, -455, - -455, -455, -455, 287, 131, -455, 525, 530, 540, 541, - 542, 500, 544, 545, 546, 547, 548, 550, 551, 552, - 553, 554, 555, 568, 569, 570, 571, 572, 573, 574, - 575, 576, 577, 578, 580, 581, 582, 583, 584, 585, - 586, 587, -455, 588, 259, 589, 590, 591, 592, 593, - 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, - 567, 605, 606, 607, -455, -455, -455, -455, 608, 609, - 611, 612, -455, -455, -455, -455, -455, -455, -455, -455, - -455, -455, -455, -455, -455, -455, -455, -455, -455, -455, - -455, -455, -455, -455, -455, -455, -455, -455, -455, -455, - -455, -455, -455, -455, -455, -455, -455, -455, -455, -455, - -455, -455, -455, -455, -455, -455, -455, -455, -455, -455, - -455, -455, -455, -455, -455, -455, -455, -55, -40, -40, - -40, -40, -40, -40, -51, 613, 614, 615, 616, 617, - 618, 619, 620, -455, -455, -455, -455, -455, -455, -455, - -455 + 29, -85, -85, -88, -78, -85, -85, 40, -509, -44, + -509, -509, -509, -36, -509, -32, 63, -509, 172, -509, + -509, -29, -509, -509, -509, 29, 148, 658, -27, -23, + -20, 39, -22, -17, -16, -11, -9, -5, -4, -2, + 2, 5, 16, 19, 20, 21, 25, 27, 33, 35, + 36, 47, 48, 50, 51, 52, 53, 54, 59, 60, + 61, 62, 64, 65, 70, 71, 72, 73, 96, 97, + 103, 106, 107, 23, 111, 34, 112, -509, 109, 116, + 117, 125, 126, -509, -509, -509, -509, 127, 129, 132, + -509, -509, -509, -509, 130, 131, 135, 141, -509, -509, + -509, -509, 142, 145, 147, 152, -509, -509, -509, -509, + -509, -85, -85, -85, 150, 153, 63, 159, 161, 162, + 163, 166, -85, -85, -55, -55, -55, -55, 167, -55, + -25, -55, -55, 169, 171, 178, -85, -85, 179, 180, + 186, 188, -85, -85, 189, 190, 191, -55, 22, 22, + 192, 22, 22, 196, -55, 197, 198, -509, 172, 164, + 193, 199, 201, 214, 215, 216, 217, 219, 34, 34, + -7, -509, -13, 158, -85, -85, -85, -85, 230, 231, + 232, 233, -85, -509, 148, -85, -85, -85, -85, 234, + 235, 236, 238, -85, -85, -509, 658, 195, 239, 240, + -3, -509, -509, 242, 244, 245, 246, 247, 253, 254, + -509, -509, -509, 255, 256, 260, 261, 262, 263, -509, + -509, 264, 266, 270, 271, 272, 273, 274, 276, 279, + 280, 283, 284, 290, 291, 292, 297, 301, 303, -509, + -509, 304, 306, 307, 308, 309, 311, 312, 315, 320, + -509, -85, -85, -45, 207, -85, -85, -85, -85, -85, + -509, -67, 34, 34, 243, 322, 323, 327, 330, -509, + 329, -509, 335, -509, 337, -509, 338, -509, -509, -509, + -509, -509, 341, -509, -509, 342, -509, 343, -509, 344, + -509, 345, -509, -85, -85, -85, -85, 346, 347, -509, + -509, -509, -509, -509, -509, -509, -509, -509, 348, -3, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + 350, 351, -509, 354, 355, 248, 202, 356, 207, 358, + 365, 375, 376, -85, -509, 265, -509, -509, -85, -55, + -509, -13, -509, 13, -509, 603, -509, 321, -509, 321, + 377, 403, 379, 533, 380, 381, -509, 431, -509, 447, + -509, 484, -509, -509, -509, -509, 382, -509, 383, -509, + 385, 387, -509, -509, 577, 392, -509, -509, -509, -509, + -509, -509, 411, -509, -509, -509, -509, -509, -509, 404, + 406, 407, -509, 413, 414, 415, 417, 418, 419, 420, + 421, 423, -509, 13, 426, -509, -509, 427, 428, 429, + 430, 435, 436, 440, 442, 444, 445, -509, -509, 321, + -509, -509, -509, -509, 446, 448, 450, 451, 453, 454, + -509, -509, -509, -509, 403, -509, -509, -509, 455, 466, + -509, 533, -509, -509, -509, 467, -509, 431, 468, 469, + 472, 473, 474, 475, 476, 477, 479, 481, 482, 485, + 486, 487, 489, 490, 491, 496, 506, -509, 447, -509, + 507, 508, 510, -509, 484, -509, 32, 32, -509, -509, + -509, -509, -509, -509, -509, 577, -509, -509, -509, -509, + -509, 412, -55, 520, 521, -85, 456, 522, -85, 524, + -509, -55, -55, 22, 22, 525, -55, 526, -55, 528, + 529, -55, -509, -85, -85, 22, 22, 530, 531, -509, + 22, 22, -509, -85, -509, -55, 532, 534, -85, 535, + 536, 581, -85, -55, -55, 22, 22, 537, 22, 22, + 544, -85, -55, 545, -509, 22, 22, 546, -509, -509, + -509, -509, 259, 241, -509, 538, 541, 542, 543, 558, + 456, 560, 561, 562, 563, 564, 565, 566, 567, 568, + 569, 570, 571, 572, 573, 574, 575, 576, 578, 579, + 580, 582, 583, 584, 585, 587, 588, 589, 590, 591, + 592, -509, 593, 581, 594, 595, 596, 597, 598, 599, + 600, 601, 602, 604, 605, 606, 607, 608, 609, 547, + 611, 612, 613, -509, -509, -509, -509, 614, 615, 616, + 617, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -509, -509, -509, -509, -85, 22, 22, 22, + 22, 22, 22, -55, 618, 619, 620, 621, 622, 623, + 624, 625, -509, -509, -509, -509, -509, -509, -509, -509 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -455, -455, 701, -455, -455, -455, -455, -455, -455, -455, - 272, -455, -352, -454, 451, -455, -455, -455, -455, -455, - -455, -455, -455, -455, -455, -455, -455, -455, -455, -455, - -455, -455, -358, -455, 359, -455, 175, -455, -375, 462, - -455, 185, -455, -372, -455, -455, -455, 171, -455, -344, - -335, 148, 549, -455, -455, -455, -455, 249, -455, -455, - -455, -455, 244, -455, -455, -455, -455, -455, -455, -455, - -455, -455, -455, 352, -455, 450, -455, -455, 172, -455, - 454, -455, -455, -455, -455, -455, -455, -455, 242, -367, - 136, -455, 628, -455, -455, 447, -455, 604, -455, -455, - -143, -455, 405, -455, 399, -455, -119, -455, -1, -135 + -509, -509, 638, -509, -509, -509, -509, -509, -509, -509, + 293, -509, -357, -508, 512, -509, -509, -509, -509, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -368, -509, 441, -509, 229, -509, -377, 465, + -509, 282, -509, -374, -509, -509, -509, 275, -509, -354, + -350, 146, 551, -509, -509, -509, -509, 250, -509, -509, + -509, -509, 249, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -509, 359, -509, 459, -509, -509, 168, -509, + 461, -509, -509, -509, -509, -509, -509, -509, 251, -360, + 134, -509, 633, -509, -509, 449, -509, 610, -509, -509, + -166, -509, 395, -509, 401, -509, -117, -509, -1, -133 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1185,243 +1194,243 @@ #define YYTABLE_NINF -1 static const yytype_uint16 yytable[] = { - 13, 15, 464, 457, 21, 23, 212, 213, 214, 159, - 216, 218, 220, 221, 240, 444, 242, 243, 497, 439, - 217, 439, 160, 256, 257, 428, 470, 16, 236, 471, - 472, 507, 425, 18, 425, 245, 443, 24, 443, 1, - 2, 3, 4, 5, 208, 209, 258, 259, 25, 473, - 474, 475, 10, 358, 11, 476, 26, 210, 28, 29, - 27, 477, 30, 300, 301, 302, 303, 10, 237, 11, - 492, 493, 494, 208, 209, 75, 486, 487, 111, 415, - 112, 521, 113, 533, 457, 114, 210, 416, 464, 439, - 425, 117, 161, 162, 163, 164, 165, 261, 262, 116, - 417, 418, 419, 420, 348, 349, 443, 6, 421, 422, - 195, 196, 197, 157, 166, 359, 360, 118, 167, 634, - 634, 206, 207, 119, 258, 259, 423, 260, 158, 497, - 170, 572, 572, 120, 121, 225, 226, 122, 123, 124, - 507, 231, 232, 125, 126, 127, 570, 570, 128, 129, - 130, 201, 470, 182, 131, 471, 472, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 132, 133, 87, 194, - 134, 267, 269, 271, 273, 473, 474, 475, 135, 279, - 136, 476, 282, 284, 286, 288, 137, 477, 138, 139, - 293, 295, 140, 94, 95, 96, 97, 98, 99, 100, - 101, 102, 486, 487, 103, 141, 637, 637, 630, 142, - 638, 639, 640, 450, 435, 451, 436, 437, 438, 641, - 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, - 153, 154, 155, 156, 171, 172, 173, 174, 175, 180, - 181, 202, 183, 184, 413, 185, 186, 193, 346, 347, - 191, 192, 355, 356, 357, 198, 199, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 203, 204, 53, - 54, 55, 56, 57, 205, 265, 215, 222, 391, 393, - 391, 393, 58, 59, 60, 61, 62, 223, 224, 63, - 64, 65, 66, 67, 68, 69, 227, 228, 470, 229, - 230, 471, 472, 233, 234, 235, 241, 244, 246, 247, - 249, 612, 352, 348, 70, 470, 365, 361, 471, 472, - 250, 473, 474, 475, 251, 71, 72, 476, 252, 253, - 254, 255, 274, 477, 275, 276, 277, 289, 473, 474, - 475, 297, 290, 291, 476, 292, 364, 298, 486, 487, - 477, 412, 299, 306, 630, 307, 631, 632, 633, 450, - 435, 451, 436, 437, 438, 486, 487, 308, 309, 310, - 311, 312, 313, 314, 315, 316, 317, 318, 319, 588, - 589, 320, 321, 322, 577, 323, 324, 325, 326, 327, - 328, 599, 600, 586, 587, 329, 603, 604, 591, 330, - 593, 331, 332, 596, 470, 333, 334, 471, 472, 335, - 336, 618, 619, 337, 621, 622, 338, 606, 339, 340, - 341, 627, 628, 342, 343, 616, 617, 473, 474, 475, - 344, 345, 362, 476, 625, 415, 363, 259, 366, 477, - 368, 370, 372, 416, 380, 382, 384, 386, 388, 396, - 397, 399, 401, 402, 486, 487, 417, 418, 419, 420, - 403, 404, 406, 407, 421, 422, 435, 409, 436, 437, - 438, 410, 411, 467, 445, 459, 465, 466, 500, 502, - 504, 505, 423, 508, 433, 434, 446, 447, 448, 449, - 415, 450, 435, 451, 436, 437, 438, 509, 416, 510, - 576, 511, 512, 513, 514, 580, 578, 515, 584, 516, - 517, 417, 418, 419, 420, 518, 519, 520, 522, 421, - 422, 523, 524, 597, 598, 579, 525, 426, 526, 527, - 528, 529, 530, 605, 531, 532, 534, 423, 609, 415, - 535, 536, 615, 537, 538, 539, 541, 416, 542, 544, - 546, 624, 547, 706, 707, 708, 709, 710, 711, 548, - 417, 418, 419, 420, 549, 550, 551, 552, 421, 422, - 553, 583, 554, 555, 556, 712, 429, 557, 430, 431, - 432, 558, 415, 559, 560, 561, 423, 562, 433, 434, - 416, 563, 564, 566, 567, 568, 435, 581, 436, 437, - 438, 585, 590, 417, 418, 419, 420, 592, 594, 595, - 601, 421, 422, 602, 607, 608, 610, 611, 620, 623, - 626, 470, 629, 280, 471, 472, 379, 414, 543, 423, - 545, 540, 644, 446, 447, 460, 461, 645, 450, 435, - 451, 436, 437, 438, 473, 474, 475, 646, 647, 648, - 476, 650, 651, 652, 653, 654, 477, 655, 656, 657, - 658, 659, 660, 478, 479, 480, 481, 482, 483, 484, - 485, 486, 487, 697, 488, 661, 662, 663, 664, 665, - 666, 667, 668, 669, 670, 671, 705, 672, 673, 674, - 675, 676, 677, 678, 679, 680, 682, 683, 684, 685, - 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, - 696, 698, 699, 700, 701, 702, 77, 703, 704, 649, - 713, 714, 715, 716, 717, 718, 719, 720, 378, 565, - 569, 499, 395, 296, 200, 394, 642, 0, 0, 575, - 681, 0, 400, 408, 0, 0, 405, 0, 0, 0, - 0, 0, 248 + 13, 15, 260, 261, 21, 23, 472, 465, 214, 215, + 216, 452, 218, 220, 222, 223, 242, 219, 244, 245, + 447, 436, 447, 433, 10, 433, 11, 451, 16, 451, + 238, 505, 1, 2, 3, 4, 5, 247, 18, 423, + 24, 159, 210, 211, 515, 262, 263, 424, 304, 305, + 306, 307, 364, 478, 160, 212, 479, 480, 265, 266, + 425, 426, 427, 428, 352, 353, 28, 29, 429, 430, + 30, 25, 210, 211, 643, 643, 481, 482, 483, 530, + 26, 542, 484, 433, 27, 212, 431, 75, 485, 114, + 465, 111, 447, 116, 472, 112, 365, 366, 113, 451, + 6, 117, 118, 494, 495, 262, 263, 119, 264, 120, + 197, 198, 199, 121, 122, 443, 123, 444, 445, 446, + 124, 208, 209, 125, 161, 162, 163, 164, 165, 166, + 167, 10, 239, 11, 126, 227, 228, 127, 128, 129, + 157, 233, 234, 130, 505, 131, 581, 581, 168, 579, + 579, 132, 169, 133, 134, 515, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 135, 136, 87, 137, 138, + 139, 140, 141, 271, 273, 275, 277, 142, 143, 144, + 145, 283, 146, 147, 286, 288, 290, 292, 148, 149, + 150, 151, 297, 299, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 152, 153, 53, 54, 55, 56, + 57, 154, 646, 646, 155, 156, 158, 173, 172, 58, + 59, 60, 61, 62, 174, 175, 63, 64, 65, 66, + 67, 68, 69, 176, 177, 182, 183, 184, 185, 186, + 350, 351, 421, 187, 359, 360, 361, 362, 363, 188, + 193, 70, 478, 194, 195, 479, 480, 196, 200, 203, + 201, 204, 205, 206, 71, 72, 207, 269, 217, 224, + 478, 225, 251, 479, 480, 481, 482, 483, 226, 229, + 230, 484, 397, 399, 397, 399, 231, 485, 232, 235, + 236, 237, 243, 481, 482, 483, 246, 248, 249, 484, + 412, 252, 494, 495, 301, 485, 356, 253, 639, 254, + 647, 648, 649, 458, 443, 459, 444, 445, 446, 650, + 494, 495, 255, 256, 257, 258, 639, 259, 640, 641, + 642, 458, 443, 459, 444, 445, 446, 423, 278, 279, + 280, 281, 293, 294, 295, 424, 296, 352, 302, 303, + 367, 310, 419, 311, 312, 313, 314, 420, 425, 426, + 427, 428, 315, 316, 317, 318, 429, 430, 263, 319, + 320, 321, 322, 323, 437, 324, 438, 439, 440, 325, + 326, 327, 328, 329, 431, 330, 441, 442, 331, 332, + 597, 598, 333, 334, 443, 586, 444, 445, 446, 335, + 336, 337, 608, 609, 595, 596, 338, 612, 613, 600, + 339, 602, 340, 341, 605, 342, 343, 344, 345, 423, + 346, 347, 627, 628, 348, 630, 631, 424, 615, 349, + 368, 369, 636, 637, 370, 371, 625, 626, 372, 475, + 425, 426, 427, 428, 374, 634, 376, 378, 429, 430, + 386, 388, 390, 392, 394, 402, 403, 405, 478, 407, + 408, 479, 480, 409, 410, 413, 431, 415, 441, 442, + 454, 455, 456, 457, 416, 458, 443, 459, 444, 445, + 446, 481, 482, 483, 417, 418, 453, 484, 467, 473, + 474, 508, 510, 485, 512, 478, 513, 516, 479, 480, + 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, + 517, 496, 585, 518, 589, 519, 520, 593, 481, 482, + 483, 521, 522, 523, 484, 524, 525, 526, 527, 528, + 485, 529, 606, 607, 531, 532, 533, 534, 535, 500, + 501, 502, 614, 536, 537, 494, 495, 618, 538, 423, + 539, 624, 540, 541, 543, 590, 544, 424, 545, 546, + 633, 547, 548, 550, 715, 716, 717, 718, 719, 720, + 425, 426, 427, 428, 551, 553, 555, 556, 429, 430, + 557, 558, 559, 560, 561, 562, 721, 563, 478, 564, + 565, 479, 480, 566, 567, 568, 431, 569, 570, 571, + 454, 455, 468, 469, 572, 458, 443, 459, 444, 445, + 446, 481, 482, 483, 573, 575, 576, 484, 577, 423, + 587, 588, 592, 485, 594, 599, 601, 424, 603, 604, + 610, 611, 616, 621, 617, 619, 620, 629, 494, 495, + 425, 426, 427, 428, 632, 635, 638, 653, 429, 430, + 654, 655, 656, 77, 422, 706, 434, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 431, 657, 103, 659, + 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, + 670, 671, 672, 673, 674, 675, 284, 676, 677, 678, + 552, 679, 680, 681, 682, 714, 683, 684, 685, 686, + 687, 688, 689, 691, 692, 693, 694, 695, 696, 697, + 698, 699, 385, 700, 701, 702, 703, 704, 705, 707, + 708, 709, 710, 711, 712, 713, 658, 722, 723, 724, + 725, 726, 727, 728, 729, 384, 549, 300, 574, 202, + 411, 651, 554, 578, 507, 401, 400, 690, 406, 414, + 0, 0, 0, 0, 0, 0, 584, 0, 250 }; static const yytype_int16 yycheck[] = { - 1, 2, 377, 375, 5, 6, 125, 126, 127, 7, - 129, 130, 131, 132, 149, 373, 151, 152, 385, 371, - 42, 373, 20, 166, 167, 369, 21, 114, 147, 24, - 25, 398, 367, 114, 369, 154, 371, 0, 373, 3, - 4, 5, 6, 7, 95, 96, 110, 111, 113, 44, - 45, 46, 107, 117, 109, 50, 114, 108, 3, 4, - 114, 56, 7, 51, 52, 53, 54, 107, 108, 109, - 65, 66, 67, 95, 96, 114, 71, 72, 116, 26, - 116, 425, 116, 441, 456, 50, 108, 34, 463, 441, - 425, 116, 90, 91, 92, 93, 94, 71, 72, 113, - 47, 48, 49, 50, 107, 108, 441, 71, 55, 56, - 111, 112, 113, 115, 112, 258, 259, 116, 116, 573, - 574, 122, 123, 116, 110, 111, 73, 113, 113, 496, - 114, 498, 499, 116, 116, 136, 137, 116, 116, 116, - 507, 142, 143, 116, 116, 116, 498, 499, 116, 116, - 116, 108, 21, 113, 116, 24, 25, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 116, 116, 19, 113, - 116, 172, 173, 174, 175, 44, 45, 46, 116, 180, - 116, 50, 183, 184, 185, 186, 116, 56, 116, 116, - 191, 192, 116, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 71, 72, 20, 116, 573, 574, 77, 116, + 1, 2, 168, 169, 5, 6, 383, 381, 125, 126, + 127, 379, 129, 130, 131, 132, 149, 42, 151, 152, + 377, 375, 379, 373, 109, 375, 111, 377, 116, 379, + 147, 391, 3, 4, 5, 6, 7, 154, 116, 26, + 0, 7, 97, 98, 404, 112, 113, 34, 51, 52, + 53, 54, 119, 21, 20, 110, 24, 25, 71, 72, + 47, 48, 49, 50, 109, 110, 3, 4, 55, 56, + 7, 115, 97, 98, 582, 583, 44, 45, 46, 433, + 116, 449, 50, 433, 116, 110, 73, 116, 56, 50, + 464, 118, 449, 115, 471, 118, 262, 263, 118, 449, + 71, 118, 118, 71, 72, 112, 113, 118, 115, 118, + 111, 112, 113, 118, 118, 83, 118, 85, 86, 87, + 118, 122, 123, 118, 90, 91, 92, 93, 94, 95, + 96, 109, 110, 111, 118, 136, 137, 118, 118, 118, + 117, 142, 143, 118, 504, 118, 506, 507, 114, 506, + 507, 118, 118, 118, 118, 515, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 118, 118, 19, 118, 118, + 118, 118, 118, 174, 175, 176, 177, 118, 118, 118, + 118, 182, 118, 118, 185, 186, 187, 188, 118, 118, + 118, 118, 193, 194, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 118, 118, 44, 45, 46, 47, + 48, 118, 582, 583, 118, 118, 115, 118, 116, 57, + 58, 59, 60, 61, 118, 118, 64, 65, 66, 67, + 68, 69, 70, 118, 118, 118, 117, 115, 118, 118, + 251, 252, 369, 118, 255, 256, 257, 258, 259, 118, + 118, 89, 21, 118, 117, 24, 25, 115, 118, 110, + 117, 110, 110, 110, 102, 103, 110, 119, 111, 110, + 21, 110, 118, 24, 25, 44, 45, 46, 110, 110, + 110, 50, 293, 294, 295, 296, 110, 56, 110, 110, + 110, 110, 110, 44, 45, 46, 110, 110, 110, 50, + 108, 118, 71, 72, 119, 56, 109, 118, 77, 118, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 115, 108, 116, 116, 363, 116, 116, 115, 249, 250, - 116, 116, 253, 254, 255, 116, 115, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 108, 108, 44, - 45, 46, 47, 48, 108, 117, 109, 108, 289, 290, - 291, 292, 57, 58, 59, 60, 61, 108, 108, 64, - 65, 66, 67, 68, 69, 70, 108, 108, 21, 108, - 108, 24, 25, 108, 108, 108, 108, 108, 108, 108, - 116, 62, 107, 107, 89, 21, 113, 115, 24, 25, - 116, 44, 45, 46, 116, 100, 101, 50, 116, 116, - 116, 116, 116, 56, 116, 116, 116, 116, 44, 45, - 46, 117, 116, 116, 50, 116, 115, 117, 71, 72, - 56, 362, 117, 117, 77, 117, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 71, 72, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 524, - 525, 117, 117, 117, 513, 117, 117, 117, 117, 117, - 117, 536, 537, 522, 523, 117, 541, 542, 527, 117, - 529, 117, 117, 532, 21, 117, 117, 24, 25, 117, - 117, 556, 557, 117, 559, 560, 117, 546, 117, 117, - 117, 566, 567, 117, 117, 554, 555, 44, 45, 46, - 117, 117, 116, 50, 563, 26, 116, 111, 117, 56, - 117, 117, 117, 34, 117, 117, 117, 117, 117, 117, - 117, 117, 117, 117, 71, 72, 47, 48, 49, 50, - 117, 117, 106, 117, 55, 56, 83, 117, 85, 86, - 87, 117, 117, 18, 117, 117, 117, 117, 117, 117, - 117, 117, 73, 113, 75, 76, 77, 78, 79, 80, - 26, 82, 83, 84, 85, 86, 87, 107, 34, 117, - 108, 117, 116, 116, 116, 516, 108, 116, 519, 116, - 116, 47, 48, 49, 50, 116, 116, 116, 116, 55, - 56, 116, 116, 534, 535, 108, 116, 63, 116, 116, - 116, 116, 116, 544, 116, 116, 116, 73, 549, 26, - 116, 116, 553, 116, 116, 116, 116, 34, 116, 116, - 116, 562, 116, 698, 699, 700, 701, 702, 703, 116, - 47, 48, 49, 50, 116, 116, 116, 116, 55, 56, - 116, 108, 116, 116, 116, 704, 63, 116, 65, 66, - 67, 116, 26, 116, 116, 116, 73, 116, 75, 76, - 34, 116, 116, 116, 116, 116, 83, 107, 85, 86, - 87, 108, 108, 47, 48, 49, 50, 108, 108, 108, - 108, 55, 56, 108, 108, 108, 108, 108, 108, 108, - 108, 21, 108, 182, 24, 25, 277, 365, 463, 73, - 469, 456, 117, 77, 78, 79, 80, 117, 82, 83, - 84, 85, 86, 87, 44, 45, 46, 117, 117, 117, - 50, 117, 117, 117, 117, 117, 56, 117, 117, 117, - 117, 117, 117, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 116, 74, 117, 117, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 697, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, - 117, 116, 116, 116, 116, 116, 25, 116, 116, 581, - 117, 117, 117, 117, 117, 117, 117, 117, 276, 490, - 496, 389, 292, 194, 116, 291, 574, -1, -1, 507, - 614, -1, 305, 354, -1, -1, 351, -1, -1, -1, - -1, -1, 158 + 71, 72, 118, 118, 118, 118, 77, 118, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 26, 118, 118, + 118, 118, 118, 118, 118, 34, 118, 109, 119, 119, + 117, 119, 363, 119, 119, 119, 119, 368, 47, 48, + 49, 50, 119, 119, 119, 119, 55, 56, 113, 119, + 119, 119, 119, 119, 63, 119, 65, 66, 67, 119, + 119, 119, 119, 119, 73, 119, 75, 76, 119, 119, + 533, 534, 119, 119, 83, 522, 85, 86, 87, 119, + 119, 119, 545, 546, 531, 532, 119, 550, 551, 536, + 119, 538, 119, 119, 541, 119, 119, 119, 119, 26, + 119, 119, 565, 566, 119, 568, 569, 34, 555, 119, + 118, 118, 575, 576, 117, 115, 563, 564, 119, 18, + 47, 48, 49, 50, 119, 572, 119, 119, 55, 56, + 119, 119, 119, 119, 119, 119, 119, 119, 21, 119, + 119, 24, 25, 119, 119, 119, 73, 119, 75, 76, + 77, 78, 79, 80, 119, 82, 83, 84, 85, 86, + 87, 44, 45, 46, 119, 119, 119, 50, 119, 119, + 119, 119, 119, 56, 119, 21, 119, 115, 24, 25, + 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 109, 74, 110, 119, 525, 119, 119, 528, 44, 45, + 46, 118, 118, 118, 50, 118, 118, 118, 118, 118, + 56, 118, 543, 544, 118, 118, 118, 118, 118, 65, + 66, 67, 553, 118, 118, 71, 72, 558, 118, 26, + 118, 562, 118, 118, 118, 109, 118, 34, 118, 118, + 571, 118, 118, 118, 707, 708, 709, 710, 711, 712, + 47, 48, 49, 50, 118, 118, 118, 118, 55, 56, + 118, 118, 118, 118, 118, 118, 713, 118, 21, 118, + 118, 24, 25, 118, 118, 118, 73, 118, 118, 118, + 77, 78, 79, 80, 118, 82, 83, 84, 85, 86, + 87, 44, 45, 46, 118, 118, 118, 50, 118, 26, + 110, 110, 110, 56, 110, 110, 110, 34, 110, 110, + 110, 110, 110, 62, 110, 110, 110, 110, 71, 72, + 47, 48, 49, 50, 110, 110, 110, 119, 55, 56, + 119, 119, 119, 25, 371, 118, 63, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 73, 119, 20, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 184, 119, 119, 119, + 471, 119, 119, 119, 119, 706, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 281, 119, 119, 119, 119, 119, 119, 118, + 118, 118, 118, 118, 118, 118, 590, 119, 119, 119, + 119, 119, 119, 119, 119, 280, 464, 196, 498, 116, + 355, 583, 477, 504, 395, 296, 295, 623, 309, 358, + -1, -1, -1, -1, -1, -1, 515, -1, 158 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 3, 4, 5, 6, 7, 71, 119, 120, 121, - 107, 109, 122, 226, 123, 226, 114, 124, 114, 125, - 217, 226, 126, 226, 0, 113, 114, 114, 3, 4, - 7, 210, 211, 22, 23, 24, 25, 26, 27, 28, + 0, 3, 4, 5, 6, 7, 71, 121, 122, 123, + 109, 111, 124, 228, 125, 228, 116, 126, 116, 127, + 219, 228, 128, 228, 0, 115, 116, 116, 3, 4, + 7, 212, 213, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 44, 45, 46, 47, 48, 57, 58, 59, 60, 61, 64, 65, 66, 67, 68, 69, 70, - 89, 100, 101, 215, 216, 114, 127, 120, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 19, 132, 133, - 134, 135, 141, 162, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 20, 170, 171, 172, 177, 182, 202, - 203, 116, 116, 116, 50, 212, 113, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 115, 113, 7, - 20, 90, 91, 92, 93, 94, 112, 116, 218, 219, - 114, 116, 116, 116, 116, 116, 143, 142, 145, 144, - 116, 115, 113, 116, 116, 116, 116, 184, 183, 186, - 185, 116, 116, 115, 113, 226, 226, 226, 116, 115, - 210, 108, 108, 108, 108, 108, 226, 226, 95, 96, - 108, 224, 224, 224, 224, 109, 224, 42, 224, 225, - 224, 224, 108, 108, 108, 226, 226, 108, 108, 108, - 108, 226, 226, 108, 108, 108, 224, 108, 226, 227, - 227, 108, 227, 227, 108, 224, 108, 108, 215, 116, - 116, 116, 116, 116, 116, 116, 218, 218, 110, 111, - 113, 71, 72, 128, 129, 117, 136, 226, 138, 226, - 148, 226, 146, 226, 116, 116, 116, 116, 163, 226, - 132, 173, 226, 178, 226, 189, 226, 187, 226, 116, - 116, 116, 116, 226, 204, 226, 170, 117, 117, 117, - 51, 52, 53, 54, 213, 214, 117, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 226, 226, 107, 108, - 220, 221, 107, 222, 223, 226, 226, 226, 117, 218, - 218, 115, 116, 116, 115, 113, 117, 137, 117, 139, - 117, 149, 117, 147, 157, 158, 152, 153, 157, 152, - 117, 164, 117, 174, 117, 179, 117, 190, 117, 188, - 198, 226, 193, 226, 198, 193, 117, 117, 205, 117, - 213, 117, 117, 117, 117, 220, 106, 117, 222, 117, - 117, 117, 226, 224, 128, 26, 34, 47, 48, 49, - 50, 55, 56, 73, 167, 168, 63, 140, 167, 63, - 65, 66, 67, 75, 76, 83, 85, 86, 87, 130, - 150, 151, 161, 168, 150, 117, 77, 78, 79, 80, - 82, 84, 130, 131, 156, 159, 160, 161, 168, 117, - 79, 80, 154, 155, 156, 117, 117, 18, 165, 166, - 21, 24, 25, 44, 45, 46, 50, 56, 63, 64, - 65, 66, 67, 68, 69, 70, 71, 72, 74, 175, - 176, 207, 65, 66, 67, 180, 181, 207, 191, 191, - 117, 199, 117, 194, 117, 117, 206, 207, 113, 107, - 117, 117, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 167, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 150, 116, 116, 116, 116, 116, 116, - 159, 116, 116, 154, 116, 165, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 175, 116, 116, 116, 180, - 130, 192, 207, 200, 195, 206, 108, 224, 108, 108, - 226, 107, 169, 108, 226, 108, 224, 224, 227, 227, - 108, 224, 108, 224, 108, 108, 224, 226, 226, 227, - 227, 108, 108, 227, 227, 226, 224, 108, 108, 226, - 108, 108, 62, 208, 209, 226, 224, 224, 227, 227, - 108, 227, 227, 108, 226, 224, 108, 227, 227, 108, - 77, 79, 80, 81, 131, 196, 201, 207, 79, 80, - 81, 88, 196, 197, 117, 117, 117, 117, 117, 169, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, - 117, 208, 117, 117, 117, 117, 117, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 117, 116, 116, 116, - 116, 116, 116, 116, 116, 226, 227, 227, 227, 227, - 227, 227, 224, 117, 117, 117, 117, 117, 117, 117, - 117 + 89, 102, 103, 217, 218, 116, 129, 122, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 19, 134, 135, + 136, 137, 143, 164, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 20, 172, 173, 174, 179, 184, 204, + 205, 118, 118, 118, 50, 214, 115, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 117, 115, 7, + 20, 90, 91, 92, 93, 94, 95, 96, 114, 118, + 220, 221, 116, 118, 118, 118, 118, 118, 145, 144, + 147, 146, 118, 117, 115, 118, 118, 118, 118, 186, + 185, 188, 187, 118, 118, 117, 115, 228, 228, 228, + 118, 117, 212, 110, 110, 110, 110, 110, 228, 228, + 97, 98, 110, 226, 226, 226, 226, 111, 226, 42, + 226, 227, 226, 226, 110, 110, 110, 228, 228, 110, + 110, 110, 110, 228, 228, 110, 110, 110, 226, 110, + 228, 229, 229, 110, 229, 229, 110, 226, 110, 110, + 217, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 220, 220, 112, 113, 115, 71, 72, 130, 131, 119, + 138, 228, 140, 228, 150, 228, 148, 228, 118, 118, + 118, 118, 165, 228, 134, 175, 228, 180, 228, 191, + 228, 189, 228, 118, 118, 118, 118, 228, 206, 228, + 172, 119, 119, 119, 51, 52, 53, 54, 215, 216, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 228, 228, 109, 110, 222, 223, 109, 224, 225, 228, + 228, 228, 228, 228, 119, 220, 220, 117, 118, 118, + 117, 115, 119, 139, 119, 141, 119, 151, 119, 149, + 159, 160, 154, 155, 159, 154, 119, 166, 119, 176, + 119, 181, 119, 192, 119, 190, 200, 228, 195, 228, + 200, 195, 119, 119, 207, 119, 215, 119, 119, 119, + 119, 222, 108, 119, 224, 119, 119, 119, 119, 228, + 228, 226, 130, 26, 34, 47, 48, 49, 50, 55, + 56, 73, 169, 170, 63, 142, 169, 63, 65, 66, + 67, 75, 76, 83, 85, 86, 87, 132, 152, 153, + 163, 170, 152, 119, 77, 78, 79, 80, 82, 84, + 132, 133, 158, 161, 162, 163, 170, 119, 79, 80, + 156, 157, 158, 119, 119, 18, 167, 168, 21, 24, + 25, 44, 45, 46, 50, 56, 63, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 74, 177, 178, 209, + 65, 66, 67, 182, 183, 209, 193, 193, 119, 201, + 119, 196, 119, 119, 208, 209, 115, 109, 119, 119, + 119, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 169, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 152, 118, 118, 118, 118, 118, 118, 161, + 118, 118, 156, 118, 167, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 177, 118, 118, 118, 182, 132, + 194, 209, 202, 197, 208, 110, 226, 110, 110, 228, + 109, 171, 110, 228, 110, 226, 226, 229, 229, 110, + 226, 110, 226, 110, 110, 226, 228, 228, 229, 229, + 110, 110, 229, 229, 228, 226, 110, 110, 228, 110, + 110, 62, 210, 211, 228, 226, 226, 229, 229, 110, + 229, 229, 110, 228, 226, 110, 229, 229, 110, 77, + 79, 80, 81, 133, 198, 203, 209, 79, 80, 81, + 88, 198, 199, 119, 119, 119, 119, 119, 171, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 210, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 118, 118, 118, 118, + 118, 118, 118, 118, 228, 229, 229, 229, 229, 229, + 229, 226, 119, 119, 119, 119, 119, 119, 119, 119 }; #define yyerrok (yyerrstatus = 0) @@ -2236,57 +2245,57 @@ switch (yyn) { case 5: -#line 206 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 206 "cfg-grammar.y" { cfg_add_source(configuration, (yyvsp[(2) - (2)].ptr)); } break; case 6: -#line 207 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 207 "cfg-grammar.y" { cfg_add_dest(configuration, (yyvsp[(2) - (2)].ptr)); } break; case 7: -#line 208 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 208 "cfg-grammar.y" { cfg_add_connection(configuration, (yyvsp[(2) - (2)].ptr)); } break; case 8: -#line 209 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 209 "cfg-grammar.y" { cfg_add_filter(configuration, (yyvsp[(2) - (2)].ptr)); } break; case 9: -#line 210 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 210 "cfg-grammar.y" { cfg_add_template(configuration, (yyvsp[(2) - (2)].ptr)); } break; case 10: -#line 211 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 211 "cfg-grammar.y" { } break; case 11: -#line 215 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 215 "cfg-grammar.y" { (yyval.ptr) = log_source_group_new((yyvsp[(1) - (4)].cptr), (yyvsp[(3) - (4)].ptr)); free((yyvsp[(1) - (4)].cptr)); } break; case 12: -#line 219 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 219 "cfg-grammar.y" { (yyval.ptr) = log_dest_group_new((yyvsp[(1) - (4)].cptr), (yyvsp[(3) - (4)].ptr)); free((yyvsp[(1) - (4)].cptr)); } break; case 13: -#line 223 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 223 "cfg-grammar.y" { (yyval.ptr) = log_connection_new((yyvsp[(2) - (4)].ptr), (yyvsp[(3) - (4)].num)); } break; case 14: -#line 227 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 227 "cfg-grammar.y" { (yyval.ptr) = NULL; } break; case 15: -#line 232 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 232 "cfg-grammar.y" { last_template = log_template_new((yyvsp[(1) - (1)].cptr), NULL); free((yyvsp[(1) - (1)].cptr)); @@ -2294,97 +2303,97 @@ break; case 16: -#line 236 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 236 "cfg-grammar.y" { (yyval.ptr) = last_template; } break; case 19: -#line 245 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 245 "cfg-grammar.y" { last_template->template = g_string_new((yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 20: -#line 246 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 246 "cfg-grammar.y" { log_template_set_escape(last_template, (yyvsp[(3) - (4)].num)); } break; case 21: -#line 250 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 250 "cfg-grammar.y" { last_sock_options->sndbuf = (yyvsp[(3) - (4)].num); } break; case 22: -#line 251 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 251 "cfg-grammar.y" { last_sock_options->rcvbuf = (yyvsp[(3) - (4)].num); } break; case 23: -#line 252 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 252 "cfg-grammar.y" { last_sock_options->broadcast = (yyvsp[(3) - (4)].num); } break; case 24: -#line 253 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 253 "cfg-grammar.y" { last_sock_options->keepalive = (yyvsp[(3) - (4)].num); } break; case 26: -#line 258 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 258 "cfg-grammar.y" { ((InetSocketOptions *) last_sock_options)->ttl = (yyvsp[(3) - (4)].num); } break; case 27: -#line 259 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 259 "cfg-grammar.y" { ((InetSocketOptions *) last_sock_options)->tos = (yyvsp[(3) - (4)].num); } break; case 28: -#line 263 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 263 "cfg-grammar.y" { log_drv_append((yyvsp[(1) - (3)].ptr), (yyvsp[(3) - (3)].ptr)); log_drv_unref((yyvsp[(3) - (3)].ptr)); (yyval.ptr) = (yyvsp[(1) - (3)].ptr); } break; case 29: -#line 264 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 264 "cfg-grammar.y" { (yyval.ptr) = NULL; } break; case 30: -#line 268 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 268 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(1) - (1)].ptr); } break; case 31: -#line 269 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 269 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(1) - (1)].ptr); } break; case 32: -#line 270 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 270 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(1) - (1)].ptr); } break; case 33: -#line 271 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 271 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(1) - (1)].ptr); } break; case 34: -#line 275 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 275 "cfg-grammar.y" { (yyval.ptr) = afinter_sd_new(); } break; case 35: -#line 279 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 279 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(3) - (4)].ptr); } break; case 36: -#line 280 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 280 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(3) - (4)].ptr); } break; case 37: -#line 285 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 285 "cfg-grammar.y" { last_driver = affile_sd_new((yyvsp[(1) - (1)].cptr), 0); free((yyvsp[(1) - (1)].cptr)); @@ -2393,12 +2402,12 @@ break; case 38: -#line 290 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 290 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 39: -#line 295 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 295 "cfg-grammar.y" { last_driver = affile_sd_new((yyvsp[(1) - (1)].cptr), AFFILE_PIPE); free((yyvsp[(1) - (1)].cptr)); @@ -2407,72 +2416,72 @@ break; case 40: -#line 300 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 300 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 41: -#line 304 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 304 "cfg-grammar.y" { last_driver->optional = (yyvsp[(3) - (4)].num); } break; case 42: -#line 305 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 305 "cfg-grammar.y" {} break; case 43: -#line 309 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 309 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(3) - (4)].ptr); } break; case 44: -#line 310 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 310 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(3) - (4)].ptr); } break; case 45: -#line 311 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 311 "cfg-grammar.y" { last_addr_family = AF_INET; } break; case 46: -#line 311 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 311 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(4) - (5)].ptr); } break; case 47: -#line 312 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 312 "cfg-grammar.y" { last_addr_family = AF_INET; } break; case 48: -#line 312 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 312 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(4) - (5)].ptr); } break; case 49: -#line 313 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 313 "cfg-grammar.y" { last_addr_family = AF_INET6; } break; case 50: -#line 313 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 313 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(4) - (5)].ptr); } break; case 51: -#line 314 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 314 "cfg-grammar.y" { last_addr_family = AF_INET6; } break; case 52: -#line 314 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 314 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(4) - (5)].ptr); } break; case 53: -#line 319 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 319 "cfg-grammar.y" { last_driver = afunix_sd_new( (yyvsp[(1) - (1)].cptr), @@ -2484,12 +2493,12 @@ break; case 54: -#line 327 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 327 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 55: -#line 332 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 332 "cfg-grammar.y" { last_driver = afunix_sd_new( (yyvsp[(1) - (1)].cptr), @@ -2501,47 +2510,47 @@ break; case 56: -#line 340 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 340 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 59: -#line 350 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 350 "cfg-grammar.y" { afunix_sd_set_uid(last_driver, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 60: -#line 351 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 351 "cfg-grammar.y" { afunix_sd_set_gid(last_driver, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 61: -#line 352 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 352 "cfg-grammar.y" { afunix_sd_set_perm(last_driver, (yyvsp[(3) - (4)].num)); } break; case 62: -#line 353 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 353 "cfg-grammar.y" { last_driver->optional = (yyvsp[(3) - (4)].num); } break; case 63: -#line 354 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 354 "cfg-grammar.y" {} break; case 64: -#line 355 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 355 "cfg-grammar.y" {} break; case 65: -#line 356 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 356 "cfg-grammar.y" {} break; case 66: -#line 361 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 361 "cfg-grammar.y" { last_driver = afinet_sd_new(last_addr_family, NULL, 514, @@ -2552,32 +2561,32 @@ break; case 67: -#line 368 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 368 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 71: -#line 378 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 378 "cfg-grammar.y" { afinet_sd_set_localport(last_driver, (yyvsp[(3) - (4)].cptr), "udp"); free((yyvsp[(3) - (4)].cptr)); } break; case 72: -#line 379 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 379 "cfg-grammar.y" { afinet_sd_set_localport(last_driver, (yyvsp[(3) - (4)].cptr), "udp"); free((yyvsp[(3) - (4)].cptr)); } break; case 73: -#line 383 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 383 "cfg-grammar.y" { afinet_sd_set_localip(last_driver, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 74: -#line 384 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 384 "cfg-grammar.y" { afinet_sd_set_localip(last_driver, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 77: -#line 391 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 391 "cfg-grammar.y" { last_driver = afinet_sd_new(last_addr_family, NULL, 514, @@ -2588,42 +2597,42 @@ break; case 78: -#line 398 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 398 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 82: -#line 408 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 408 "cfg-grammar.y" { afinet_sd_set_localport(last_driver, (yyvsp[(3) - (4)].cptr), "tcp"); free((yyvsp[(3) - (4)].cptr)); } break; case 83: -#line 409 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 409 "cfg-grammar.y" { afinet_sd_set_localport(last_driver, (yyvsp[(3) - (4)].cptr), "tcp"); free((yyvsp[(3) - (4)].cptr)); } break; case 84: -#line 410 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 410 "cfg-grammar.y" {} break; case 85: -#line 414 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 414 "cfg-grammar.y" { afsocket_sd_set_keep_alive(last_driver, (yyvsp[(3) - (4)].num)); } break; case 86: -#line 415 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 415 "cfg-grammar.y" { afsocket_sd_set_max_connections(last_driver, (yyvsp[(3) - (4)].num)); } break; case 87: -#line 419 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 419 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(3) - (4)].ptr); } break; case 88: -#line 424 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 424 "cfg-grammar.y" { last_driver = afstreams_sd_new((yyvsp[(1) - (1)].cptr)); free((yyvsp[(1) - (1)].cptr)); @@ -2631,112 +2640,112 @@ break; case 89: -#line 428 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 428 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 92: -#line 437 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 437 "cfg-grammar.y" { afstreams_sd_set_sundoor(last_driver, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 95: -#line 446 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 446 "cfg-grammar.y" { last_reader_options->options = (yyvsp[(3) - (4)].num); } break; case 96: -#line 447 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 447 "cfg-grammar.y" { last_reader_options->msg_size = (yyvsp[(3) - (4)].num); } break; case 97: -#line 448 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 448 "cfg-grammar.y" { last_reader_options->source_opts.init_window_size = (yyvsp[(3) - (4)].num); } break; case 98: -#line 449 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 449 "cfg-grammar.y" { last_reader_options->fetch_limit = (yyvsp[(3) - (4)].num); } break; case 99: -#line 450 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 450 "cfg-grammar.y" { last_reader_options->prefix = (yyvsp[(3) - (4)].cptr); } break; case 100: -#line 451 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 451 "cfg-grammar.y" { last_reader_options->padding = (yyvsp[(3) - (4)].num); } break; case 101: -#line 452 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 452 "cfg-grammar.y" { last_reader_options->follow_freq = (yyvsp[(3) - (4)].num); } break; case 102: -#line 453 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 453 "cfg-grammar.y" { cfg_timezone_value((yyvsp[(3) - (4)].cptr), &last_reader_options->zone_offset); free((yyvsp[(3) - (4)].cptr)); } break; case 103: -#line 454 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 454 "cfg-grammar.y" { last_reader_options->keep_timestamp = (yyvsp[(3) - (4)].num); } break; case 104: -#line 458 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 458 "cfg-grammar.y" { (yyval.num) = lookup_parse_flag((yyvsp[(1) - (2)].cptr)) | (yyvsp[(2) - (2)].num); free((yyvsp[(1) - (2)].cptr)); } break; case 105: -#line 459 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 459 "cfg-grammar.y" { (yyval.num) = 0; } break; case 106: -#line 464 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 464 "cfg-grammar.y" { log_drv_append((yyvsp[(1) - (3)].ptr), (yyvsp[(3) - (3)].ptr)); log_drv_unref((yyvsp[(3) - (3)].ptr)); (yyval.ptr) = (yyvsp[(1) - (3)].ptr); } break; case 107: -#line 465 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 465 "cfg-grammar.y" { (yyval.ptr) = NULL; } break; case 108: -#line 469 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 469 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(1) - (1)].ptr); } break; case 109: -#line 470 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 470 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(1) - (1)].ptr); } break; case 110: -#line 471 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 471 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(1) - (1)].ptr); } break; case 111: -#line 472 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 472 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(1) - (1)].ptr); } break; case 112: -#line 473 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 473 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(1) - (1)].ptr); } break; case 113: -#line 477 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 477 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(3) - (4)].ptr); } break; case 114: -#line 482 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 482 "cfg-grammar.y" { last_driver = affile_dd_new((yyvsp[(1) - (1)].cptr), 0); free((yyvsp[(1) - (1)].cptr)); @@ -2745,62 +2754,62 @@ break; case 115: -#line 488 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 488 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 119: -#line 498 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 498 "cfg-grammar.y" { last_driver->optional = (yyvsp[(3) - (4)].num); } break; case 120: -#line 503 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 503 "cfg-grammar.y" { affile_dd_set_file_uid(last_driver, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 121: -#line 504 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 504 "cfg-grammar.y" { affile_dd_set_file_gid(last_driver, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 122: -#line 505 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 505 "cfg-grammar.y" { affile_dd_set_file_perm(last_driver, (yyvsp[(3) - (4)].num)); } break; case 123: -#line 506 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 506 "cfg-grammar.y" { affile_dd_set_dir_uid(last_driver, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 124: -#line 507 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 507 "cfg-grammar.y" { affile_dd_set_dir_gid(last_driver, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 125: -#line 508 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 508 "cfg-grammar.y" { affile_dd_set_dir_perm(last_driver, (yyvsp[(3) - (4)].num)); } break; case 126: -#line 509 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 509 "cfg-grammar.y" { affile_dd_set_create_dirs(last_driver, (yyvsp[(3) - (4)].num)); } break; case 127: -#line 510 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 510 "cfg-grammar.y" { affile_dd_set_overwrite_if_older(last_driver, (yyvsp[(3) - (4)].num)); } break; case 128: -#line 514 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 514 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(3) - (4)].ptr); } break; case 129: -#line 519 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 519 "cfg-grammar.y" { last_driver = affile_dd_new((yyvsp[(1) - (1)].cptr), AFFILE_NO_EXPAND | AFFILE_PIPE); free((yyvsp[(1) - (1)].cptr)); @@ -2810,77 +2819,77 @@ break; case 130: -#line 525 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 525 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 134: -#line 535 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 535 "cfg-grammar.y" { affile_dd_set_file_uid(last_driver, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 135: -#line 536 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 536 "cfg-grammar.y" { affile_dd_set_file_gid(last_driver, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 136: -#line 537 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 537 "cfg-grammar.y" { affile_dd_set_file_perm(last_driver, (yyvsp[(3) - (4)].num)); } break; case 137: -#line 542 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 542 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(3) - (4)].ptr); } break; case 138: -#line 543 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 543 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(3) - (4)].ptr); } break; case 139: -#line 544 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 544 "cfg-grammar.y" { last_addr_family = AF_INET; } break; case 140: -#line 544 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 544 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(4) - (5)].ptr); } break; case 141: -#line 545 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 545 "cfg-grammar.y" { last_addr_family = AF_INET; } break; case 142: -#line 545 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 545 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(4) - (5)].ptr); } break; case 143: -#line 546 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 546 "cfg-grammar.y" { last_addr_family = AF_INET6; } break; case 144: -#line 546 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 546 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(4) - (5)].ptr); } break; case 145: -#line 547 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 547 "cfg-grammar.y" { last_addr_family = AF_INET6; } break; case 146: -#line 547 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 547 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(4) - (5)].ptr); } break; case 147: -#line 552 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 552 "cfg-grammar.y" { last_driver = afunix_dd_new((yyvsp[(1) - (1)].cptr), AFSOCKET_DGRAM); free((yyvsp[(1) - (1)].cptr)); @@ -2890,12 +2899,12 @@ break; case 148: -#line 558 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 558 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 149: -#line 563 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 563 "cfg-grammar.y" { last_driver = afunix_dd_new((yyvsp[(1) - (1)].cptr), AFSOCKET_STREAM); free((yyvsp[(1) - (1)].cptr)); @@ -2905,12 +2914,12 @@ break; case 150: -#line 569 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 569 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 155: -#line 584 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 584 "cfg-grammar.y" { last_driver = afinet_dd_new(last_addr_family, (yyvsp[(1) - (1)].cptr), 514, @@ -2922,37 +2931,37 @@ break; case 156: -#line 592 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 592 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 159: -#line 602 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 602 "cfg-grammar.y" { afinet_dd_set_localip(last_driver, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 163: -#line 609 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 609 "cfg-grammar.y" { afinet_dd_set_localport(last_driver, (yyvsp[(3) - (4)].cptr), "udp"); free((yyvsp[(3) - (4)].cptr)); } break; case 164: -#line 610 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 610 "cfg-grammar.y" { afinet_dd_set_destport(last_driver, (yyvsp[(3) - (4)].cptr), "udp"); free((yyvsp[(3) - (4)].cptr)); } break; case 165: -#line 611 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 611 "cfg-grammar.y" { afinet_dd_set_destport(last_driver, (yyvsp[(3) - (4)].cptr), "udp"); free((yyvsp[(3) - (4)].cptr)); } break; case 166: -#line 612 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 612 "cfg-grammar.y" { afinet_dd_set_spoof_source(last_driver, (yyvsp[(3) - (4)].num)); } break; case 167: -#line 617 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 617 "cfg-grammar.y" { last_driver = afinet_dd_new(last_addr_family, (yyvsp[(1) - (1)].cptr), 514, @@ -2964,37 +2973,37 @@ break; case 168: -#line 625 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 625 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 172: -#line 635 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 635 "cfg-grammar.y" { afinet_dd_set_localport(last_driver, (yyvsp[(3) - (4)].cptr), "tcp"); free((yyvsp[(3) - (4)].cptr)); } break; case 173: -#line 636 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 636 "cfg-grammar.y" { afinet_dd_set_destport(last_driver, (yyvsp[(3) - (4)].cptr), "tcp"); free((yyvsp[(3) - (4)].cptr)); } break; case 174: -#line 637 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 637 "cfg-grammar.y" { afinet_dd_set_destport(last_driver, (yyvsp[(3) - (4)].cptr), "tcp"); free((yyvsp[(3) - (4)].cptr)); } break; case 175: -#line 647 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 647 "cfg-grammar.y" { (yyval.ptr) = afuser_dd_new((yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 176: -#line 651 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 651 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(3) - (4)].ptr); } break; case 177: -#line 656 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 656 "cfg-grammar.y" { last_driver = afprogram_dd_new((yyvsp[(1) - (1)].cptr)); free((yyvsp[(1) - (1)].cptr)); @@ -3003,32 +3012,32 @@ break; case 178: -#line 661 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 661 "cfg-grammar.y" { (yyval.ptr) = last_driver; } break; case 181: -#line 670 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 670 "cfg-grammar.y" { last_writer_options->options = (yyvsp[(3) - (4)].num); } break; case 182: -#line 671 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 671 "cfg-grammar.y" { last_writer_options->fifo_size = (yyvsp[(3) - (4)].num); } break; case 183: -#line 672 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 672 "cfg-grammar.y" { last_writer_options->flush_lines = (yyvsp[(3) - (4)].num); } break; case 184: -#line 673 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 673 "cfg-grammar.y" { last_writer_options->flush_timeout = (yyvsp[(3) - (4)].num); } break; case 185: -#line 674 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 674 "cfg-grammar.y" { last_writer_options->template = cfg_lookup_template(configuration, (yyvsp[(3) - (4)].cptr)); if (last_writer_options->template == NULL) @@ -3041,192 +3050,192 @@ break; case 186: -#line 683 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 683 "cfg-grammar.y" { log_writer_options_set_template_escape(last_writer_options, (yyvsp[(3) - (4)].num)); } break; case 187: -#line 684 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 684 "cfg-grammar.y" { msg_error("fsync() does not work yet", NULL); } break; case 188: -#line 685 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 685 "cfg-grammar.y" { cfg_timezone_value((yyvsp[(3) - (4)].cptr), &last_writer_options->zone_offset); free((yyvsp[(3) - (4)].cptr)); } break; case 189: -#line 686 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 686 "cfg-grammar.y" { last_writer_options->ts_format = cfg_ts_format_value((yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 190: -#line 687 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 687 "cfg-grammar.y" { last_writer_options->frac_digits = (yyvsp[(3) - (4)].num); } break; case 191: -#line 691 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 691 "cfg-grammar.y" { (yyval.num) = (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); } break; case 192: -#line 692 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 692 "cfg-grammar.y" { (yyval.num) = 0; } break; case 193: -#line 696 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 696 "cfg-grammar.y" { (yyval.num) = LWO_TMPL_ESCAPE; } break; case 194: -#line 701 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 701 "cfg-grammar.y" { log_endpoint_append((yyvsp[(1) - (3)].ptr), (yyvsp[(3) - (3)].ptr)); (yyval.ptr) = (yyvsp[(1) - (3)].ptr); } break; case 195: -#line 702 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 702 "cfg-grammar.y" { (yyval.ptr) = NULL; } break; case 196: -#line 706 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 706 "cfg-grammar.y" { (yyval.ptr) = log_endpoint_new(EP_SOURCE, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 197: -#line 707 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 707 "cfg-grammar.y" { (yyval.ptr) = log_endpoint_new(EP_FILTER, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 198: -#line 708 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 708 "cfg-grammar.y" { (yyval.ptr) = log_endpoint_new(EP_DESTINATION, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 199: -#line 712 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 712 "cfg-grammar.y" { (yyval.num) = (yyvsp[(3) - (5)].num); } break; case 200: -#line 713 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 713 "cfg-grammar.y" { (yyval.num) = 0; } break; case 201: -#line 718 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 718 "cfg-grammar.y" { (yyval.num) |= (yyvsp[(2) - (2)].num); } break; case 202: -#line 719 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 719 "cfg-grammar.y" { (yyval.num) = 0; } break; case 203: -#line 723 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 723 "cfg-grammar.y" { (yyval.num) = LC_CATCHALL; } break; case 204: -#line 724 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 724 "cfg-grammar.y" { (yyval.num) = LC_FALLBACK; } break; case 205: -#line 725 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 725 "cfg-grammar.y" { (yyval.num) = LC_FINAL; } break; case 206: -#line 726 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 726 "cfg-grammar.y" { (yyval.num) = LC_FLOW_CONTROL; } break; case 207: -#line 730 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 730 "cfg-grammar.y" { (yyval.ptr) = (yyvsp[(1) - (3)].ptr); } break; case 208: -#line 731 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 731 "cfg-grammar.y" { (yyval.ptr) = NULL; } break; case 209: -#line 735 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 735 "cfg-grammar.y" { configuration->mark_freq = (yyvsp[(3) - (4)].num); } break; case 210: -#line 736 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 736 "cfg-grammar.y" { configuration->stats_freq = (yyvsp[(3) - (4)].num); } break; case 211: -#line 737 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 737 "cfg-grammar.y" { configuration->flush_lines = (yyvsp[(3) - (4)].num); } break; case 212: -#line 738 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 738 "cfg-grammar.y" { configuration->flush_timeout = (yyvsp[(3) - (4)].num); } break; case 213: -#line 739 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 739 "cfg-grammar.y" { configuration->chain_hostnames = (yyvsp[(3) - (4)].num); } break; case 214: -#line 740 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 740 "cfg-grammar.y" { configuration->normalize_hostnames = (yyvsp[(3) - (4)].num); } break; case 215: -#line 741 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 741 "cfg-grammar.y" { configuration->keep_hostname = (yyvsp[(3) - (4)].num); } break; case 216: -#line 742 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 742 "cfg-grammar.y" { configuration->check_hostname = (yyvsp[(3) - (4)].num); } break; case 217: -#line 743 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 743 "cfg-grammar.y" { cfg_bad_hostname_set(configuration, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 218: -#line 744 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 744 "cfg-grammar.y" { configuration->use_time_recvd = (yyvsp[(3) - (4)].num); } break; case 219: -#line 745 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 745 "cfg-grammar.y" { configuration->use_fqdn = (yyvsp[(3) - (4)].num); } break; case 220: -#line 746 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 746 "cfg-grammar.y" { configuration->use_dns = (yyvsp[(3) - (4)].num); } break; case 221: -#line 747 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 747 "cfg-grammar.y" { configuration->time_reopen = (yyvsp[(3) - (4)].num); } break; case 222: -#line 748 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 748 "cfg-grammar.y" { configuration->time_reap = (yyvsp[(3) - (4)].num); } break; case 223: -#line 750 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 750 "cfg-grammar.y" { configuration->time_sleep = (yyvsp[(3) - (4)].num); if ((yyvsp[(3) - (4)].num) > 500) @@ -3238,212 +3247,222 @@ break; case 224: -#line 758 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 758 "cfg-grammar.y" { configuration->log_fifo_size = (yyvsp[(3) - (4)].num); } break; case 225: -#line 759 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 759 "cfg-grammar.y" { configuration->log_iw_size = (yyvsp[(3) - (4)].num); } break; case 226: -#line 760 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 760 "cfg-grammar.y" { configuration->log_fetch_limit = (yyvsp[(3) - (4)].num); } break; case 227: -#line 761 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 761 "cfg-grammar.y" { configuration->log_msg_size = (yyvsp[(3) - (4)].num); } break; case 228: -#line 762 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 762 "cfg-grammar.y" { configuration->keep_timestamp = (yyvsp[(3) - (4)].num); } break; case 229: -#line 763 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 763 "cfg-grammar.y" { configuration->ts_format = cfg_ts_format_value((yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 230: -#line 764 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 764 "cfg-grammar.y" { configuration->frac_digits = (yyvsp[(3) - (4)].num); } break; case 231: -#line 765 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 765 "cfg-grammar.y" { /* ignored */; } break; case 232: -#line 766 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 766 "cfg-grammar.y" { /* ignored */; } break; case 233: -#line 767 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 767 "cfg-grammar.y" { configuration->create_dirs = (yyvsp[(3) - (4)].num); } break; case 234: -#line 768 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 768 "cfg-grammar.y" { cfg_file_owner_set(configuration, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 235: -#line 769 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 769 "cfg-grammar.y" { cfg_file_group_set(configuration, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 236: -#line 770 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 770 "cfg-grammar.y" { cfg_file_perm_set(configuration, (yyvsp[(3) - (4)].num)); } break; case 237: -#line 771 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 771 "cfg-grammar.y" { cfg_dir_owner_set(configuration, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 238: -#line 772 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 772 "cfg-grammar.y" { cfg_dir_group_set(configuration, (yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 239: -#line 773 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 773 "cfg-grammar.y" { cfg_dir_perm_set(configuration, (yyvsp[(3) - (4)].num)); } break; case 240: -#line 774 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 774 "cfg-grammar.y" { configuration->use_dns_cache = (yyvsp[(3) - (4)].num); } break; case 241: -#line 775 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 775 "cfg-grammar.y" { configuration->dns_cache_size = (yyvsp[(3) - (4)].num); } break; case 242: -#line 776 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 776 "cfg-grammar.y" { configuration->dns_cache_expire = (yyvsp[(3) - (4)].num); } break; case 243: -#line 778 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 778 "cfg-grammar.y" { configuration->dns_cache_expire_failed = (yyvsp[(3) - (4)].num); } break; case 244: -#line 779 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 779 "cfg-grammar.y" { configuration->dns_cache_hosts = (yyvsp[(3) - (4)].cptr); } break; case 245: -#line 780 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 780 "cfg-grammar.y" { configuration->file_template_name = (yyvsp[(3) - (4)].cptr); } break; case 246: -#line 781 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 781 "cfg-grammar.y" { configuration->proto_template_name = (yyvsp[(3) - (4)].cptr); } break; case 247: -#line 782 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 782 "cfg-grammar.y" { cfg_timezone_value((yyvsp[(3) - (4)].cptr), &configuration->recv_zone_offset); free((yyvsp[(3) - (4)].cptr)); } break; case 248: -#line 783 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 783 "cfg-grammar.y" { cfg_timezone_value((yyvsp[(3) - (4)].cptr), &configuration->send_zone_offset); free((yyvsp[(3) - (4)].cptr)); } break; case 249: -#line 787 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 787 "cfg-grammar.y" { (yyval.ptr) = log_filter_rule_new((yyvsp[(1) - (5)].cptr), (yyvsp[(3) - (5)].node)); free((yyvsp[(1) - (5)].cptr)); } break; case 250: -#line 791 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 791 "cfg-grammar.y" { (yyval.node) = (yyvsp[(1) - (1)].node); if (!(yyvsp[(1) - (1)].node)) return 1; } break; case 251: -#line 792 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 792 "cfg-grammar.y" { (yyvsp[(2) - (2)].node)->comp = !((yyvsp[(2) - (2)].node)->comp); (yyval.node) = (yyvsp[(2) - (2)].node); } break; case 252: -#line 793 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 793 "cfg-grammar.y" { (yyval.node) = fop_or_new((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 253: -#line 794 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 794 "cfg-grammar.y" { (yyval.node) = fop_and_new((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); } break; case 254: -#line 795 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 795 "cfg-grammar.y" { (yyval.node) = (yyvsp[(2) - (3)].node); } break; case 255: -#line 799 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 799 "cfg-grammar.y" { (yyval.node) = filter_facility_new((yyvsp[(3) - (4)].num)); } break; case 256: -#line 800 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 800 "cfg-grammar.y" { (yyval.node) = filter_facility_new(0x80000000 | (yyvsp[(3) - (4)].num)); } break; case 257: -#line 801 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 801 "cfg-grammar.y" { (yyval.node) = filter_level_new((yyvsp[(3) - (4)].num)); } break; case 258: -#line 802 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 802 "cfg-grammar.y" { (yyval.node) = filter_prog_new((yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 259: -#line 803 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 803 "cfg-grammar.y" { (yyval.node) = filter_host_new((yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 260: -#line 804 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 804 "cfg-grammar.y" { (yyval.node) = filter_match_new((yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 261: -#line 805 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" - { (yyval.node) = filter_call_new((yyvsp[(3) - (4)].cptr), configuration); free((yyvsp[(3) - (4)].cptr)); } +#line 805 "cfg-grammar.y" + { (yyval.node) = filter_strip_new((yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 262: -#line 806 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" - { (yyval.node) = filter_netmask_new((yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } +#line 806 "cfg-grammar.y" + { (yyval.node) = filter_replace_new((yyvsp[(3) - (5)].cptr), (yyvsp[(4) - (5)].cptr)); free((yyvsp[(3) - (5)].cptr)); free((yyvsp[(4) - (5)].cptr)); } break; case 263: -#line 810 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" - { (yyval.num) = (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); } +#line 807 "cfg-grammar.y" + { (yyval.node) = filter_call_new((yyvsp[(3) - (4)].cptr), configuration); free((yyvsp[(3) - (4)].cptr)); } break; case 264: -#line 811 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" - { (yyval.num) = (yyvsp[(1) - (1)].num); } +#line 808 "cfg-grammar.y" + { (yyval.node) = filter_netmask_new((yyvsp[(3) - (4)].cptr)); free((yyvsp[(3) - (4)].cptr)); } break; case 265: -#line 816 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 812 "cfg-grammar.y" + { (yyval.num) = (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); } + break; + + case 266: +#line 813 "cfg-grammar.y" + { (yyval.num) = (yyvsp[(1) - (1)].num); } + break; + + case 267: +#line 818 "cfg-grammar.y" { int n = syslog_name_lookup_facility_by_name((yyvsp[(1) - (1)].cptr)); if (n == -1) @@ -3459,18 +3478,18 @@ } break; - case 266: -#line 832 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" + case 268: +#line 834 "cfg-grammar.y" { (yyval.num) = (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); } break; - case 267: -#line 833 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" + case 269: +#line 835 "cfg-grammar.y" { (yyval.num) = (yyvsp[(1) - (1)].num); } break; - case 268: -#line 838 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" + case 270: +#line 840 "cfg-grammar.y" { int r1, r2; r1 = syslog_name_lookup_level_by_name((yyvsp[(1) - (3)].cptr)); @@ -3492,8 +3511,8 @@ } break; - case 269: -#line 858 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" + case 271: +#line 860 "cfg-grammar.y" { int n = syslog_name_lookup_level_by_name((yyvsp[(1) - (1)].cptr)); if (n == -1) @@ -3509,44 +3528,44 @@ } break; - case 270: -#line 874 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" + case 272: +#line 876 "cfg-grammar.y" { (yyval.num) = 1; } break; - case 271: -#line 875 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" + case 273: +#line 877 "cfg-grammar.y" { (yyval.num) = 0; } break; - case 272: -#line 876 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" + case 274: +#line 878 "cfg-grammar.y" { (yyval.num) = (yyvsp[(1) - (1)].num); } break; - case 273: -#line 880 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" + case 275: +#line 882 "cfg-grammar.y" { (yyval.num) = (yyvsp[(1) - (1)].num); } break; - case 274: -#line 881 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" + case 276: +#line 883 "cfg-grammar.y" { (yyval.num) = 2; } break; - case 277: -#line 890 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" + case 279: +#line 892 "cfg-grammar.y" { (yyval.cptr) = (yyvsp[(1) - (1)].cptr); } break; - case 278: -#line 891 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" + case 280: +#line 893 "cfg-grammar.y" { char buf[16]; snprintf(buf, sizeof(buf), "%d", (yyvsp[(1) - (1)].num)); (yyval.cptr) = strdup(buf); } break; /* Line 1267 of yacc.c. */ -#line 3550 "cfg-grammar.c" +#line 3569 "cfg-grammar.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3760,7 +3779,7 @@ } -#line 893 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 895 "cfg-grammar.y" extern int linenum; @@ -3779,3 +3798,4 @@ last_writer_options = NULL; last_template = NULL; } + --- syslog-ng-2.0.6.orig/src/cfg-grammar.h +++ syslog-ng-2.0.6/src/cfg-grammar.h @@ -131,24 +131,26 @@ KW_HOST = 347, KW_MATCH = 348, KW_NETMASK = 349, - KW_YES = 350, - KW_NO = 351, - KW_REQUIRED = 352, - KW_ALLOW = 353, - KW_DENY = 354, - KW_GC_IDLE_THRESHOLD = 355, - KW_GC_BUSY_THRESHOLD = 356, - KW_COMPRESS = 357, - KW_MAC = 358, - KW_AUTH = 359, - KW_ENCRYPT = 360, - DOTDOT = 361, - IDENTIFIER = 362, - NUMBER = 363, - STRING = 364, - KW_OR = 365, - KW_AND = 366, - KW_NOT = 367 + KW_STRIP = 350, + KW_REPLACE = 351, + KW_YES = 352, + KW_NO = 353, + KW_REQUIRED = 354, + KW_ALLOW = 355, + KW_DENY = 356, + KW_GC_IDLE_THRESHOLD = 357, + KW_GC_BUSY_THRESHOLD = 358, + KW_COMPRESS = 359, + KW_MAC = 360, + KW_AUTH = 361, + KW_ENCRYPT = 362, + DOTDOT = 363, + IDENTIFIER = 364, + NUMBER = 365, + STRING = 366, + KW_OR = 367, + KW_AND = 368, + KW_NOT = 369 }; #endif /* Tokens. */ @@ -244,31 +246,33 @@ #define KW_HOST 347 #define KW_MATCH 348 #define KW_NETMASK 349 -#define KW_YES 350 -#define KW_NO 351 -#define KW_REQUIRED 352 -#define KW_ALLOW 353 -#define KW_DENY 354 -#define KW_GC_IDLE_THRESHOLD 355 -#define KW_GC_BUSY_THRESHOLD 356 -#define KW_COMPRESS 357 -#define KW_MAC 358 -#define KW_AUTH 359 -#define KW_ENCRYPT 360 -#define DOTDOT 361 -#define IDENTIFIER 362 -#define NUMBER 363 -#define STRING 364 -#define KW_OR 365 -#define KW_AND 366 -#define KW_NOT 367 +#define KW_STRIP 350 +#define KW_REPLACE 351 +#define KW_YES 352 +#define KW_NO 353 +#define KW_REQUIRED 354 +#define KW_ALLOW 355 +#define KW_DENY 356 +#define KW_GC_IDLE_THRESHOLD 357 +#define KW_GC_BUSY_THRESHOLD 358 +#define KW_COMPRESS 359 +#define KW_MAC 360 +#define KW_AUTH 361 +#define KW_ENCRYPT 362 +#define DOTDOT 363 +#define IDENTIFIER 364 +#define NUMBER 365 +#define STRING 366 +#define KW_OR 367 +#define KW_AND 368 +#define KW_NOT 369 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 49 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-grammar.y" +#line 49 "cfg-grammar.y" { guint num; char *cptr; @@ -276,7 +280,7 @@ FilterExprNode *node; } /* Line 1489 of yacc.c. */ -#line 280 "y.tab.h" +#line 284 "y.tab.h" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 --- syslog-ng-2.0.6.orig/src/cfg-grammar.y +++ syslog-ng-2.0.6/src/cfg-grammar.y @@ -107,7 +107,7 @@ %token KW_USE_TIME_RECVD /* filter items*/ -%token KW_FACILITY KW_LEVEL KW_HOST KW_MATCH KW_NETMASK +%token KW_FACILITY KW_LEVEL KW_HOST KW_MATCH KW_NETMASK KW_STRIP KW_REPLACE /* yes/no switches */ %token KW_YES KW_NO @@ -802,6 +802,8 @@ | KW_PROGRAM '(' string ')' { $$ = filter_prog_new($3); free($3); } | KW_HOST '(' string ')' { $$ = filter_host_new($3); free($3); } | KW_MATCH '(' string ')' { $$ = filter_match_new($3); free($3); } + | KW_STRIP '(' string ')' { $$ = filter_strip_new($3); free($3); } + | KW_REPLACE '(' string string ')' { $$ = filter_replace_new($3, $4); free($3); free($4); } | KW_FILTER '(' string ')' { $$ = filter_call_new($3, configuration); free($3); } | KW_NETMASK '(' string ')' { $$ = filter_netmask_new($3); free($3); } ; @@ -907,4 +909,4 @@ last_reader_options = NULL; last_writer_options = NULL; last_template = NULL; -} \ No newline at end of file +} --- syslog-ng-2.0.6.orig/src/cfg-lex.l +++ syslog-ng-2.0.6/src/cfg-lex.l @@ -165,6 +165,8 @@ { "host", KW_HOST }, { "match", KW_MATCH }, { "netmask", KW_NETMASK }, + { "strip", KW_STRIP }, + { "replace", KW_REPLACE }, /* on/off switches */ { "yes", KW_YES }, --- syslog-ng-2.0.6.orig/src/filter.c +++ syslog-ng-2.0.6/src/filter.c @@ -226,6 +226,7 @@ typedef struct _FilterRE { FilterExprNode super; + GString *replace; regex_t regex; } FilterRE; @@ -310,6 +311,9 @@ filter_re_free(FilterExprNode *s) { FilterRE *self = (FilterRE *) s; + + if (self->replace != NULL) + g_string_free(self->replace, TRUE); regfree(&self->regex); g_free(s); @@ -494,3 +498,83 @@ self->super.eval = filter_netmask_eval; return &self->super; } + +FilterExprNode * +filter_strip_new(const gchar *re) +{ + if (g_ascii_strcasecmp(re, "ips") == 0) + return filter_replace_new(re, "0.0.0.0"); + return filter_replace_new(re, "----"); +} + +#define NEW_MSG_SIZE 2048 + +static gboolean +filter_replace_eval(FilterExprNode *s, LogMessage *log) +{ + FilterRE *self = (FilterRE *) s; + gchar *buffer = log->msg.str; + regmatch_t pmatch; + GString * new_msg; + gint replace_length = self->replace->len; + gint error; + + error = regexec(&self->regex, buffer, 1, &pmatch, 0); + if (error) + return TRUE; + + /* preallocate buffer */ + new_msg = g_string_sized_new(NEW_MSG_SIZE); + + while (!error) + { + /* copy string snippet which preceeds matched text */ + g_string_append_len(new_msg, buffer, pmatch.rm_so); + + /* copy replacement */ + g_string_append_len(new_msg, self->replace->str, replace_length); + + /* search for next match */ + buffer += pmatch.rm_eo; + error = regexec(&self->regex, buffer, 1, &pmatch, REG_NOTBOL); + } + + /* copy the rest of the old message */ + g_string_append(new_msg, buffer); + + g_string_truncate(&(log->msg), 0); + g_string_append(&(log->msg), new_msg->str); + g_string_free(new_msg, TRUE); + + return TRUE; +} + +FilterExprNode * +filter_replace_new(const gchar *re, const gchar *replacement) +{ + FilterRE *self = g_new0(FilterRE, 1); + gint regerr; + + if (!g_ascii_strcasecmp(re, "ips")) + re = "(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])([\\.\\-](25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])){3}"; + + regerr = regcomp(&self->regex, re, REG_ICASE | REG_EXTENDED); + if (regerr) + { + gchar errorbuf[256]; + regerror(regerr, &self->regex, errorbuf, sizeof(errorbuf)); + msg_error("Error compiling regular expression:", + evt_tag_str("re", re), + evt_tag_str("error", errorbuf), + NULL); + g_free(self); + return NULL; + } + + self->replace = g_string_new(replacement); + self->super.eval = filter_replace_eval; + self->super.free_fn = filter_re_free; + + return &self->super; +} + --- syslog-ng-2.0.6.orig/src/cfg-lex.c +++ syslog-ng-2.0.6/src/cfg-lex.c @@ -489,7 +489,7 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 1 "cfg-lex.l" /*************************************************************************** * * Copyright (c) 1999 Balzs Scheidler @@ -514,7 +514,7 @@ * $Id: cfg-lex.l,v 1.8 2003/01/22 11:11:18 bazsi Exp $ * ***************************************************************************/ -#line 26 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 26 "cfg-lex.l" #include "syslog-ng.h" #include "filter.h" @@ -657,6 +657,8 @@ { "host", KW_HOST }, { "match", KW_MATCH }, { "netmask", KW_NETMASK }, + { "strip", KW_STRIP }, + { "replace", KW_REPLACE }, /* on/off switches */ { "yes", KW_YES }, @@ -678,7 +680,7 @@ -#line 682 "cfg-lex.c" +#line 684 "cfg-lex.c" #define INITIAL 0 #define string 1 @@ -831,10 +833,10 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 200 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 202 "cfg-lex.l" -#line 838 "cfg-lex.c" +#line 840 "cfg-lex.c" if ( !(yy_init) ) { @@ -922,83 +924,83 @@ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 202 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 204 "cfg-lex.l" ; YY_BREAK case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 203 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 205 "cfg-lex.l" { linenum++; } YY_BREAK case 3: YY_RULE_SETUP -#line 204 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 206 "cfg-lex.l" ; YY_BREAK case 4: YY_RULE_SETUP -#line 205 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 207 "cfg-lex.l" { return DOTDOT; } YY_BREAK case 5: YY_RULE_SETUP -#line 206 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 208 "cfg-lex.l" { yylval.num = strtol(yytext, NULL, 16); return NUMBER; } YY_BREAK case 6: YY_RULE_SETUP -#line 207 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 209 "cfg-lex.l" { yylval.num = strtol(yytext, NULL, 8); return NUMBER; } YY_BREAK case 7: YY_RULE_SETUP -#line 208 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 210 "cfg-lex.l" { yylval.num = strtol(yytext, NULL, 10); return NUMBER; } YY_BREAK case 8: YY_RULE_SETUP -#line 209 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 211 "cfg-lex.l" { return check_reserved_words(yytext); } YY_BREAK case 9: YY_RULE_SETUP -#line 210 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 212 "cfg-lex.l" { return '('; } YY_BREAK case 10: YY_RULE_SETUP -#line 211 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 213 "cfg-lex.l" { return ')'; } YY_BREAK case 11: YY_RULE_SETUP -#line 212 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 214 "cfg-lex.l" { return ';'; } YY_BREAK case 12: YY_RULE_SETUP -#line 213 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 215 "cfg-lex.l" { return '{'; } YY_BREAK case 13: YY_RULE_SETUP -#line 214 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 216 "cfg-lex.l" { return '}'; } YY_BREAK case 14: YY_RULE_SETUP -#line 215 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 217 "cfg-lex.l" { return '|'; } YY_BREAK case 15: YY_RULE_SETUP -#line 216 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 218 "cfg-lex.l" ; YY_BREAK case 16: YY_RULE_SETUP -#line 218 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 220 "cfg-lex.l" { str = buf; /* yy_push_state(string);*/ @@ -1007,7 +1009,7 @@ YY_BREAK case 17: YY_RULE_SETUP -#line 223 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 225 "cfg-lex.l" { str = buf; BEGIN(qstring); @@ -1015,38 +1017,38 @@ YY_BREAK case 18: YY_RULE_SETUP -#line 227 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 229 "cfg-lex.l" { append_char(7); } YY_BREAK case 19: YY_RULE_SETUP -#line 228 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 230 "cfg-lex.l" { append_char(10); } YY_BREAK case 20: YY_RULE_SETUP -#line 229 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 231 "cfg-lex.l" { append_char(13); } YY_BREAK case 21: YY_RULE_SETUP -#line 230 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 232 "cfg-lex.l" { append_char(9); } YY_BREAK case 22: YY_RULE_SETUP -#line 231 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 233 "cfg-lex.l" { append_char(11); } YY_BREAK case 23: /* rule 23 can match eol */ YY_RULE_SETUP -#line 232 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 234 "cfg-lex.l" { append_string(1, yytext + 1); } YY_BREAK case 24: YY_RULE_SETUP -#line 233 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 235 "cfg-lex.l" { BEGIN(INITIAL); /* yy_pop_state();*/ @@ -1057,18 +1059,18 @@ case 25: /* rule 25 can match eol */ YY_RULE_SETUP -#line 239 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 241 "cfg-lex.l" { append_string(strlen(yytext), yytext); } YY_BREAK case 26: /* rule 26 can match eol */ YY_RULE_SETUP -#line 240 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 242 "cfg-lex.l" { append_string(strlen(yytext), yytext); } YY_BREAK case 27: YY_RULE_SETUP -#line 241 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 243 "cfg-lex.l" { BEGIN(INITIAL); yylval.cptr = strdup(buf); @@ -1077,10 +1079,10 @@ YY_BREAK case 28: YY_RULE_SETUP -#line 247 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 249 "cfg-lex.l" ECHO; YY_BREAK -#line 1084 "cfg-lex.c" +#line 1086 "cfg-lex.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(string): case YY_STATE_EOF(qstring): @@ -2031,7 +2033,7 @@ #define YYTABLES_NAME "yytables" -#line 247 "/home/bazsi/zwa/git//syslog-ng/syslog-ng--mainline--2.0/src/cfg-lex.l" +#line 249 "cfg-lex.l" int --- syslog-ng-2.0.6.orig/src/filter.h +++ syslog-ng-2.0.6/src/filter.h @@ -54,6 +54,8 @@ FilterExprNode *filter_match_new(gchar *re); FilterExprNode *filter_call_new(gchar *rule, struct _GlobalConfig *cfg); FilterExprNode *filter_netmask_new(gchar *cidr); +FilterExprNode *filter_strip_new(const gchar *re); +FilterExprNode *filter_replace_new(const gchar *re, const gchar *replacement); typedef struct _LogFilterRule {