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

[Paul Wouters]

New commits:
commit bdf50edfc3d26bf42314deafb440f218359a3810
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Nov 7 18:28:02 2016 +0530

    updated changes

commit 8f91e8a74e80740a50831bcc5be779b9a00aa858
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Nov 7 18:20:55 2016 +0530

    XFRM: Fix NAT-T support when userland compiled without KLIPS support
    
    Changed NAT-T support detection to limit the method to the stacks
    that support the method. Renamed old/new style to sockopt/ioctl
    style to avoid confusion.
    
    This has been tested for all netkey/klips combinations on recent
    kernels, but should also work on the old 2.4 kernel NAT-T patch.
    
    Thanks to Oleg Rosowiecki and William Zhao

commit 581e05cbaac8c7f309758603c115704fc8b5f112
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Nov 7 18:20:05 2016 +0530

    testing: Added nat-pluto-02-* tests to test NAT-T with klips