diff options
Diffstat (limited to 'src/libnm-core-impl')
| -rw-r--r-- | src/libnm-core-impl/nm-setting-ip6-config.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/libnm-core-impl/nm-setting-ip6-config.c b/src/libnm-core-impl/nm-setting-ip6-config.c index 335700bf..2dbf7a34 100644 --- a/src/libnm-core-impl/nm-setting-ip6-config.c +++ b/src/libnm-core-impl/nm-setting-ip6-config.c @@ -963,11 +963,9 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) * 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary * addresses). * - * If set to "-1" (unknown) for a connection, the value is taken from the - * global "ipv6.ip6-privacy" setting. If the global setting is unspecified - * or also set to "-1", the value is set from the original value of - * "/proc/sys/net/ipv6/conf/<iface>/use_tempaddr" from before NetworkManager - * started. + * Having a per-connection setting set to "-1" (default) means fallback to + * global configuration "ipv6.ip6-privacy". If it's also unspecified or set + * to "-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr". * * Note that this setting is distinct from the Stable Privacy addresses * that can be enabled with the "addr-gen-mode" property's "stable-privacy" @@ -999,11 +997,10 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) * * The valid lifetime of autogenerated temporary addresses, in seconds. * - * If set to "0" (unknown) for a connection, the value is taken from the - * global "ipv6.temp-valid-lifetime" setting. If the global setting is - * unspecified or also set to "0", the value is set from the original value - * of "/proc/sys/net/ipv6/conf/<iface>/temp_valid_lft" from before - * NetworkManager started. + * Having a per-connection setting set to "0" (default) means fallback to + * global configuration "ipv6.temp-valid-lifetime" setting". If it's also + * unspecified or set to "0", fallback to read + * "/proc/sys/net/ipv6/conf/default/temp_valid_lft". * * Since: 1.48 **/ @@ -1023,11 +1020,10 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) * * The preferred lifetime of autogenerated temporary addresses, in seconds. * - * If set to "0" (unknown) for a connection, the value is taken from the - * global "ipv6.temp-preferred-lifetime" setting. If the global setting is - * unspecified or also set to "0", the value is set from the original value - * of "/proc/sys/net/ipv6/conf/<iface>/temp_prefered_lft" from before - * NetworkManager started. + * Having a per-connection setting set to "0" (default) means fallback to + * global configuration "ipv6.temp-preferred-lifetime" setting". If it's also + * unspecified or set to "0", fallback to read + * "/proc/sys/net/ipv6/conf/default/temp_prefered_lft". * * Since: 1.48 **/ |