[Swan-commit] Changes to ref refs/heads/master

[Tuomo Soini]

New commits:
commit 80dfdb8ce980372d606adc1590f5ea0ec54ddf44
Merge: 16d1604 7b1cd93
Author: Tuomo Soini <tis at foobar.fi>
Date:   Fri Apr 12 19:56:02 2013 +0300

    Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan

commit 16d160428ad1a8f97f601140f0c3ee17513d6960
Merge: a23cd52 21a6e0c
Author: Tuomo Soini <tis at foobar.fi>
Date:   Fri Apr 12 19:54:42 2013 +0300

    Merge branch 'lswbz85'

commit 21a6e0c79732a3ea16dfbeeda4edff9ccc1dad1d
Author: Kim Heino <b at bbbs.net>
Date:   Fri Apr 12 19:36:57 2013 +0300

    This is fix for libreswan bug #85.
    
    We only add traffic selectors for transport mode. The problem is that
    Tunnel mode ipsec with ipcomp is layered so that ipcomp tunnel is
    protected with transport mode ipsec but in this case we shouldn't any
    more add traffic selectors or we break the tunnel.
    Function setup_half_ipsec_sa was modified to inform netlink_setup_sa with
    add_selector boolean about need to add selectors. This prevents breaking
    ipcomp in tunnel mode. Direction of sa is now passed to netlink_setup_sa
    so client can be substituted with host ip so that selector works for natted
    transport mode.
    
    Signed-off-by: Tuomo Soini <tis at foobar.fi>

commit d38911304a0129c67130de68ced87e28d79a4171
Author: Tuomo Soini <tis at foobar.fi>
Date:   Fri Apr 12 19:02:51 2013 +0300

    NETKEY: remove irrelevant logging - this is not needed when traffic selectors
    support has been restored.
    
    Revert "Revert "netkey: remove logged warning which is not true after commit 9ed4d3e9""
    
    This reverts commit 340329cdf966f8467eced54327189eb52cbfd736.

commit f3fbf2a9a196da8db16dd73cbd04c4313cba776d
Author: Tuomo Soini <tis at foobar.fi>
Date:   Fri Apr 12 18:58:20 2013 +0300

    NETKEY: restore traffic selectors for fixing them to work with transport
    mode nat-traversal.
    
    Revert "Revert "* Pass traffic selectors to the kernel in Transport Mode""
    
    This reverts commit a4e6195811c6685c1c440ff965890a2d3c9f56e3.

commit 375fe9d54d4aa27279046c099691a0a93155b876
Author: Tuomo Soini <tis at foobar.fi>
Date:   Fri Apr 12 18:55:01 2013 +0300

    NETKEY: remove work-around for NATD port leaking to traffic selectors