diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-10 16:55:24 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-10 16:55:24 +0200 |
| commit | e2a36bd6bec59f361b528ff861835e5bd2e6e39e (patch) | |
| tree | 1012dcbe6648a79986eebe427801575c06934bd4 | |
| parent | 255ac4364dac4260e20ee7cbbe2d4b97cc8cc350 (diff) | |
libmm-glib: allow 'none' authentication with more values
Specifying 'none' is really not exclusive. We may want to say that the modem can
either authenticate with a given protocol, or otherwise just try without
authentication.
The reality is that 'none' itself is usually always given in the connection
settings.
| -rw-r--r-- | libmm-glib/mm-common-helpers.c | 10 | ||||
| -rw-r--r-- | src/mm-modem-helpers-qmi.c | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/libmm-glib/mm-common-helpers.c b/libmm-glib/mm-common-helpers.c index f32a83a0..9cfb842e 100644 --- a/libmm-glib/mm-common-helpers.c +++ b/libmm-glib/mm-common-helpers.c @@ -462,16 +462,6 @@ mm_common_get_allowed_auth_from_string (const gchar *str, allowed_auth = MM_BEARER_ALLOWED_AUTH_UNKNOWN; } - /* 'none' is a special value which, if given, must be given alone */ - if (allowed_auth & MM_BEARER_ALLOWED_AUTH_NONE && - allowed_auth != MM_BEARER_ALLOWED_AUTH_NONE) { - g_set_error (error, - MM_CORE_ERROR, - MM_CORE_ERROR_INVALID_ARGS, - "Allowed auth 'none' cannot be given along with other values"); - allowed_auth = MM_BEARER_ALLOWED_AUTH_UNKNOWN; - } - g_type_class_unref (flags_class); g_strfreev (strings); return allowed_auth; diff --git a/src/mm-modem-helpers-qmi.c b/src/mm-modem-helpers-qmi.c index 84935877..0178fe93 100644 --- a/src/mm-modem-helpers-qmi.c +++ b/src/mm-modem-helpers-qmi.c @@ -887,7 +887,7 @@ mm_bearer_allowed_auth_to_qmi_authentication (MMBearerAllowedAuth auth) { QmiWdsAuthentication out; - out = 0; + out = QMI_WDS_AUTHENTICATION_NONE; if (auth & MM_BEARER_ALLOWED_AUTH_PAP) out |= QMI_WDS_AUTHENTICATION_PAP; if (auth & MM_BEARER_ALLOWED_AUTH_CHAP) |