← Back to branch summary

~ubuntu-branches/ubuntu/lucid/rsyslog/lucid-updates

« back to all changes in this revision

Viewing changes to tools/syslogd.h

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2009-06-23 12:12:43 UTC
  • mfrom: (1.1.11 upstream) (3.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20090623121243-d2fejarzidywnn17
Tags: 4.2.0-1
http://bugs.debian.org/530228
* New upstream release of the now stable v4 branch.
  - Fix warnings when /etc/rsyslog.d/ is empty. Closes: #530228
* debian/patches/imudp_multiple_udp_sockets.patch
  - Removed, merged upstream.
* debian/rsyslog.default
  - Set default compat mode to '4'.
* debian/rsyslog.logcheck.ignore.server
  - Update logcheck rules files to also ignore rsyslogd and imklog stop
    messages.
* debian/control
  - Bump Standards-Version to 3.8.2. No further changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/syslogd.h
70
70
                                FIOP_CONTAINS  = 1,     /* contains string? */
71
71
                                FIOP_ISEQUAL  = 2,      /* is (exactly) equal? */
72
72
                                FIOP_STARTSWITH = 3,    /* starts with a string? */
73
 
                                FIOP_REGEX = 4          /* matches a regular expression? */
 
73
                                FIOP_REGEX = 4,         /* matches a (BRE) regular expression? */
 
74
                                FIOP_EREREGEX = 5       /* matches a ERE regular expression? */
74
75
                        } operation;
 
76
                        regex_t *regex_cache;           /* cache for compiled REs, if such are used */
75
77
                        cstr_t *pCSCompValue;   /* value to "compare" against */
76
78
                        char isNegated;                 /* actually a boolean ;) */
77
79
                } prop;