← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/ommongodb/ommongodb.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/ommongodb/ommongodb.c
35
35
#include <mongo.h>
36
36
#include <json.h>
37
37
/* For struct json_object_iter, should not be necessary in future versions */
38
 
#include <json/json_object_private.h>
 
38
#include <json_object_private.h>
39
39
 
40
40
#include "rsyslog.h"
41
41
#include "conf.h"
81
81
        { "collection", eCmdHdlrGetWord, 0 },
82
82
        { "uid", eCmdHdlrGetWord, 0 },
83
83
        { "pwd", eCmdHdlrGetWord, 0 },
84
 
        { "template", eCmdHdlrGetWord, 1 }
 
84
        { "template", eCmdHdlrGetWord, 0 }
85
85
};
86
86
static struct cnfparamblk actpblk =
87
87
        { CNFPARAMBLK_VERSION,