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

[Paul Wouters]

New commits:
commit 19986b88564a517c786d53e08acf5d88e64eea08
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jul 15 22:50:15 2019 -0400

    programs: Fix KLIPS detection for userland helper programs
    
    We relied on the presence of /proc/sys/net/core/xfrm_acq_expires to
    detect if XFRM was loaded, but that is also loaded when XFRM is not
    active for IPsec/ESP. On Debian jessie, this leads to a false positive
    on attempting to unload XFRM in favour of KLIPS. Instead, just rely on
    the existing /proc/net/eroute detection that is already done to see if
    KLIPS support is present.

commit 86f48842710de905d1aedb2adc43ea7184027a10
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jul 15 22:41:50 2019 -0400

    _stackmanager: try to continue after xfrm unloading when attempting KLIPS
    
    We relied on the presence of /proc/sys/net/core/xfrm_acq_expires to detect
    if XFRM was loaded, but that is also loaded when XFRM is not active for
    IPsec/ESP. On Debian jessie, this leads to a false positive on attempting
    to unload XFRM in favour of KLIPS.
    
    Since there is no other file we can check for, we will just try to continue
    and hope the unloading worked.
    
    Discovered by Lawrence Manning of Smoothwall

commit 9fd8355d9fd4bbfad3f2dca372797f721700ead9
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jul 15 22:41:04 2019 -0400

    _stackmanager: Remove obsoleted mast handling

commit e225e53d2cb32163538f69d0d30e0683df2fa3fb
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jul 15 19:02:09 2019 -0400

    _stackmanager: fix error message