nm: Make global CA directory configurable
This commit is contained in:
parent
3713d3024f
commit
97c74b565b
|
@ -13,6 +13,7 @@ options = \
|
||||||
options/attest.opt \
|
options/attest.opt \
|
||||||
options/charon.opt \
|
options/charon.opt \
|
||||||
options/charon-logging.opt \
|
options/charon-logging.opt \
|
||||||
|
options/charon-nm.opt \
|
||||||
options/charon-systemd.opt \
|
options/charon-systemd.opt \
|
||||||
options/imcv.opt \
|
options/imcv.opt \
|
||||||
options/imv_policy_manager.opt \
|
options/imv_policy_manager.opt \
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
charon-nm.ca_dir = <default>
|
||||||
|
Directory from which to load CA certificates if no certificate is
|
||||||
|
configured.
|
|
@ -396,7 +396,8 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection,
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* no certificate defined, fall back to system-wide CA certificates */
|
/* no certificate defined, fall back to system-wide CA certificates */
|
||||||
priv->creds->load_ca_dir(priv->creds, NM_CA_DIR);
|
priv->creds->load_ca_dir(priv->creds, lib->settings->get_str(
|
||||||
|
lib->settings, "charon-nm.ca_dir", NM_CA_DIR));
|
||||||
}
|
}
|
||||||
if (!gateway)
|
if (!gateway)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue