diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-03 23:00:16 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-03 23:00:16 +0200 |
| commit | 511e94811644318cc196e197616fdc558030e8e3 (patch) | |
| tree | 1ea5c895be190982cc686d43ebed62ae33d60426 /src/nm-config-data.c | |
| parent | fb15332b981b5637ae4aeadc546e2f46bf333cd1 (diff) | |
| parent | d6201f5d8daada3d64a0a3e0038e14eebec683ce (diff) | |
Merge tag 'upstream/1.2.4'
Upstream version 1.2.4
Diffstat (limited to 'src/nm-config-data.c')
| -rw-r--r-- | src/nm-config-data.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nm-config-data.c b/src/nm-config-data.c index 1702b551..28057b47 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -1201,6 +1201,8 @@ nm_config_data_diff (NMConfigData *old_data, NMConfigData *new_data) if (!global_dns_equal (priv_old->global_dns, priv_new->global_dns)) changes |= NM_CONFIG_CHANGE_GLOBAL_DNS_CONFIG; + nm_assert (!NM_FLAGS_ANY (changes, NM_CONFIG_CHANGE_CAUSES)); + return changes; } |