diff options
| author | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
| commit | cbb3b57b5b60dbf1eadb795c834ac511f5e1ba21 (patch) | |
| tree | a97e7cf8b8903a2902c34f586661a13da2a9f2ea /src/settings/plugins/keyfile/utils.c | |
| parent | 5ddbb9de1f57acaeb47a151404bcf5f8c9729276 (diff) | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Merge tag 'upstream/1.1.90' into experimental
Upstream version 1.1.90
Diffstat (limited to 'src/settings/plugins/keyfile/utils.c')
| -rw-r--r-- | src/settings/plugins/keyfile/utils.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/settings/plugins/keyfile/utils.c b/src/settings/plugins/keyfile/utils.c index 4809c642..48795ffb 100644 --- a/src/settings/plugins/keyfile/utils.c +++ b/src/settings/plugins/keyfile/utils.c @@ -20,15 +20,16 @@ #include "config.h" -#include <glib.h> #include <stdlib.h> #include <string.h> -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "utils.h" #include <nm-setting-wired.h> #include <nm-setting-wireless.h> #include <nm-setting-wireless-security.h> +#include "nm-config.h" +#define NM_CONFIG_KEYFILE_PATH_DEFAULT NMCONFDIR "/system-connections" static const char temp_letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; @@ -146,3 +147,23 @@ nm_keyfile_plugin_utils_escape_filename (const char *filename) return g_string_free (str, FALSE);; } +/*****************************************************************************/ + +const char * +nm_keyfile_plugin_get_path (void) +{ + static char *path = NULL; + + if (G_UNLIKELY (!path)) { + path = nm_config_data_get_value (NM_CONFIG_GET_DATA_ORIG, + NM_CONFIG_KEYFILE_GROUP_KEYFILE, + NM_CONFIG_KEYFILE_KEY_KEYFILE_PATH, + NM_CONFIG_GET_VALUE_STRIP | NM_CONFIG_GET_VALUE_NO_EMPTY); + if (!path) + path = g_strdup (""NM_CONFIG_KEYFILE_PATH_DEFAULT""); + } + return path; +} + +/*****************************************************************************/ + |