diff options
| author | Dan Winship <danw@gnome.org> | 2014-05-20 12:49:49 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-06-04 11:23:54 -0400 |
| commit | d47b749a7592d726853577f1a68f3baa4c46254b (patch) | |
| tree | 0f6e4a8de05e784c438d5d0bf3e52cd128b305f4 | |
| parent | 43e4b1b6f786e0e3482d15415f9b0d53bd3a1b1e (diff) | |
| download | NetworkManager-d47b749a7592d726853577f1a68f3baa4c46254b.tar.gz | |
libnm-utils: remove INFERRABLE flag from properties we don't actually infer
ipv4.never-default, ipv4.may-fail, and ipv6.privacy were marked
INFERRABLE, but NMIP4Config / NMIP6Config didn't actually infer them,
so they could cause connections to not match themselves after a
restart.
(Found while debugging https://bugzilla.redhat.com/show_bug.cgi?id=1086237,
though this is not actually the problem there.)
Related: rh#1086237
| -rw-r--r-- | libnm-util/nm-setting-ip4-config.c | 4 | ||||
| -rw-r--r-- | libnm-util/nm-setting-ip6-config.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index 9e7e8204cc..9dc7fd95bc 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -1484,7 +1484,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "IPv4 connection, meaning it will never be assigned " "the default route by NetworkManager.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingIP4Config:may-fail: @@ -1509,7 +1509,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "configuration to succeed if IPv4 configuration " "fails but IPv6 configuration completes successfully.", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); } diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 721d69b2c1..0d751c4257 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -1292,7 +1292,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); } /********************************************************************/ |