diff options
Diffstat (limited to 'net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch')
| -rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch index 3ace78b..fdac9fa 100644 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch +++ b/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch @@ -1,19 +1,19 @@ -From 11adb5feaf8fff565ed16127a040a2a643be412f Mon Sep 17 00:00:00 2001 +From 01cf3d5ead78786fb05921da18feeda985a05bac Mon Sep 17 00:00:00 2001 From: Mu Qiao <qiaomuf@gentoo.org> Date: Wed, 5 Jan 2011 13:30:08 +0800 Subject: [PATCH] Support shared and link-local method for ipv4 Signed-off-by: Mu Qiao <qiaomuf@gentoo.org> --- - system-settings/plugins/ifnet/connection_parser.c | 74 +++++++++++++++----- + system-settings/plugins/ifnet/connection_parser.c | 77 +++++++++++++++----- system-settings/plugins/ifnet/net_parser.c | 12 +++- system-settings/plugins/ifnet/net_utils.c | 4 + .../plugins/ifnet/nm-ifnet-connection.c | 8 ++- system-settings/plugins/ifnet/wpa_parser.c | 17 +++-- - 5 files changed, 84 insertions(+), 31 deletions(-) + 5 files changed, 85 insertions(+), 33 deletions(-) diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c -index f9fae51..703059d 100644 +index f9fae51..a755ec8 100644 --- a/system-settings/plugins/ifnet/connection_parser.c +++ b/system-settings/plugins/ifnet/connection_parser.c @@ -557,7 +557,7 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error) @@ -132,7 +132,7 @@ index f9fae51..703059d 100644 if (auth_alg) { if (!strcmp (auth_alg, "shared")) -@@ -2180,8 +2211,11 @@ write_wireless_security_setting (NMConnection * connection, +@@ -2180,12 +2211,14 @@ write_wireless_security_setting (NMConnection * connection, g_string_append (quoted, psk); g_string_append_c (quoted, '"'); } @@ -145,8 +145,13 @@ index f9fae51..703059d 100644 + PLUGIN_WARN (IFNET_PLUGIN_NAME, "Use WPA, but no psk received from NM"); if (quoted) g_string_free (quoted, TRUE); - } else -@@ -2443,8 +2477,12 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name, +- } else +- wpa_set_data (conn_name, "psk", NULL); ++ } + + return TRUE; + } +@@ -2443,8 +2476,12 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name, } ifnet_set_data (conn_name, "config", ips->str); g_string_free (ips, TRUE); |