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

[Tuomo Soini]

New commits:
commit 9915c69bd52333687a9e562103c70e915d1f9853
Author: Tuomo Soini <tis at foobar.fi>
Date:   Tue Nov 10 15:35:42 2015 +0200

    Revert: systemd socket activation; it doesn't fit server mode ipsec.
    
    Configuration via config file doesn't work at all with socket activation
    because pluto forks addconn during startup to feed config in via pluto.ctl
    socket. This doesn't work with socket activated ipsec.service.
    
    Running pluto with socket activation would require separate systemd service
    and special option for pluto to run as socket activated service.
    
    This reverts commit d4230d050afaee7f988c0e9a8fd50c1190c90127.
    
    Conflicts:
    
    	programs/pluto/server.c
    
    Signed-off-by: Tuomo Soini <tis at foobar.fi>

commit 53c0dbe3befdf70818c76659e25813d3b2246c5d
Author: Tuomo Soini <tis at foobar.fi>
Date:   Tue Nov 10 15:30:48 2015 +0200

    Revert: systemd socket activation; it doesn't fit server mode ipsec.
    
    Configuration via config file doesn't work at all with socket activation
    because pluto forks addconn during startup to feed config in via pluto.ctl
    socket. This doesn't work with socket activated ipsec.service.
    
    Running pluto with socket activation would require separate systemd service
    and special option for pluto to run as socket activated service.
    
    This reverts commit 3148e21e4cefa549dc7135120145c5d5311ca093.
    
    Signed-off-by: Tuomo Soini <tis at foobar.fi>

commit e923da083348e3545e06062c342a414c5d90140d
Author: Tuomo Soini <tis at foobar.fi>
Date:   Tue Nov 10 15:29:02 2015 +0200

    Revert: systemd: socket activation; it doesn't fit server mode ipsec.
    
    Configuration via config file doesn't work at all with socket activation
    because pluto forks addconn during startup to feed config in via pluto.ctl
    socket. This doesn't work with socket activated ipsec.service.
    
    Running pluto with socket activation would require separate systemd service
    and special option for pluto to run as socket activated service.
    
    This reverts commit e727abe4419e4e3ecc6bd8cc8f2b2823ebf94a08.
    
    Signed-off-by: Tuomo Soini <tis at foobar.fi>