about summary refs log tree commit diff
path: root/src/nm-policy.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2019-02-26 19:02:28 +0100
committerMichael Biebl <biebl@debian.org>2019-02-26 19:02:28 +0100
commit439c9d76f576ae28c73571d444c59d9e95e5ad11 (patch)
tree7591e0b43641131fc049d6d7a0bd19e9e4964a40 /src/nm-policy.c
parent12aead6b161a3312673ac62686af0350061c0666 (diff)
parent964ae8cc391520440cf5aa13e2b9cc34850ea6c2 (diff)
Update upstream source from tag 'upstream/1.14.6'
Update to upstream version '1.14.6'
with Debian dir ef09251bb8b7a4afa8e2b004d785517d8a2d973d
Diffstat (limited to 'src/nm-policy.c')
-rw-r--r--src/nm-policy.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 7f8c665c..a5960105 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -1751,17 +1751,14 @@ device_state_changed (NMDevice *device,
 	NMSettingConnection *s_con = NULL;
 
 	switch (nm_device_state_reason_check (reason)) {
-	case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED:
-	case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING:
-	case NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED:
 	case NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED:
 	case NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED:
-	case NM_DEVICE_STATE_REASON_GSM_SIM_WRONG:
 	case NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT:
-	case NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED:
 	case NM_DEVICE_STATE_REASON_GSM_APN_FAILED:
-		/* Block autoconnect of the just-failed connection for situations
-		 * where a retry attempt would just fail again.
+		/* Block autoconnection at settings level if there is any settings-specific
+		 * error reported by the modem (e.g. wrong SIM-PIN or wrong APN). Do not block
+		 * autoconnection at settings level for errors in the device domain (e.g.
+		 * a missing SIM or wrong modem initialization).
 		 */
 		if (sett_conn) {
 			nm_settings_connection_autoconnect_blocked_reason_set (sett_conn,