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

[Paul Wouters]

New commits:
commit 3482259f8310a0b0620317097b33dd5119c2eebe
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Apr 27 10:53:59 2015 -0400

    updated changes

commit e9061da3b6e231a3b9229489446b3ceece3cd220
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Apr 27 10:52:44 2015 -0400

    testing: remove sanitizers/temp-natt-klips.oops.sed
    
    This is now fixed in klips and should not happen anymore

commit d4cdc9c117b9338260ccf4a49eddb20e732eee2d
Author: Wolfgang Nothdurft <wolfgang at linogate.de>
Date:   Mon Apr 27 10:49:41 2015 -0400

    KLIPS: move udp_encap_enable() out of the spinlock
    
    This avoids a kernel oops warning
    
    Signed-off-by: Paul Wouters <pwouters at redhat.com>

commit 92658b12b83fb89412f3ca400b08589b3500e1cb
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date:   Mon Apr 27 10:17:19 2015 -0400

    pluto: Fix IKEv2 handling of multiple peers behind same NAT
    
    The commit 38299da76e4a612ba8b32f8f9537dcdb79b71ecd ("pluto:
    fix peer ID checking in ikev2_decode_peer_id_and_certs()" breaks
    handling of multiple peers behind the same NAT address.
    
    This patch fixes it by removing the ID checks for the responder
    case.
    
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
    
    Signed-off-by: Paul Wouters <pwouters at redhat.com>