The vpnd will not read or save provider data from disk. Only
way to provision VPN is by setting necessary data in VPN .config
file.
---
vpn/vpn-provider.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/vpn/vpn-provider.c b/vpn/vpn-provider.c
index 2a52856..63a00ea 100644
--- a/vpn/vpn-provider.c
+++ b/vpn/vpn-provider.c
@@ -834,7 +834,16 @@ static int vpn_provider_save(struct vpn_provider *provider)
{
GKeyFile *keyfile;
- DBG("provider %p", provider);
+ DBG("provider %p immutable %s", provider,
+ provider->immutable ? "yes" : "no");
+
+ if (provider->immutable == TRUE) {
+ /*
+ * Do not save providers that are provisioned via .config
+ * file.
+ */
+ return -EPERM;
+ }
keyfile = g_key_file_new();
if (keyfile == NULL)
@@ -2002,8 +2011,7 @@ int __vpn_provider_create_from_config(GHashTable
*settings,
provider->config_file = g_strdup(config_ident);
provider->config_entry = g_strdup(config_entry);
- if (provider_register(provider) == 0)
- vpn_provider_load(provider);
+ provider_register(provider);
provider_resolv_host_addr(provider);
}
@@ -2019,6 +2027,8 @@ int __vpn_provider_create_from_config(GHashTable
*settings,
while (g_hash_table_iter_next(&hash, &key, &value) == TRUE)
__vpn_provider_set_string_immutable(provider, key, value);
+ provider->immutable = TRUE;
+
vpn_provider_save(provider);
err = provider_register(provider);
--
1.7.11.4
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
