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

« back to all changes in this revision

Viewing changes to debian/patches/02-mongo-template-not-mandatory.patch

  • 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
[ 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:
 
1
--- a/plugins/ommongodb/ommongodb.c
 
2
+++ b/plugins/ommongodb/ommongodb.c
 
3
@@ -81,7 +81,7 @@ static struct cnfparamdescr actpdescr[] = {
 
4
        { "collection", eCmdHdlrGetWord, 0 },
 
5
        { "uid", eCmdHdlrGetWord, 0 },
 
6
        { "pwd", eCmdHdlrGetWord, 0 },
 
7
-       { "template", eCmdHdlrGetWord, 1 }
 
8
+       { "template", eCmdHdlrGetWord, 0 }
 
9
 };
 
10
 static struct cnfparamblk actpblk =
 
11
        { CNFPARAMBLK_VERSION,