denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conf: Install charon-specific snippets also when charon itself is not built

Browse Source 
To make the default strongswan.conf, with `load_modular` enabled, work
if charon itself is not built, we enable generating the charon-specific
snippets also for the two other daemons that fall back on reading
options from the `charon` section.
This commit is contained in:
Tobias Brunner
2026-03-17 08:32:34 +01:00
parent 0d10fa6dda
commit b23387a3d6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/Makefile.am
+1 -1
View File
@@ -117,7 +117,7 @@ confsnippets = $(alloptions:opt=conf)
plugins_install_tmp = $(config_plugins:%=plugins/%.tmp)
plugins_install_src = $(config_plugins:%=plugins/%.conf)
if USE_CHARON
if USE_CHARON_CONF
charon_install_src = $(charon_plugins:%=plugins/%.conf)
endif
if USE_CMD
configure.ac
+3 -2
View File
@@ -1871,6 +1871,7 @@ AM_CONDITIONAL(USE_IKEV2, test x$ikev2 = xtrue)
AM_CONDITIONAL(USE_THREADS, test x$threads = xtrue)
AM_CONDITIONAL(USE_ADNS, test x$adns = xtrue)
AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue)
AM_CONDITIONAL(USE_CHARON_CONF, test x$charon = xtrue -o x$svc = xtrue -o x$systemd = xtrue)
AM_CONDITIONAL(USE_NM, test x$nm = xtrue)
AM_CONDITIONAL(USE_PKI, test x$pki = xtrue)
AM_CONDITIONAL(USE_SCRIPTS, test x$scripts = xtrue)
@@ -1956,7 +1957,7 @@ fi
config_plugins=
AM_COND_IF([USE_CHARON], [config_plugins=${config_plugins}" ${charon_plugins}"])
AM_COND_IF([USE_CHARON_CONF], [config_plugins=${config_plugins}" ${charon_plugins}"])
AM_COND_IF([USE_CMD], [config_plugins=${config_plugins}" ${cmd_plugins}"])
AM_COND_IF([USE_NM], [config_plugins=${config_plugins}" ${nm_plugins}"])
@@ -1966,7 +1967,7 @@ strongswan_options=
AM_COND_IF([USE_AIKGEN], [strongswan_options=${strongswan_options}" aikgen"])
AM_COND_IF([USE_ATTR_SQL], [strongswan_options=${strongswan_options}" pool"])
AM_COND_IF([USE_CHARON], [strongswan_options=${strongswan_options}" charon charon-logging iptfs"])
AM_COND_IF([USE_CHARON_CONF], [strongswan_options=${strongswan_options}" charon charon-logging iptfs"])
AM_COND_IF([USE_FILE_CONFIG], [strongswan_options=${strongswan_options}" starter"])
AM_COND_IF([USE_IMV_ATTESTATION], [strongswan_options=${strongswan_options}" attest"])
AM_COND_IF([USE_IMCV], [strongswan_options=${strongswan_options}" imcv imv_policy_manager"])