diff options
| author | Michael Biebl <biebl@debian.org> | 2019-11-25 18:54:42 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-11-25 18:54:42 +0100 |
| commit | 56e2e0e97cd4786bf3b1f7fd607d4a9e4fc6bc8d (patch) | |
| tree | 43de6f27b10e23ff907dbe4e2c8fe0e52f01b13b /src/NetworkManagerUtils.c | |
| parent | 85b54c33239239aa9ec8ff2f128f25a72dd587e1 (diff) | |
| parent | e22609983008e1a669196ad64ba3a59ae8c76e0d (diff) | |
Update upstream source from tag 'upstream/1.20.8'
Update to upstream version '1.20.8' with Debian dir 5fbac145116049621c01e7eb75da24ed4f79d25e
Diffstat (limited to 'src/NetworkManagerUtils.c')
| -rw-r--r-- | src/NetworkManagerUtils.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 1773405d..c33f36ec 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -359,11 +359,12 @@ check_ip6_method (NMConnection *orig, */ allow = TRUE; } else if ( NM_IN_STRSET (orig_ip6_method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL, + NM_SETTING_IP6_CONFIG_METHOD_DISABLED, NM_SETTING_IP6_CONFIG_METHOD_AUTO) && nm_streq0 (candidate_ip6_method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) { - /* If the generated connection method is 'link-local' or 'auto' and the candidate - * method is 'ignore' we can take the connection, because NM didn't simply take care - * of IPv6. + /* If the generated connection method is 'link-local', disabled' or 'auto' and + * the candidate method is 'ignore' we can take the connection, because NM didn't + * simply take care of IPv6. */ allow = TRUE; } |