- nm: fix PPPoE connection authentication (rh #532862)
This commit is contained in:
parent
df8cb9405b
commit
a24f1b3662
|
@ -16,7 +16,7 @@ Name: NetworkManager
|
||||||
Summary: Network connection manager and user applications
|
Summary: Network connection manager and user applications
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 0.7.996
|
Version: 0.7.996
|
||||||
Release: 5%{snapshot}%{?dist}
|
Release: 6%{snapshot}%{?dist}
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.gnome.org/projects/NetworkManager/
|
URL: http://www.gnome.org/projects/NetworkManager/
|
||||||
|
@ -27,6 +27,7 @@ Source2: nm-system-settings.conf
|
||||||
Patch1: nm-applet-internal-buildfixes.patch
|
Patch1: nm-applet-internal-buildfixes.patch
|
||||||
Patch2: explain-dns1-dns2.patch
|
Patch2: explain-dns1-dns2.patch
|
||||||
Patch3: nm-applet-no-notifications.patch
|
Patch3: nm-applet-no-notifications.patch
|
||||||
|
Patch4: pppoe-auth-fix-82011dff04123d.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
PreReq: chkconfig
|
PreReq: chkconfig
|
||||||
|
@ -153,6 +154,7 @@ tar -xjf %{SOURCE1}
|
||||||
%patch1 -p1 -b .buildfix
|
%patch1 -p1 -b .buildfix
|
||||||
%patch2 -p1 -b .explain-dns1-dns2
|
%patch2 -p1 -b .explain-dns1-dns2
|
||||||
%patch3 -p1 -b .no-notifications
|
%patch3 -p1 -b .no-notifications
|
||||||
|
%patch4 -p1 -b .pppoe-authfix
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
@ -356,6 +358,9 @@ fi
|
||||||
%{_datadir}/gtk-doc/html/libnm-util/*
|
%{_datadir}/gtk-doc/html/libnm-util/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 04 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-6.git20091021
|
||||||
|
- nm: fix PPPoE connection authentication (rh #532862)
|
||||||
|
|
||||||
* Wed Oct 21 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-5.git20091021
|
* Wed Oct 21 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-5.git20091021
|
||||||
- install: better fix for (rh #526519)
|
- install: better fix for (rh #526519)
|
||||||
- install: don't build Bluetooth bits on s390 (rh #529854)
|
- install: don't build Bluetooth bits on s390 (rh #529854)
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
diff -up NetworkManager-0.7.996/src/nm-device-ethernet.c.foo NetworkManager-0.7.996/src/nm-device-ethernet.c
|
||||||
|
--- NetworkManager-0.7.996/src/nm-device-ethernet.c.foo 2009-11-04 14:14:04.101920888 -0800
|
||||||
|
+++ NetworkManager-0.7.996/src/nm-device-ethernet.c 2009-11-04 14:16:34.668863437 -0800
|
||||||
|
@@ -621,6 +621,9 @@ real_get_best_auto_connection (NMDevice
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#define IS_ACTIVATING_STATE(state) \
|
||||||
|
+ (state > NM_DEVICE_STATE_DISCONNECTED && state < NM_DEVICE_STATE_ACTIVATED)
|
||||||
|
+
|
||||||
|
static void
|
||||||
|
real_connection_secrets_updated (NMDevice *dev,
|
||||||
|
NMConnection *connection,
|
||||||
|
@@ -632,8 +635,7 @@ real_connection_secrets_updated (NMDevic
|
||||||
|
gboolean valid = FALSE;
|
||||||
|
GSList *iter;
|
||||||
|
|
||||||
|
- if (nm_device_get_state (dev) != NM_DEVICE_STATE_NEED_AUTH)
|
||||||
|
- return;
|
||||||
|
+ g_return_if_fail (IS_ACTIVATING_STATE (nm_device_get_state (dev)));
|
||||||
|
|
||||||
|
/* PPPoE? */
|
||||||
|
if (caller == SECRETS_CALLER_PPP) {
|
||||||
|
@@ -663,6 +665,7 @@ real_connection_secrets_updated (NMDevic
|
||||||
|
|
||||||
|
/* Only caller could be ourselves for 802.1x */
|
||||||
|
g_return_if_fail (caller == SECRETS_CALLER_ETHERNET);
|
||||||
|
+ g_return_if_fail (nm_device_get_state (dev) == NM_DEVICE_STATE_NEED_AUTH);
|
||||||
|
|
||||||
|
for (iter = updated_settings; iter; iter = g_slist_next (iter)) {
|
||||||
|
const char *setting_name = (const char *) iter->data;
|
Loading…
Reference in New Issue