conntrack-tools branch, master, updated. conntrack-tools-0.9.14-13-g85f9417

[Pablo Neira]

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 "conntrack-tools".

The branch, master has been updated
       via  85f94171a71880c744f265268f33ad58819caa74 (commit)
      from  2e06d62d341fdf936dbc1fa944d5e03f761aaf0e (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 85f94171a71880c744f265268f33ad58819caa74
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Thu Jun 17 11:55:59 2010 +0200

    conntrack: `-L --src-nat --dst-nat' filter using AND, not OR logic
    
    The patch that I committed in 2e06d62d341fdf936dbc1fa944d5e03f761aaf0e
    was incomplete. With it, `-L --src-nat --dst-nat' shows source-natted
    OR destination-natted flows. This patch changes the behaviour to
    show source-natted AND destination-natted flows.
    
    This is the consistent behaviour that we expect from conntrack
    (this is how it works for other options indeed).
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

Summary of changes:
 src/conntrack.c |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
conntrack-tools