New upstream version 1.42.2 upstream/1.42.2

1 files changed, 28 insertions, 2 deletions

diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html
index 96bd6976..1ce7840d 100644
--- a/docs/api/html/nm-settings-dbus.html
+++ b/docs/api/html/nm-settings-dbus.html
@@ -1726,7 +1726,13 @@ When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0),
 <a name="nm-settings-dbus.property.ipv4.dhcp-iaid"></a>dhcp-iaid</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.</td>
+<td>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or or as colon separated hexadecimal numbers). Alternatively it can be set to the special values "mac", "perm-mac", "ifname" or "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname".
+
+For DHCPv4, the IAID is only used with "ipv4.dhcp-client-id" values "duid" and "ipv6-duid" to generate the client-id.
+
+For DHCPv6, note that at the moment this property is only supported by the "internal" DHCPv6 plugin. The "dhclient" DHCPv6 plugin always derives the IAID from the MAC address.
+
+The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device.</td>
 </tr>
 <tr>
 <td align="left">
@@ -1888,6 +1894,13 @@ For IPv4 method "shared", the IP subnet can be configured by adding one manual I
 </tr>
 <tr>
 <td align="left">
+<a name="nm-settings-dbus.property.ipv4.replace-local-rule"></a>replace-local-rule</td>
+<td align="left">NMTernary (int32)</td>
+<td align="left"> </td>
+<td>Connections will default to keep the autogenerated priority 0 local rule unless this setting is set to TRUE.</td>
+</tr>
+<tr>
+<td align="left">
 <a name="nm-settings-dbus.property.ipv4.required-timeout"></a>required-timeout</td>
 <td align="left">int32</td>
 <td align="left">-1</td>
@@ -2050,7 +2063,13 @@ When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0),
 <a name="nm-settings-dbus.property.ipv6.dhcp-iaid"></a>dhcp-iaid</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.</td>
+<td>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or or as colon separated hexadecimal numbers). Alternatively it can be set to the special values "mac", "perm-mac", "ifname" or "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname".
+
+For DHCPv4, the IAID is only used with "ipv4.dhcp-client-id" values "duid" and "ipv6-duid" to generate the client-id.
+
+For DHCPv6, note that at the moment this property is only supported by the "internal" DHCPv6 plugin. The "dhclient" DHCPv6 plugin always derives the IAID from the MAC address.
+
+The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device.</td>
 </tr>
 <tr>
 <td align="left">
@@ -2225,6 +2244,13 @@ Set to 2147483647 (MAXINT32) for infinity.</td>
 </tr>
 <tr>
 <td align="left">
+<a name="nm-settings-dbus.property.ipv6.replace-local-rule"></a>replace-local-rule</td>
+<td align="left">NMTernary (int32)</td>
+<td align="left"> </td>
+<td>Connections will default to keep the autogenerated priority 0 local rule unless this setting is set to TRUE.</td>
+</tr>
+<tr>
+<td align="left">
 <a name="nm-settings-dbus.property.ipv6.required-timeout"></a>required-timeout</td>
 <td align="left">int32</td>
 <td align="left">-1</td>