diff options
author | Simon Farnsworth <simon.farnsworth@onelan.co.uk> | 2014-07-23 14:12:06 -0500 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2014-07-23 14:31:21 -0500 |
commit | 155cd790f37fbb34f8d55a46730cfab54379115c (patch) | |
tree | 50f3d97d46fe655656dd9417ce0f2fd275d27a09 | |
parent | 0151df2f0a8c8f2f8d57e9fbfccc48cf4fae2317 (diff) | |
download | NetworkManager-155cd790f37fbb34f8d55a46730cfab54379115c.tar.gz |
wwan: allow completing new GSM connections without an APN (bgo #729665)
In commit 215306f5 [1], NetworkManager was changed to require an APN for GSM
connections; previously, an omitted APN was taken as "use the default APN
for this device".
ModemManager supports this behaviour with an empty APN string; older
NetworkManager versions support this behaviour with no APN in the
settings. Choose the older NM behaviour, for backwards compatibility.
[1] commit 215306f5a1e4dc38ec02a484c31470bb048d668b
Author: Dan Williams <dcbw@redhat.com>
Date: Mon Jan 10 23:39:12 2011 -0600
core: add AddAndActivate D-Bus method
Given connection details, complete the connection as well as possible
using the given specific object and device, add it to system
settings, and activate it all in one method.
Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
https://bugzilla.gnome.org/show_bug.cgi?id=729665
-rw-r--r-- | src/devices/wwan/nm-modem-broadband.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index 4ea477d4ac..22ddaed0ba 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -463,8 +463,8 @@ complete_connection (NMModem *_self, NMSettingGsm *s_gsm; s_gsm = nm_connection_get_setting_gsm (connection); - if (!s_gsm || !nm_setting_gsm_get_apn (s_gsm)) { - /* Need an APN at least */ + if (!s_gsm) { + /* Need a GSM setting at least */ g_set_error_literal (error, NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR_MISSING_PROPERTY, |