fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 14:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

supplicant: use connection UUID instead of D-Bus path for config purposes

Browse source
This commit is contained in:
Jiří Klimeš 2012-01-27 13:04:10 +01:00
parent 847edde23a
commit ba977b6a91
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/nm-device-ethernet.c
View file

@ -858,21 +858,21 @@ time_out:
static NMSupplicantConfig * static NMSupplicantConfig *
build_supplicant_config (NMDeviceEthernet *self) build_supplicant_config (NMDeviceEthernet *self)
{ {
const char *con_path; const char *con_uuid;
NMSupplicantConfig *config = NULL; NMSupplicantConfig *config = NULL;
NMSetting8021x *security; NMSetting8021x *security;
NMConnection *connection; NMConnection *connection;
connection = nm_device_get_connection (NM_DEVICE (self)); connection = nm_device_get_connection (NM_DEVICE (self));
g_return_val_if_fail (connection, NULL); g_return_val_if_fail (connection, NULL);
con_path = nm_connection_get_path (connection); con_uuid = nm_connection_get_uuid (connection);
config = nm_supplicant_config_new (); config = nm_supplicant_config_new ();
if (!config) if (!config)
return NULL; return NULL;
security = nm_connection_get_setting_802_1x (connection); security = nm_connection_get_setting_802_1x (connection);
if (!nm_supplicant_config_add_setting_8021x (config, security, con_path, TRUE)) { if (!nm_supplicant_config_add_setting_8021x (config, security, con_uuid, TRUE)) {
nm_log_warn (LOGD_DEVICE, "Couldn't add 802.1X security setting to supplicant config."); nm_log_warn (LOGD_DEVICE, "Couldn't add 802.1X security setting to supplicant config.");
g_object_unref (config); g_object_unref (config);
config = NULL; config = NULL;

8
src/nm-device-wifi.c
View file

@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* Copyright (C) 2005 - 2011 Red Hat, Inc. * Copyright (C) 2005 - 2012 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc. * Copyright (C) 2006 - 2008 Novell, Inc.
*/ */
@ -2391,14 +2391,14 @@ build_supplicant_config (NMDeviceWifi *self,
s_wireless_sec = nm_connection_get_setting_wireless_security (connection); s_wireless_sec = nm_connection_get_setting_wireless_security (connection);
if (s_wireless_sec) { if (s_wireless_sec) {
NMSetting8021x *s_8021x; NMSetting8021x *s_8021x;
const char *con_path = nm_connection_get_path (connection); const char *con_uuid = nm_connection_get_uuid (connection);
g_assert (con_path); g_assert (con_uuid);
s_8021x = nm_connection_get_setting_802_1x (connection); s_8021x = nm_connection_get_setting_802_1x (connection);
if (!nm_supplicant_config_add_setting_wireless_security (config, if (!nm_supplicant_config_add_setting_wireless_security (config,
s_wireless_sec, s_wireless_sec,
s_8021x, s_8021x,
con_path)) { con_uuid)) {
nm_log_err (LOGD_WIFI, "Couldn't add 802-11-wireless-security setting to " nm_log_err (LOGD_WIFI, "Couldn't add 802-11-wireless-security setting to "
"supplicant config."); "supplicant config.");
goto error; goto error;

24
src/supplicant-manager/nm-supplicant-config.c
View file

@ -584,7 +584,7 @@ gboolean
nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self, nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self,
NMSettingWirelessSecurity *setting, NMSettingWirelessSecurity *setting,
NMSetting8021x *setting_8021x, NMSetting8021x *setting_8021x,
const char *connection_uid) const char *con_uuid)
{ {
char *value; char *value;
gboolean success; gboolean success;
@ -593,7 +593,7 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self,
g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), FALSE); g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), FALSE);
g_return_val_if_fail (setting != NULL, FALSE); g_return_val_if_fail (setting != NULL, FALSE);
g_return_val_if_fail (connection_uid != NULL, FALSE); g_return_val_if_fail (con_uuid != NULL, FALSE);
key_mgmt = nm_setting_wireless_security_get_key_mgmt (setting); key_mgmt = nm_setting_wireless_security_get_key_mgmt (setting);
if (!add_string_val (self, key_mgmt, "key_mgmt", TRUE, FALSE)) if (!add_string_val (self, key_mgmt, "key_mgmt", TRUE, FALSE))
@ -693,7 +693,7 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self,
if (!strcmp (key_mgmt, "ieee8021x") || !strcmp (key_mgmt, "wpa-eap")) { if (!strcmp (key_mgmt, "ieee8021x") || !strcmp (key_mgmt, "wpa-eap")) {
if (!setting_8021x) if (!setting_8021x)
return FALSE; return FALSE;
if (!nm_supplicant_config_add_setting_8021x (self, setting_8021x, connection_uid, FALSE)) if (!nm_supplicant_config_add_setting_8021x (self, setting_8021x, con_uuid, FALSE))
return FALSE; return FALSE;
} }
@ -712,7 +712,7 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self,
gboolean gboolean
nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
NMSetting8021x *setting, NMSetting8021x *setting,
const char *connection_uid, const char *con_uuid,
gboolean wired) gboolean wired)
{ {
char *tmp; char *tmp;
@ -726,7 +726,7 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), FALSE); g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), FALSE);
g_return_val_if_fail (setting != NULL, FALSE); g_return_val_if_fail (setting != NULL, FALSE);
g_return_val_if_fail (connection_uid != NULL, FALSE); g_return_val_if_fail (con_uuid != NULL, FALSE);
value = nm_setting_802_1x_get_password (setting); value = nm_setting_802_1x_get_password (setting);
if (value) { if (value) {
@ -851,7 +851,7 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
* If provisioning is allowed, use an blob format. * If provisioning is allowed, use an blob format.
*/ */
if (fast_provisoning_allowed) { if (fast_provisoning_allowed) {
char *blob_name = g_strdup_printf ("blob://pac-blob-%s", connection_uid); char *blob_name = g_strdup_printf ("blob://pac-blob-%s", con_uuid);
if (!add_string_val (self, blob_name, "pac_file", FALSE, FALSE)) { if (!add_string_val (self, blob_name, "pac_file", FALSE, FALSE)) {
g_free (blob_name); g_free (blob_name);
return FALSE; return FALSE;
@ -883,7 +883,7 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
switch (nm_setting_802_1x_get_ca_cert_scheme (setting)) { switch (nm_setting_802_1x_get_ca_cert_scheme (setting)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB: case NM_SETTING_802_1X_CK_SCHEME_BLOB:
array = nm_setting_802_1x_get_ca_cert_blob (setting); array = nm_setting_802_1x_get_ca_cert_blob (setting);
ADD_BLOB_VAL (array, "ca_cert", connection_uid); ADD_BLOB_VAL (array, "ca_cert", con_uuid);
break; break;
case NM_SETTING_802_1X_CK_SCHEME_PATH: case NM_SETTING_802_1X_CK_SCHEME_PATH:
path = nm_setting_802_1x_get_ca_cert_path (setting); path = nm_setting_802_1x_get_ca_cert_path (setting);
@ -898,7 +898,7 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
switch (nm_setting_802_1x_get_phase2_ca_cert_scheme (setting)) { switch (nm_setting_802_1x_get_phase2_ca_cert_scheme (setting)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB: case NM_SETTING_802_1X_CK_SCHEME_BLOB:
array = nm_setting_802_1x_get_phase2_ca_cert_blob (setting); array = nm_setting_802_1x_get_phase2_ca_cert_blob (setting);
ADD_BLOB_VAL (array, "ca_cert2", connection_uid); ADD_BLOB_VAL (array, "ca_cert2", con_uuid);
break; break;
case NM_SETTING_802_1X_CK_SCHEME_PATH: case NM_SETTING_802_1X_CK_SCHEME_PATH:
path = nm_setting_802_1x_get_phase2_ca_cert_path (setting); path = nm_setting_802_1x_get_phase2_ca_cert_path (setting);
@ -926,7 +926,7 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
switch (nm_setting_802_1x_get_private_key_scheme (setting)) { switch (nm_setting_802_1x_get_private_key_scheme (setting)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB: case NM_SETTING_802_1X_CK_SCHEME_BLOB:
array = nm_setting_802_1x_get_private_key_blob (setting); array = nm_setting_802_1x_get_private_key_blob (setting);
ADD_BLOB_VAL (array, "private_key", connection_uid); ADD_BLOB_VAL (array, "private_key", con_uuid);
added = TRUE; added = TRUE;
break; break;
case NM_SETTING_802_1X_CK_SCHEME_PATH: case NM_SETTING_802_1X_CK_SCHEME_PATH:
@ -964,7 +964,7 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
switch (nm_setting_802_1x_get_client_cert_scheme (setting)) { switch (nm_setting_802_1x_get_client_cert_scheme (setting)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB: case NM_SETTING_802_1X_CK_SCHEME_BLOB:
array = nm_setting_802_1x_get_client_cert_blob (setting); array = nm_setting_802_1x_get_client_cert_blob (setting);
ADD_BLOB_VAL (array, "client_cert", connection_uid); ADD_BLOB_VAL (array, "client_cert", con_uuid);
break; break;
case NM_SETTING_802_1X_CK_SCHEME_PATH: case NM_SETTING_802_1X_CK_SCHEME_PATH:
path = nm_setting_802_1x_get_client_cert_path (setting); path = nm_setting_802_1x_get_client_cert_path (setting);
@ -982,7 +982,7 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
switch (nm_setting_802_1x_get_phase2_private_key_scheme (setting)) { switch (nm_setting_802_1x_get_phase2_private_key_scheme (setting)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB: case NM_SETTING_802_1X_CK_SCHEME_BLOB:
array = nm_setting_802_1x_get_phase2_private_key_blob (setting); array = nm_setting_802_1x_get_phase2_private_key_blob (setting);
ADD_BLOB_VAL (array, "private_key2", connection_uid); ADD_BLOB_VAL (array, "private_key2", con_uuid);
added = TRUE; added = TRUE;
break; break;
case NM_SETTING_802_1X_CK_SCHEME_PATH: case NM_SETTING_802_1X_CK_SCHEME_PATH:
@ -1020,7 +1020,7 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
switch (nm_setting_802_1x_get_phase2_client_cert_scheme (setting)) { switch (nm_setting_802_1x_get_phase2_client_cert_scheme (setting)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB: case NM_SETTING_802_1X_CK_SCHEME_BLOB:
array = nm_setting_802_1x_get_phase2_client_cert_blob (setting); array = nm_setting_802_1x_get_phase2_client_cert_blob (setting);
ADD_BLOB_VAL (array, "client_cert2", connection_uid); ADD_BLOB_VAL (array, "client_cert2", con_uuid);
break; break;
case NM_SETTING_802_1X_CK_SCHEME_PATH: case NM_SETTING_802_1X_CK_SCHEME_PATH:
path = nm_setting_802_1x_get_phase2_client_cert_path (setting); path = nm_setting_802_1x_get_phase2_client_cert_path (setting);

6
src/supplicant-manager/nm-supplicant-config.h
View file

@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* Copyright (C) 2006 - 2008 Red Hat, Inc. * Copyright (C) 2006 - 2012 Red Hat, Inc.
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
@ -70,13 +70,13 @@ gboolean nm_supplicant_config_add_setting_wireless (NMSupplicantConfig *self,
gboolean nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self, gboolean nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self,
NMSettingWirelessSecurity *setting, NMSettingWirelessSecurity *setting,
NMSetting8021x *setting_8021x, NMSetting8021x *setting_8021x,
const char *connection_uid); const char *con_uuid);
gboolean nm_supplicant_config_add_no_security (NMSupplicantConfig *self); gboolean nm_supplicant_config_add_no_security (NMSupplicantConfig *self);
gboolean nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, gboolean nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
NMSetting8021x *setting, NMSetting8021x *setting,
const char *connection_uid, const char *con_uuid,
gboolean wired); gboolean wired);
G_END_DECLS G_END_DECLS