diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-03-08 10:56:27 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-03-08 10:56:27 +0100 |
| commit | 819da83fccf99acf7af1ed2bf61a498425c375e1 (patch) | |
| tree | 1d9c5c2c390aa9672a232519f4e5ae564d77dcb9 /src/charon-systemd/charon-systemd.c | |
| parent | 101abed566099b5b9ac53a86a88e03af27bbf1d5 (diff) | |
| parent | 2e190dca041a02877b9d639b92c00344c01c0743 (diff) | |
| download | strongswan-819da83fccf99acf7af1ed2bf61a498425c375e1.tar.bz2 strongswan-819da83fccf99acf7af1ed2bf61a498425c375e1.tar.xz | |
Merge branch 'charon-conf-fallback'
Makes charon-systemd and charon-svc also load settings from the charon
section in strongswan.conf.
Fixes #1300.
Diffstat (limited to 'src/charon-systemd/charon-systemd.c')
| -rw-r--r-- | src/charon-systemd/charon-systemd.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/charon-systemd/charon-systemd.c b/src/charon-systemd/charon-systemd.c index a83db5ac4..5c7bbd779 100644 --- a/src/charon-systemd/charon-systemd.c +++ b/src/charon-systemd/charon-systemd.c @@ -325,6 +325,15 @@ static plugin_feature_t features[] = { }; /** + * Add namespace alias + */ +static void __attribute__ ((constructor))register_namespace() +{ + /* inherit settings from charon */ + library_add_namespace("charon"); +} + +/** * Main function, starts the daemon. */ int main(int argc, char *argv[]) |