diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-02-24 22:22:02 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-03-12 18:12:27 +0100 |
| commit | a49680dacd73549169bfad1ba3bd94e1a7bb1ac1 (patch) | |
| tree | 40499be9e206e08a2b4339178de4399ad6ce22d4 /clients | |
| parent | 57a432fa8a225dc5849251467d24c9927d210f37 (diff) | |
| download | NetworkManager-a49680dacd73549169bfad1ba3bd94e1a7bb1ac1.tar.gz | |
libnm: add define for cert scheme prefix file:// for NMSetting8021x
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/cli/settings.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 47c7321756..7da47d43a8 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -29,6 +29,7 @@ #include "common.h" #include "settings.h" #include "nm-glib-compat.h" +#include "nm-utils-internal.h" /* Forward declarations */ static char *wep_key_type_to_string (NMWepKeyType type); @@ -2691,13 +2692,12 @@ nmc_property_connection_describe_secondaries (NMSetting *setting, const char *pr static gboolean \ def_func (NMSetting *setting, const char *prop, const char *val, GError **error) \ { \ - const char *SCHEME_PATH = "file://"; \ char *val_strip = g_strstrip (g_strdup (val)); \ char *p = val_strip; \ gboolean success; \ \ - if (strncmp (val_strip, SCHEME_PATH, strlen (SCHEME_PATH)) == 0) \ - p += strlen (SCHEME_PATH); \ + if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \ + p += STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \ \ success = set_func (NM_SETTING_802_1X (setting), \ p, \ @@ -2713,14 +2713,13 @@ nmc_property_connection_describe_secondaries (NMSetting *setting, const char *pr def_func (NMSetting *setting, const char *prop, const char *val, GError **error) \ { \ char **strv = NULL; \ - const char *SCHEME_PATH = "file://"; \ char *val_strip = g_strstrip (g_strdup (val)); \ char *p = val_strip; \ const char *path, *password; \ gboolean success; \ \ - if (strncmp (val_strip, SCHEME_PATH, strlen (SCHEME_PATH)) == 0) \ - p += strlen (SCHEME_PATH); \ + if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \ + p += STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \ \ strv = nmc_strsplit_set (p, " \t,", 2); \ path = strv[0]; \ |