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

[Paul Wouters]

New commits:
commit 0008991183208b6d5cb57464d3799cec2bde0d3f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Sep 16 17:16:39 2015 -0400

    pluto: obsolete plutofork= and ignore the keyword on startup
    
    This was originally meant for the wrapper scripts that have been obsoleted.
    The init systems now start pluto properly and specifying anything in ipsec.conf
    will just cause conflicts with the pluto daemon options used by the init system.
    
    --nofork is still an available option to the pluto daemon

commit 6d65d12e1a99467e1b29dcb8c0537bfc4eae452a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Sep 16 17:14:55 2015 -0400

    pluto: abort when protostack= is not loaded.
    
    There was leftover code from trying to fallback to other stacks and
    protostack=auto. This caused pluto to run with the "no kernel" stack
    instead of just aborting when the specified protostack= is not available.
    (eg when pluto is started without "ipsec _stackmanager" preparing the
     kernel modules)