diff options
Diffstat (limited to 'libnm-core/nm-keyfile-reader.c')
| -rw-r--r-- | libnm-core/nm-keyfile-reader.c | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c index 6a0584a5..4a17d2c4 100644 --- a/libnm-core/nm-keyfile-reader.c +++ b/libnm-core/nm-keyfile-reader.c @@ -19,7 +19,9 @@ * Copyright (C) 2008 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" + +#include "nm-keyfile-internal.h" #include <errno.h> #include <stdlib.h> @@ -29,10 +31,7 @@ #include <arpa/inet.h> #include <string.h> -#include "nm-default.h" #include "nm-core-internal.h" -#include "nm-macros-internal.h" -#include "nm-keyfile-internal.h" #include "nm-keyfile-utils.h" typedef struct { @@ -874,17 +873,17 @@ handle_as_scheme (KeyfileReaderInfo *info, GBytes *bytes, NMSetting *setting, co /* It's the PATH scheme, can just set plain data. * In this case, @data_len includes */ - if ( data_len >= STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH) + if ( data_len >= NM_STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH) && g_str_has_prefix (data, NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)) { if (nm_setting_802_1x_check_cert_scheme (data, data_len + 1, NULL) == NM_SETTING_802_1X_CK_SCHEME_PATH) { - const char *path = &data[STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)]; + const char *path = &data[NM_STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)]; gs_free char *path_free = NULL; if (path[0] != '/') { /* we want to read absolute paths because we use keyfile as exchange * between different processes which might not have the same cwd. */ path = path_free = get_cert_path (info->base_dir, (const guint8 *) path, - data_len - STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)); + data_len - NM_STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)); } g_object_set (setting, key, bytes, NULL); @@ -899,15 +898,15 @@ handle_as_scheme (KeyfileReaderInfo *info, GBytes *bytes, NMSetting *setting, co } return TRUE; } - if ( data_len > STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB) + if ( data_len > NM_STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB) && g_str_has_prefix (data, NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB)) { - const char *cdata = data + STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB); + const char *cdata = data + NM_STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB); guchar *bin; GBytes *bytes2; gsize i; gboolean valid_base64; - data_len -= STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB); + data_len -= NM_STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB); /* Let's be strict here. We expect valid base64, no funny stuff!! * We didn't write such invalid data ourselfes and refuse to read it as blob. */ @@ -1279,10 +1278,7 @@ set_default_for_missing_key (NMSetting *setting, const char *property) { /* Set a value different from the default value of the property's spec */ - if (NM_IS_SETTING_VLAN (setting)) { - if (!strcmp (property, NM_SETTING_VLAN_FLAGS)) - g_object_set (setting, property, (NMVlanFlags) 0, NULL); - } else if (NM_IS_SETTING_WIRELESS (setting)) { + if (NM_IS_SETTING_WIRELESS (setting)) { if (!strcmp (property, NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION)) g_object_set (setting, property, (NMSettingMacRandomization) NM_SETTING_MAC_RANDOMIZATION_NEVER, NULL); } @@ -1538,11 +1534,11 @@ read_vpn_secrets (KeyfileReaderInfo *info, NMSettingVpn *s_vpn) { char **keys, **iter; - keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, VPN_SECRETS_GROUP, NULL, NULL); + keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, NM_KEYFILE_GROUP_VPN_SECRETS, NULL, NULL); for (iter = keys; *iter; iter++) { char *secret; - secret = nm_keyfile_plugin_kf_get_string (info->keyfile, VPN_SECRETS_GROUP, *iter, NULL); + secret = nm_keyfile_plugin_kf_get_string (info->keyfile, NM_KEYFILE_GROUP_VPN_SECRETS, *iter, NULL); if (secret) { nm_setting_vpn_add_secret (s_vpn, *iter, secret); g_free (secret); @@ -1620,7 +1616,7 @@ nm_keyfile_read (GKeyFile *keyfile, length = 0; for (i = 0; i < length; i++) { /* Only read out secrets when needed */ - if (!strcmp (groups[i], VPN_SECRETS_GROUP)) { + if (!strcmp (groups[i], NM_KEYFILE_GROUP_VPN_SECRETS)) { vpn_secrets = TRUE; continue; } @@ -1690,18 +1686,6 @@ nm_keyfile_read (GKeyFile *keyfile, } } - /* Make sure that if [vlan] group was missing we set vlan.flags to 0 - * for backwards compatibility */ - if (nm_connection_is_type (connection, NM_SETTING_VLAN_SETTING_NAME)) { - if (!nm_connection_get_setting_vlan (connection)) { - NMSettingVlan *s_vlan; - - s_vlan = NM_SETTING_VLAN (nm_setting_vlan_new ()); - g_object_set (s_vlan, NM_SETTING_VLAN_FLAGS, 0, NULL); - nm_connection_add_setting (connection, NM_SETTING (s_vlan)); - } - } - return connection; out_error: g_propagate_error (error, info.error); |