From 905cf30b51917e37ea074e5f3d83436a107d01c5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 16 Apr 2015 16:35:32 +0200 Subject: [PATCH] libnm/doc: document behavior of setting ip6-privacy in /etc/sysctl.conf https://bugzilla.gnome.org/show_bug.cgi?id=721200 (cherry picked from commit e4293788fcfd8f0026fed2c90aa6e1b02a3036d7) --- libnm-core/nm-setting-ip6-config.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index 29ca551525..fa9eb1500e 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -504,9 +504,13 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class) * enabled, it makes the kernel generate a temporary IPv6 address in * addition to the public one generated from MAC address via modified * EUI-64. This enhances privacy, but could cause problems in some - * applications, on the other hand. The permitted values are: 0: disabled, - * 1: enabled (prefer public address), 2: enabled (prefer temporary + * applications, on the other hand. The permitted values are: -1: unknown, + * 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary * addresses). + * + * This per-connection value is ignored when setting + * "net.ipv6.conf.default.use_tempaddr" in /etc/sysctl.conf or + * /lib/sysctl.d/sysctl.conf to either "0", "1", or "2". **/ /* ---ifcfg-rh--- * property: ip6-privacy