static int load_config(struct connman_config *config)
{
GKeyFile *keyfile;
+ GError *error = NULL;
gsize length;
char **groups;
char *str;
}
protected = g_key_file_get_boolean(keyfile, "global",
- CONFIG_KEY_PROT, NULL);
- config->protected = protected;
+ CONFIG_KEY_PROT, &error);
+ if (error == NULL)
+ config->protected = protected;
+ else
+ config->protected = TRUE;
groups = g_key_file_get_groups(keyfile, &length);
service_name);
g_key_file_set_string(keyfile, "global", CONFIG_KEY_DESC,
"Internal Config File");
+ g_key_file_set_boolean(keyfile, "global", CONFIG_KEY_PROT, FALSE);
content = g_key_file_to_data(keyfile, &content_length, NULL);
if (content == NULL) {
goto out;
}
- DBG("Saving %d bytes to %s", content_length, filename);
+ DBG("Saving %zu bytes to %s", content_length, service_name);
if (g_file_set_contents(filename, content,
content_length, NULL) == FALSE) {
return err;
}
+static connman_bool_t validate_ident(const char *ident)
+{
+ unsigned int i;
+
+ if (ident == NULL)
+ return FALSE;
+
+ for (i = 0; i < strlen(ident); i++)
+ if (g_ascii_isprint(ident[i]) == FALSE)
+ return FALSE;
+
+ return TRUE;
+}
+
static int read_configs(void)
{
GDir *dir;
ident = g_string_free(str, FALSE);
- if (connman_dbus_validate_ident(ident) == TRUE) {
+ if (validate_ident(ident) == TRUE) {
struct connman_config *config;
config = create_config(ident);
if (config != NULL)
load_config(config);
+ } else {
+ connman_error("Invalid config ident %s", ident);
}
g_free(ident);
}
*ext = '\0';
- if (connman_dbus_validate_ident(ident) == FALSE)
+ if (validate_ident(ident) == FALSE) {
+ connman_error("Invalid config ident %s", ident);
continue;
+ }
if (event->mask & IN_CREATE)
create_config(ident);