[Oisf-devel] [COMMIT] OISF branch, master-2.0.x, updated. suricata-2.0.5-1-g63ef0d5

[OISF Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OISF".

The branch, master-2.0.x has been updated
       via  63ef0d52267150bf3086f73c7dec1298f736aa39 (commit)
      from  090ae0c6bee2230f4ffa03ff9826781bec241573 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 63ef0d52267150bf3086f73c7dec1298f736aa39
Author: Eric Leblond <eric at regit.org>
Date:   Tue Dec 16 00:14:59 2014 +0100

    output-json: fix duplicate logging
    
    This patches is fixing a issue in the OutputJSONBuffer function. It
    was writing to file the content of the buffer starting from the start
    to the final offset. But as the writing is done for each JSON string
    we are duplicating the previous events if we are reusing the same
    buffer.
    
    Duplication was for example triggered when we have multiple alerts
    attached to a packet. In the case of two alerts, the first one was
    logged twice more as the second one.
    
    This si almost the same code as the one of master but it fixes a
    conflict during cherry picking in:
    	src/output-json-alert.c

-----------------------------------------------------------------------

Summary of changes:
 src/output-json-alert.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
OISF