conntrack-tools branch, master, updated. conntrack-tools-1.0.0-6-gdaa3b84

[Pablo Neira Ayuso]

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  daa3b849286222a131e0829676ba98140de7241b (commit)
       via  df2b5109b185be8432e0bea920baef731536a8fd (commit)
       via  4904bbeff9b575d17678ff839583662c9f7b12c4 (commit)
      from  6428f54328a433a86bdc0d7154ff3a7d322e0fb4 (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 daa3b849286222a131e0829676ba98140de7241b
Author: Florian Westphal <fw at strlen.de>
Date:   Wed Jun 15 23:39:07 2011 +0200

    conntrack: add missing break when parsing --id/--secmark options
    
    commit 147ed522f52a62ab0d854ddc443d27d97dbf6cdf
    (conntrack: add support for mark mask) failed to add a break
    after secmark/id option parsing.
    
    Results in '-m 42 -c 1' to search for mark 1 instead of 42.
    
    Signed-off-by: Florian Westphal <fw at strlen.de>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit df2b5109b185be8432e0bea920baef731536a8fd
Author: Florian Westphal <fw at strlen.de>
Date:   Wed Jun 15 22:29:10 2011 +0200

    testsuite: add tests for --mark option
    
    Signed-off-by: Florian Westphal <fw at strlen.de>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 4904bbeff9b575d17678ff839583662c9f7b12c4
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Wed Jun 22 11:21:01 2011 +0200

    conntrack: remove unused variable with -S
    
    Error: UNUSED_VALUE:
    conntrack-tools-1.0.0/src/conntrack.c:1297: returned_pointer: Pointer "nl" returned by "strchr(buf, 10)" is never used.
    
    Reported-by: Jiri Popelka <jpopelka at redhat.com>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

Summary of changes:
 qa/testsuite/02filter |    3 +++
 qa/testsuite/05mark   |   27 +++++++++++++++++++++++++++
 src/conntrack.c       |    6 +++---
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 qa/testsuite/05mark


hooks/post-receive
-- 
conntrack-tools