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

[Tuomo Soini]

New commits:
commit 2549f8728cf57f2f92bb23ecbad4506bfaeadc57
Merge: 4c6f31d be20e87
Author: Tuomo Soini <tis at foobar.fi>
Date:   Sun Jun 9 21:28:08 2013 +0300

    Merge branch 'lswbz101'

commit be20e87e0fefc1312b27186d2fabc1a9b1bebb26
Author: Tuomo Soini <tis at foobar.fi>
Date:   Sun Jun 9 21:27:46 2013 +0300

    changes: lswbz101

commit ee2f0e2e6b8510f4c45535909e1101256fd0fbc5
Author: Kim Heino <b at bbbs.net>
Date:   Sun Jun 9 21:20:39 2013 +0300

    netkey: restore port when ipsec policy is generated for nat-t
    
    This is libreswan bug #101.
    
    Save and restore port when mangling ip addresses for xfrm policy with
    nat-t transport mode. We got wrong port from struct because we copied
    host ipaddress to client ipaddress when creating ipsec policy for
    transport mode with XFRM/NETKEY because host port was copied with ip
    to client port. And because the port was wrong we failed
    to delete the ipsec policy when transport mode IPsec SA was taken down.
    
    Signed-off-by: Tuomo Soini <tis at foobar.fi>