diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-11-18 14:40:37 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-11-18 14:40:37 +0000 |
| commit | fcf593dc096473ba2833372ae62e5a2c1bcf0f04 (patch) | |
| tree | 06b2fb960902463a225c2bf0b1716764a6227514 | |
| parent | 2eda40574330c9e21ed9b11747232385c7119eea (diff) | |
| download | NetworkManager-fcf593dc096473ba2833372ae62e5a2c1bcf0f04.tar.gz | |
2008-11-17 Dan Williams <dcbw@redhat.com>
* src/nm-hso-gsm-device.c
- (real_connection_secrets_updated): handle PIN/PUK correctly for HSO
devices
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4296 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/nm-hso-gsm-device.c | 9 |
2 files changed, 13 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2008-11-17 Dan Williams <dcbw@redhat.com> + * src/nm-hso-gsm-device.c + - (real_connection_secrets_updated): handle PIN/PUK correctly for HSO + devices + +2008-11-17 Dan Williams <dcbw@redhat.com> + * system-settings/plugins/ifcfg-fedora/reader.c - (read_mac_address): clean up - (make_wireless_setting): pass NULL array to read_mac_address() like it diff --git a/src/nm-hso-gsm-device.c b/src/nm-hso-gsm-device.c index c42858eed5..15032a3c15 100644 --- a/src/nm-hso-gsm-device.c +++ b/src/nm-hso-gsm-device.c @@ -404,10 +404,15 @@ real_connection_secrets_updated (NMDevice *device, GSList *updated_settings, RequestSecretsCaller caller) { - g_return_if_fail (caller == SECRETS_CALLER_HSO_GSM); g_return_if_fail (nm_device_get_state (device) == NM_DEVICE_STATE_NEED_AUTH); - nm_device_activate_schedule_stage2_device_config (device); + if (caller == SECRETS_CALLER_HSO_GSM) { /* HSO PPP auth */ + nm_device_activate_schedule_stage2_device_config (device); + return; + } + + /* Let parent handle other auth like PIN/PUK */ + NM_DEVICE_CLASS (nm_hso_gsm_device_parent_class)->connection_secrets_updated (device, connection, updated_settings, caller); } static void |