← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/mmanon/mmanon.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/mmanon/mmanon.c
170
170
                                        cstr);
171
171
                                free(cstr);
172
172
                        }
173
 
                        pData->replChar = es_getBufAddr(pvals[i].val.d.estr)[0];
174
173
                } else if(!strcmp(actpblk.descr[i].name, "replacementchar")) {
175
174
                        pData->replChar = es_getBufAddr(pvals[i].val.d.estr)[0];
176
175
                } else if(!strcmp(actpblk.descr[i].name, "ipv4.bits")) {
307
306
        ++i;
308
307
        ipstart[3] = i;
309
308
        octet = getnum(msg, lenMsg, &i);
310
 
        if(octet > 255 || !(msg[i] == ' ' || msg[i] == ':')) goto done;
 
309
        if(octet > 255) goto done;
311
310
        ipv4addr |= octet;
312
311
 
313
312
        /* OK, we now found an ip address */
339
338
                if(i - endpos > 0) {
340
339
                        *pLenMsg = lenMsg - (i - endpos);
341
340
                        memmove(msg+endpos, msg+i, lenMsg - i + 1);
 
341
                        /* correct index for next search! */
 
342
                        i -= (i - endpos);
342
343
                }
343
344
        }
344
345