iptables branch, master, updated. v1.4.12.1-4-gbf42cf9

[Jan Engelhardt]

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 "iptables".

The branch, master has been updated
       via  bf42cf92ea0c53e5470a20d62d00e5e83379f4d5 (commit)
       via  5df067f91b8ffa7801d09e6dd13fe9bf4b7b490b (commit)
       via  2ca6273c73b42e8c74afd5f8b1fe10c5c93ce363 (commit)
       via  3412bd0bfb8b8bac9834cbfd3392b3d5487133bf (commit)
       via  fdb2a27825e558393fb715374c07873830d4d149 (commit)
      from  debcf48f6a72914a9c06e99b175ad64ef1f6f1cb (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 bf42cf92ea0c53e5470a20d62d00e5e83379f4d5
Merge: 5df067f91b8ffa7801d09e6dd13fe9bf4b7b490b 2ca6273c73b42e8c74afd5f8b1fe10c5c93ce363
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Mon Sep 5 20:15:10 2011 +0200

    Merge branch 'stable' of git://dev.medozas.de/iptables
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 5df067f91b8ffa7801d09e6dd13fe9bf4b7b490b
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Thu Sep 1 18:30:42 2011 +0200

    Bump version to 1.4.12.1
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 2ca6273c73b42e8c74afd5f8b1fe10c5c93ce363
Author: Richard Weinberger <richard at nod.at>
Date:   Sat Aug 27 15:32:31 2011 +0200

    xtoptions: simplify xtables_parse_interface
    
    mask is already filled with zeros, there is no need to zero it again.
    
    References: http://marc.info/?l=netfilter-devel&m=131445196526269&w=2
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 3412bd0bfb8b8bac9834cbfd3392b3d5487133bf
Author: Tom Eastep <teastep at shorewall.net>
Date:   Thu Aug 18 15:11:16 2011 -0700

    libxt_conntrack: improve error message on parsing violation
    
    Tom Eastep noted:
    
    $ iptables -A foo -m conntrack --ctorigdstport 22
    iptables v1.4.12: conntrack rev 2 does not support port ranges
    Try `iptables -h' or 'iptables --help' for more information.
    
    Commit v1.4.12-41-g1ad6407 takes care of the actual cause of the bug,
    but let's include Tom's patch nevertheless for the better error
    message in case one actually does specify a range with rev 2.
    
    References: http://marc.info/?l=netfilter-devel&m=131370592105298&w=2
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit fdb2a27825e558393fb715374c07873830d4d149
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sat Aug 27 17:59:52 2011 +0200

    xtoptions: fill in fallback value for nvals
    
    Parsing for libxt_conntrack rev 2 is done by using rev 2's option
    structure, which specifies XTTYPE_PORT, and using rev 3's parser
    skeleton, which uses cb->nvals. Reading cb->nvals when not using
    XTTYPE_PORTRC (or any other multi-value type) is undefined behavior.
    
    Make it defined. Since XTTYPE_NONE is the only type that can take
    void, nvals logically ought to be 1.
    
    References: http://marc.info/?l=netfilter-devel&m=131370592105298&w=2
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

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

Summary of changes:
 configure.ac                 |    2 +-
 extensions/libxt_conntrack.c |   15 +++++++++++----
 iptables/xtables.c           |    4 +---
 iptables/xtoptions.c         |    6 ++++++
 4 files changed, 19 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
iptables