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

[Antony Antony]

New commits:
commit f60a5621da6294d73bf84cfb0697a96245465e09
Merge: df642ec 62c223b
Author: Antony Antony <antony at phenome.org>
Date:   Mon Oct 9 18:02:15 2017 +0200

    Merge branch 'master-lsw#299'

commit df642ec190d53417a5d9f1bc67935495df774014
Author: Antony Antony <antony at phenome.org>
Date:   Tue Oct 3 15:19:46 2017 +0200

    ikev1: aggressive mode avoid double retransmit of XAUTH_R0
    
    This is a set of convoluted condition for XAUTH_R0
    Folow two commits:
    commit 0cab34e4e67a ("ikev1: xauth aggressive mode should store XAUTH_R0 message")
    commit 65a6f9d11d19 ("xauth server do not record xauth_r0 message")

commit 62c223b54bb0309ad52f365e0ed9c738312f0bf5
Author: Antony Antony <antony at phenome.org>
Date:   Sat Oct 7 18:36:51 2017 +0200

    testing: update tests xauth-pluto-2[4-7]*

commit 14dbfe9a09cba233dfaa7b8f0610179bef7f854e
Author: Antony Antony <antony at phenome.org>
Date:   Mon Oct 9 07:35:21 2017 +0200

    ikev1: xauth addresspool from xauth passwd file fixes.
    
    refactor xauth user addresspool
    
    Add few more addresspool checks
     Before adding the new pool release the lease.
     No more overlapping addresspools, connection addresspools
     and xauth user pools can not partly overlap
    
     xauth fail when the address from passwd file is invalid.
     xauth fail when the addresspool fail to install (partial overlap)

commit 74c4b64e064d5596dbd5493074937d65f60322dd
Author: Wolfgang <wolfgang at linogate.de>
Date:   Sat Oct 7 10:32:47 2017 +0200

    pluto: fix addresspool reference count for static addresspools
    
    This is bug lsw#299
    
    With commit 34f5fc4b39eb3bd0325cf92bc53defbb3892f2e1 the removed reference_addresspool(p) in addresspool.c leads to an assertion.
    
    ABORT: ASSERTION FAILED: pool->pool_refcount > 0 (in unreference_addresspool() at addresspool.c:441)
    
    With the removed reference_addresspool(p) in install_addresspool the new installed addresspool from user defined static addresspools is not referenced anymore, so it needs an extra reference call after intalling the addresspool.
    
    Signed-off-by: Antony Antony <antony at phenome.org>