I had the revert pending but did revert the 3 commits so there was no conflict. Was awaiting reply from libor where I told him my problems with it
Sent from my iPhone > On Nov 10, 2015, at 23:28, Tuomo Soini <[email protected]> wrote: > > New commits: > commit 9915c69bd52333687a9e562103c70e915d1f9853 > Author: Tuomo Soini <[email protected]> > 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 <[email protected]> > > commit 53c0dbe3befdf70818c76659e25813d3b2246c5d > Author: Tuomo Soini <[email protected]> > 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 <[email protected]> > > commit e923da083348e3545e06062c342a414c5d90140d > Author: Tuomo Soini <[email protected]> > 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 <[email protected]> > > _______________________________________________ > Swan-commit mailing list > [email protected] > https://lists.libreswan.org/mailman/listinfo/swan-commit _______________________________________________ Swan-dev mailing list [email protected] https://lists.libreswan.org/mailman/listinfo/swan-dev
