New upstream version 1.50.1 upstream/1.50.1

5 files changed, 46 insertions, 15 deletions

diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c
index 3298dce6..33d088bb 100644
--- a/src/libnm-core-impl/nm-setting-connection.c
+++ b/src/libnm-core-impl/nm-setting-connection.c
@@ -2154,7 +2154,15 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
      * property: uuid
      * variable: UUID(+)
      * description: UUID for the connection profile. When missing, NetworkManager
-     *   creates the UUID itself (by hashing the filename).
+     *   creates the UUID by hashing the connection filename.
+     * ---end---
+     */
+    /* ---keyfile---
+     * property: uuid
+     * variable: uuid
+     * description: UUID for the connection profile. When missing, NetworkManager
+     *   creates the UUID by hashing the connection filename.
+     * example: uuid=7bdbe39a-126c-3f94-ac5e-8f156ed38383
      * ---end---
      */
     _nm_setting_property_define_direct_string(properties_override,
diff --git a/src/libnm-core-impl/nm-setting-infiniband.c b/src/libnm-core-impl/nm-setting-infiniband.c
index 203e4b2b..24e5807a 100644
--- a/src/libnm-core-impl/nm-setting-infiniband.c
+++ b/src/libnm-core-impl/nm-setting-infiniband.c
@@ -346,7 +346,7 @@ nm_setting_infiniband_class_init(NMSettingInfinibandClass *klass)
      * property: mac-address
      * format: usual hex-digits-and-colons notation
      * description: MAC address in traditional hex-digits-and-colons notation, or
-     *   or semicolon separated list of 20 decimal bytes (obsolete)
+     *   semicolon separated list of 20 decimal bytes (obsolete)
      * example: mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01
      * ---end---
      */
diff --git a/src/libnm-core-impl/nm-setting-ip4-config.c b/src/libnm-core-impl/nm-setting-ip4-config.c
index c79d0fdf..6112137f 100644
--- a/src/libnm-core-impl/nm-setting-ip4-config.c
+++ b/src/libnm-core-impl/nm-setting-ip4-config.c
@@ -636,6 +636,7 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
 
     /* ---keyfile---
      * property: dns
+     * variable: dns
      * format: list of DNS IP addresses
      * description: List of DNS servers.
      * example: dns=1.2.3.4;8.8.8.8;8.8.4.4;
@@ -662,9 +663,15 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
     /* ---keyfile---
      * property: addresses
      * variable: address1, address2, ...
-     * format: address/plen
-     * description: List of static IP addresses.
-     * example: address1=192.168.100.100/24 address2=10.1.1.5/24
+     * format: address/prefix-length[,gateway]
+     * description: Static IPv4 addresses, one address per variable. The
+     *   variables can also contain the gateway after a comma or semicolon;
+     *   it is recommended to use the "gateway" variable instead.
+     * example: address1=192.168.100.100/24
+     *
+     *          address2=10.1.1.5/16
+     *
+     *          address1=192.168.100.100/24,192.168.100.1
      * ---end---
      */
     /* ---ifcfg-rh---
@@ -679,8 +686,12 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
      * property: gateway
      * variable: gateway
      * format: string
-     * description: Gateway IP addresses as a string.
-     * example: gateway=192.168.100.1
+     * description: Gateway IP address as a string. The gateway can be also specified in one
+     *   of the "address1", "address2", etc. variables after the address, separated by a comma or
+     *   semicolon (for example "address1=192.168.100.1/24,192.168.100.254").
+     *   The value from the "gateway" variable takes precedence over any gateway specified in one
+     *   of the "address*" variables.
+     * example: gateway=192.168.100.254
      * ---end---
      */
     /* ---ifcfg-rh---
@@ -722,7 +733,8 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
      * variable: routing-rule1, routing-rule2, ...
      * format: routing rule string
      * description: Routing rules as defined with `ip rule add`, but with mandatory
-     *    fixed priority.
+     *    fixed priority. The "lookup" and "table" options don't support a table name,
+     *    only a number.
      * example: routing-rule1=priority 5 from 192.167.4.0/24 table 45
      * ---end---
      */
@@ -1274,7 +1286,8 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
      *   A comma separated list of routing rules for policy routing. The format
      *   is based on <command>ip rule add</command> syntax and mostly compatible.
      *   One difference is that routing rules in NetworkManager always need a
-     *   fixed priority.
+     *   fixed priority. Also, the "lookup" and "table" options don't support a
+     *   table name, only a number.
      *   </para>
      *   <para>
      *   Example: <literal>priority 5 from 192.167.4.0/24 table 45</literal>
diff --git a/src/libnm-core-impl/nm-setting-ip6-config.c b/src/libnm-core-impl/nm-setting-ip6-config.c
index eddac9f1..32fb295f 100644
--- a/src/libnm-core-impl/nm-setting-ip6-config.c
+++ b/src/libnm-core-impl/nm-setting-ip6-config.c
@@ -745,9 +745,15 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass)
     /* ---keyfile---
      * property: addresses
      * variable: address1, address2, ...
-     * format: address/plen
-     * description: List of static IP addresses.
-     * example: address1=abbe::cafe/96 address2=2001::1234
+     * format: address/plen[,gateway]
+     * description: Static IPv6 addresses, one address per variable. The
+     *   variables can also contain the gateway after a comma or semicolon;
+     *   it is recommended to use the "gateway" variable instead.
+     * example: address1=abbe::cafe/96
+     *
+     *          address2=2001::1234/56
+     *
+     *          address1=fd01::2000/64;fd01::1
      * ---end---
      */
     /* ---ifcfg-rh---
@@ -763,7 +769,11 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass)
      * property: gateway
      * variable: gateway
      * format: string
-     * description: Gateway IP addresses as a string.
+     * description: Gateway IP address as a string. The gateway can be also specified in one
+     *   of the "address1", "address2", etc. variables after the address, separated by a comma or
+     *   semicolon (for example "address1=fd01::2000/64;fd01::1").
+     *   The value from the "gateway" variable takes precedence over any gateway specified in one
+     *   of the "address*" variables.
      * example: gateway=abbe::1
      * ---end---
      */
diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c
index f7f4e770..fea13a95 100644
--- a/src/libnm-core-impl/nm-utils.c
+++ b/src/libnm-core-impl/nm-utils.c
@@ -3626,10 +3626,10 @@ _nm_utils_check_module_file(const char               *name,
  *   Can be empty or %NULL, in which case only @try_first is checked.
  * @file_test_flags: the flags passed to g_file_test() when searching
  *   for @progname. Set it to 0 to skip the g_file_test().
- * @predicate: (scope call): if given, pass the file name to this function
+ * @predicate: (scope call) (closure user_data): if given, pass the file name to this function
  *   for additional checks. This check is performed after the check for
  *   @file_test_flags. You cannot omit both @file_test_flags and @predicate.
- * @user_data: (closure) (nullable): user data for @predicate function.
+ * @user_data: (nullable): user data for @predicate function.
  * @error: on failure, set a "not found" error %G_IO_ERROR %G_IO_ERROR_NOT_FOUND.
  *
  * Searches for a @progname file in a list of search @paths.