From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 8 Feb 2016 16:19:20 +0000 (+0100)
Subject: charon-systemd: Inherit all settings from the charon section
X-Git-Tag: 5.4.0rc1~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc4e689db1116290ebee471baa25ae7802c676f7;p=thirdparty%2Fstrongswan.git

charon-systemd: Inherit all settings from the charon section

Our default config files are very charon specific.  So to avoid
confusion when only charon-systemd is installed we just default to all
settings defined for charon.  Since charon-systemd probably won't be used
together with charon this should not cause conflicts (settings may still
be overridden via the charon-systemd section).
---

diff --git a/src/charon-systemd/charon-systemd.c b/src/charon-systemd/charon-systemd.c
index a83db5ac4f..5c7bbd7795 100644
--- a/src/charon-systemd/charon-systemd.c
+++ b/src/charon-systemd/charon-systemd.c
@@ -324,6 +324,15 @@ static plugin_feature_t features[] = {
 		PLUGIN_PROVIDE(CUSTOM, "systemd-journal"),
 };
 
+/**
+ * Add namespace alias
+ */
+static void __attribute__ ((constructor))register_namespace()
+{
+	/* inherit settings from charon */
+	library_add_namespace("charon");
+}
+
 /**
  * Main function, starts the daemon.
  */