← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/imfile/imfile.c

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

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/imfile/imfile.c
473
473
                } else if(!strcmp(inppblk.descr[i].name, "severity")) {
474
474
                        inst->iSeverity = pvals[i].val.d.n;
475
475
                } else if(!strcmp(inppblk.descr[i].name, "facility")) {
476
 
                        inst->iSeverity = pvals[i].val.d.n;
 
476
                        inst->iFacility = pvals[i].val.d.n;
477
477
                } else if(!strcmp(inppblk.descr[i].name, "readmode")) {
478
478
                        inst->readMode = pvals[i].val.d.n;
479
479
                } else if(!strcmp(inppblk.descr[i].name, "maxlinesatonce")) {
832
832
        cs.pszFileName = NULL;
833
833
        free(cs.pszFileTag);
834
834
        cs.pszFileTag = NULL;
835
 
        free(cs.pszFileTag);
836
 
        cs.pszFileTag = NULL;
 
835
        free(cs.pszStateFile);
 
836
        cs.pszStateFile = NULL;
837
837
 
838
838
        /* set defaults... */
839
839
        cs.iPollInterval = DFLT_PollInterval;