[network-manager-applet] editor: fix crash editing wired 802.1x connections
- From: Dan Williams <dcbw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [network-manager-applet] editor: fix crash editing wired 802.1x connections
- Date: Fri, 2 Oct 2009 19:47:57 +0000 (UTC)
commit 8515a07e507847c4372fe8f95bddf57aea66acd5
Author: Dan Williams <dcbw redhat com>
Date: Fri Oct 2 12:42:14 2009 -0700
editor: fix crash editing wired 802.1x connections
With the updates to ignore CA cert logic as part of
b16d8acaeaf3771c953439022300cca41865aaae the EAP methods now need
a valid 'connection' setting passed to them, which the wired
page's fill_connection() function wasn't doing.
src/connection-editor/page-wired-security.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/src/connection-editor/page-wired-security.c b/src/connection-editor/page-wired-security.c
index 766ec62..918cf9e 100644
--- a/src/connection-editor/page-wired-security.c
+++ b/src/connection-editor/page-wired-security.c
@@ -143,9 +143,18 @@ validate (CEPage *page, NMConnection *connection, GError **error)
/* FIXME: get failed property and error out of wireless security objects */
valid = wireless_security_validate (priv->security, NULL);
if (valid) {
+ NMSetting *s_con;
+
/* Here's a nice hack to work around the fact that ws_802_1x_fill_connection needs wireless setting. */
tmp_connection = nm_connection_new ();
nm_connection_add_setting (tmp_connection, nm_setting_wireless_new ());
+
+ /* temp connection needs a 'connection' setting too, since most of
+ * the EAP methods need the UUID for CA cert ignore stuff.
+ */
+ s_con = nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
+ nm_connection_add_setting (tmp_connection, nm_setting_duplicate (s_con));
+
ws_802_1x_fill_connection (priv->security, "wpa_eap_auth_combo", tmp_connection);
s_8021x = nm_connection_get_setting (tmp_connection, NM_TYPE_SETTING_802_1X);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]