summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/nm-hso-gsm-device.c9
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a7f6c65ca..bdd73c360e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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