From f2756b930ed6688347f583638100f3bd7d7fad58 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Fri, 10 Apr 2020 18:08:10 +0200
Subject: [PATCH 001/222] release: bump version to 1.25.0 (development)

---
 configure.ac                  |  4 ++--
 libnm-core/nm-version.h       | 14 ++++++++++++++
 meson.build                   |  2 +-
 shared/nm-version-macros.h.in |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9e511cd78a..5e8dca24a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,8 @@ dnl  - add corresponding NM_VERSION_x_y_z macros in
 dnl    "shared/nm-version-macros.h.in"
 dnl  - update number in meson.build
 m4_define([nm_major_version], [1])
-m4_define([nm_minor_version], [23])
-m4_define([nm_micro_version], [90])
+m4_define([nm_minor_version], [25])
+m4_define([nm_micro_version], [0])
 m4_define([nm_version],
           [nm_major_version.nm_minor_version.nm_micro_version])
 
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
index 195fc19684..203840376e 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -229,6 +229,20 @@
 # define NM_AVAILABLE_IN_1_24
 #endif
 
+#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_26
+# define NM_DEPRECATED_IN_1_26           G_DEPRECATED
+# define NM_DEPRECATED_IN_1_26_FOR(f)    G_DEPRECATED_FOR(f)
+#else
+# define NM_DEPRECATED_IN_1_26
+# define NM_DEPRECATED_IN_1_26_FOR(f)
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_26
+# define NM_AVAILABLE_IN_1_26            G_UNAVAILABLE(1,26)
+#else
+# define NM_AVAILABLE_IN_1_26
+#endif
+
 /*
  * Synchronous API for calling D-Bus in libnm is deprecated. See
  * https://developer.gnome.org/libnm/stable/usage.html#sync-api
diff --git a/meson.build b/meson.build
index 301ff20458..9946e26779 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project(
 #  - add corresponding NM_VERSION_x_y_z macros in
 #    "shared/nm-version-macros.h.in"
 #  - update number in configure.ac
-  version: '1.23.90',
+  version: '1.25.0',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in
index e97f506cb8..83da86ce10 100644
--- a/shared/nm-version-macros.h.in
+++ b/shared/nm-version-macros.h.in
@@ -64,6 +64,7 @@
 #define NM_VERSION_1_20   (NM_ENCODE_VERSION (1, 20, 0))
 #define NM_VERSION_1_22   (NM_ENCODE_VERSION (1, 22, 0))
 #define NM_VERSION_1_24   (NM_ENCODE_VERSION (1, 24, 0))
+#define NM_VERSION_1_26   (NM_ENCODE_VERSION (1, 26, 0))
 
 /* For releases, NM_API_VERSION is equal to NM_VERSION.
  *

From 4e73d715182ae1a19c19ccebc49047bf3ece6cea Mon Sep 17 00:00:00 2001
From: David Drinn <david.drinnan@bench.com>
Date: Fri, 10 Apr 2020 10:57:21 -0700
Subject: [PATCH 002/222] examples: fix copy/paste comment error from another
 script

https://github.com/NetworkManager/NetworkManager/pull/361
---
 examples/python/dbus/wifi-active-ap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/python/dbus/wifi-active-ap.py b/examples/python/dbus/wifi-active-ap.py
index 78673e76a2..790f11a9ef 100755
--- a/examples/python/dbus/wifi-active-ap.py
+++ b/examples/python/dbus/wifi-active-ap.py
@@ -5,7 +5,7 @@
 #
 
 #
-# This example starts or stops a wifi hotspot
+# This example prints the current wifi access point
 #
 # Configuration settings are described at
 # https://developer.gnome.org/NetworkManager/1.0/ref-settings.html

From 21a7e89061a4da8855dc6e605c443165b26e4416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sun, 12 Apr 2020 11:21:01 +0200
Subject: [PATCH 003/222] po: update Polish (pl) translation

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/467
---
 po/pl.po | 3104 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 1600 insertions(+), 1504 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 972ed0ef1a..537050539b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,18 +1,18 @@
 # Polish translation for NetworkManager.
-# Copyright © 2007-2019 the NetworkManager authors.
+# Copyright © 2007-2020 the NetworkManager authors.
 # This file is distributed under the same license as the NetworkManager package.
 # Wadim Dziedzic <wdziedzic@aviary.pl>, 2007-2008.
 # Artur Flinta <aflinta@at.kernel.pl>, 2007.
 # Tomasz Dominikowski <dominikowski@gmail.com>, 2008-2010.
-# Piotr Drąg <piotrdrag@gmail.com>, 2009-2019.
-# Aviary.pl <community-poland@mozilla.org>, 2007-2019.
+# Piotr Drąg <piotrdrag@gmail.com>, 2009-2020.
+# Aviary.pl <community-poland@mozilla.org>, 2007-2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-21 16:32+0100\n"
-"PO-Revision-Date: 2019-12-21 16:33+0100\n"
+"POT-Creation-Date: 2020-04-12 11:19+0200\n"
+"PO-Revision-Date: 2020-04-12 11:20+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: ../clients/cli/agent.c:23
+#: ../clients/cli/agent.c:22
 #, c-format
 msgid ""
 "Usage: nmcli agent { COMMAND | help }\n"
@@ -35,7 +35,7 @@ msgstr ""
 "POLECENIE := { secret | polkit | all }\n"
 "\n"
 
-#: ../clients/cli/agent.c:31
+#: ../clients/cli/agent.c:30
 #, c-format
 msgid ""
 "Usage: nmcli agent secret { help }\n"
@@ -54,7 +54,7 @@ msgstr ""
 "o hasło, jeśli jest wymagane.\n"
 "\n"
 
-#: ../clients/cli/agent.c:41
+#: ../clients/cli/agent.c:40
 #, c-format
 msgid ""
 "Usage: nmcli agent polkit { help }\n"
@@ -72,7 +72,7 @@ msgstr ""
 "i przekazuje odpowiedź do z powrotem do polkit.\n"
 "\n"
 
-#: ../clients/cli/agent.c:51
+#: ../clients/cli/agent.c:50
 #, c-format
 msgid ""
 "Usage: nmcli agent all { help }\n"
@@ -85,50 +85,50 @@ msgstr ""
 "Uruchamia program nmcli jako agenta haseł i polkit usługi NetworkManager.\n"
 "\n"
 
-#: ../clients/cli/agent.c:143
+#: ../clients/cli/agent.c:142
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr ""
 "Pomyślnie zarejestrowano program nmcli jako agenta haseł usługi "
 "NetworkManager.\n"
 
-#: ../clients/cli/agent.c:145
+#: ../clients/cli/agent.c:144
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "Błąd: zainicjowanie agenta haseł się nie powiodło"
 
-#: ../clients/cli/agent.c:164
-#, c-format
-msgid "Error: polkit agent initialization failed: %s"
-msgstr "Błąd: zainicjowanie agenta polkit się nie powiodło: %s"
-
-#: ../clients/cli/agent.c:172
+#: ../clients/cli/agent.c:153
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "Pomyślnie zarejestrowano program nmcli jako agenta polkit.\n"
 
-#: ../clients/cli/common.c:344 ../clients/cli/common.c:345
-#: ../clients/cli/common.c:376 ../clients/cli/common.c:377
-#: ../clients/cli/connections.c:1495
+#: ../clients/cli/agent.c:176
+#, c-format
+msgid "Error: polkit agent initialization failed: %s"
+msgstr "Błąd: zainicjowanie agenta polkit się nie powiodło: %s"
+
+#: ../clients/cli/common.c:347 ../clients/cli/common.c:348
+#: ../clients/cli/common.c:379 ../clients/cli/common.c:380
+#: ../clients/cli/connections.c:1511
 msgid "GROUP"
 msgstr "GRUPA"
 
-#: ../clients/cli/common.c:628
+#: ../clients/cli/common.c:631
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "Błąd: polecenie openconnect się nie powiodło: %s\n"
 
-#: ../clients/cli/common.c:635
+#: ../clients/cli/common.c:638
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "Błąd: polecenie openconnect się nie powiodło ze stanem %d\n"
 
-#: ../clients/cli/common.c:637
+#: ../clients/cli/common.c:640
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "Błąd: polecenie openconnect się nie powiodło z sygnałem %d\n"
 
-#: ../clients/cli/common.c:725
+#: ../clients/cli/common.c:728
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
@@ -137,65 +137,65 @@ msgstr ""
 "Ostrzeżenie: w „passwd-file” nie podano hasła dla „%s”, a program nmcli nie "
 "może zapytać bez opcji „--ask”.\n"
 
-#: ../clients/cli/common.c:1227
+#: ../clients/cli/common.c:1244
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "Błąd: nie można utworzyć obiektu NMClient: %s."
 
-#: ../clients/cli/common.c:1246
+#: ../clients/cli/common.c:1265
 msgid "Error: NetworkManager is not running."
 msgstr "Błąd: usługa NetworkManager nie jest uruchomiona."
 
-#: ../clients/cli/common.c:1339
+#: ../clients/cli/common.c:1364
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr "Błąd: nie zrozumiano parametru „%s”. Można użyć „--help” zamiast tego."
 
-#: ../clients/cli/common.c:1347
+#: ../clients/cli/common.c:1372
 msgid "Error: missing argument. Try passing --help."
 msgstr "Błąd: brak parametru. Można użyć „--help” zamiast tego."
 
-#: ../clients/cli/common.c:1414
+#: ../clients/cli/common.c:1439
 msgid "access denied"
 msgstr "odmowa dostępu"
 
-#: ../clients/cli/common.c:1416
+#: ../clients/cli/common.c:1441
 msgid "NetworkManager is not running"
 msgstr "Usługa NetworkManager nie jest uruchomiona"
 
-#: ../clients/cli/common.c:1442
+#: ../clients/cli/common.c:1467
 #, c-format
 msgid "Error: error connecting to system bus: %s"
 msgstr "Błąd: błąd podczas łączenia z magistralą systemową: %s"
 
-#: ../clients/cli/common.c:1468 ../clients/cli/connections.c:66
-#: ../clients/cli/connections.c:75 ../clients/cli/devices.c:427
-#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:526
-#: ../clients/cli/general.c:26 ../clients/cli/general.c:116
-#: ../clients/cli/general.c:121 ../clients/common/nm-client-utils.c:250
+#: ../clients/cli/common.c:1493 ../clients/cli/connections.c:67
+#: ../clients/cli/connections.c:77 ../clients/cli/devices.c:433
+#: ../clients/cli/devices.c:525 ../clients/cli/devices.c:532
+#: ../clients/cli/general.c:31 ../clients/cli/general.c:86
+#: ../clients/cli/general.c:91 ../clients/common/nm-client-utils.c:250
 #: ../clients/common/nm-client-utils.c:263
 #: ../clients/common/nm-client-utils.c:267
 #: ../clients/common/nm-client-utils.c:272
-#: ../clients/common/nm-meta-setting-desc.c:1724
-#: ../clients/common/nm-meta-setting-desc.c:1755
-#: ../clients/common/nm-meta-setting-desc.c:2687
-#: ../clients/common/nm-meta-setting-desc.c:2745
+#: ../clients/common/nm-meta-setting-desc.c:1713
+#: ../clients/common/nm-meta-setting-desc.c:1744
+#: ../clients/common/nm-meta-setting-desc.c:2646
+#: ../clients/common/nm-meta-setting-desc.c:2704
 msgid "unknown"
 msgstr "nieznane"
 
-#: ../clients/cli/common.c:1469
+#: ../clients/cli/common.c:1494
 msgid "none"
 msgstr "brak"
 
-#: ../clients/cli/common.c:1470
+#: ../clients/cli/common.c:1495
 msgid "portal"
 msgstr "portal"
 
-#: ../clients/cli/common.c:1471
+#: ../clients/cli/common.c:1496
 msgid "limited"
 msgstr "ograniczone"
 
-#: ../clients/cli/common.c:1472
+#: ../clients/cli/common.c:1497
 msgid "full"
 msgstr "pełne"
 
@@ -229,55 +229,55 @@ msgstr "Połączenia (nazwy, UUID lub ścieżki): "
 msgid "Connection(s) (name, UUID, path or apath): "
 msgstr "Połączenia (nazwy, UUID, ścieżki lub „apath”): "
 
-#: ../clients/cli/connections.c:67
+#: ../clients/cli/connections.c:68
 msgid "activating"
 msgstr "aktywowanie"
 
-#: ../clients/cli/connections.c:68
+#: ../clients/cli/connections.c:69
 msgid "activated"
 msgstr "aktywowano"
 
-#: ../clients/cli/connections.c:69 ../clients/common/nm-client-utils.c:261
+#: ../clients/cli/connections.c:70 ../clients/common/nm-client-utils.c:261
 msgid "deactivating"
 msgstr "dezaktywowanie"
 
-#: ../clients/cli/connections.c:70
+#: ../clients/cli/connections.c:71
 msgid "deactivated"
 msgstr "dezaktywowano"
 
-#: ../clients/cli/connections.c:76
+#: ../clients/cli/connections.c:78
 msgid "VPN connecting (prepare)"
 msgstr "Łączenie z VPN (przygotowanie)"
 
-#: ../clients/cli/connections.c:77
+#: ../clients/cli/connections.c:79
 msgid "VPN connecting (need authentication)"
 msgstr "Łączenie z VPN (wymaga uwierzytelnienia)"
 
-#: ../clients/cli/connections.c:78
+#: ../clients/cli/connections.c:80
 msgid "VPN connecting"
 msgstr "Łączenie z VPN"
 
-#: ../clients/cli/connections.c:79
+#: ../clients/cli/connections.c:81
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Łączenie z VPN (pobieranie konfiguracji adresu IP)"
 
-#: ../clients/cli/connections.c:80
+#: ../clients/cli/connections.c:82
 msgid "VPN connected"
 msgstr "Połączono z VPN"
 
-#: ../clients/cli/connections.c:81
+#: ../clients/cli/connections.c:83
 msgid "VPN connection failed"
 msgstr "Połączenie z VPN się nie powiodło"
 
-#: ../clients/cli/connections.c:82
+#: ../clients/cli/connections.c:84
 msgid "VPN disconnected"
 msgstr "Rozłączono z VPN"
 
-#: ../clients/cli/connections.c:544
+#: ../clients/cli/connections.c:546
 msgid "never"
 msgstr "nigdy"
 
-#: ../clients/cli/connections.c:904
+#: ../clients/cli/connections.c:907
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -353,7 +353,7 @@ msgstr ""
 "  export [id | uuid | path] <identyfikator> [<plik wyjściowy>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:926
+#: ../clients/cli/connections.c:929
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -398,7 +398,7 @@ msgstr ""
 "więcej informacji. Podanie opcji „--active” spowoduje uwzględnienie tylko\n"
 "aktywnych profili. Opcja „--show-secrets” ujawni także powiązane hasła.\n"
 
-#: ../clients/cli/connections.c:947
+#: ../clients/cli/connections.c:950
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -443,7 +443,7 @@ msgstr ""
 "passwd-file — plik z hasłami wymaganymi do aktywowania połączenia\n"
 "\n"
 
-#: ../clients/cli/connections.c:968
+#: ../clients/cli/connections.c:971
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -465,7 +465,7 @@ msgstr ""
 "identyfikowany po swojej nazwie, UUID lub ścieżce D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:980
+#: ../clients/cli/connections.c:983
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -788,7 +788,7 @@ msgstr ""
 "                  [ip6 <adres IPv6>] [gw6 <brama IPv6>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:1104
+#: ../clients/cli/connections.c:1107
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -801,6 +801,10 @@ msgid ""
 "The '+' sign allows appending items instead of overwriting the whole value.\n"
 "The '-' sign allows removing selected items instead of the whole value.\n"
 "\n"
+"ARGUMENTS := remove <setting>\n"
+"\n"
+"Remove a setting from the connection profile.\n"
+"\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
 "nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
@@ -810,6 +814,7 @@ msgid ""
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
 "nmcli con mod bond0 +bond.options mii=500\n"
 "nmcli con mod bond0 -bond.options downdelay\n"
+"nmcli con mod em1-1 remove sriov\n"
 "\n"
 msgstr ""
 "Użycie: nmcli connection modify { PARAMETRY | help }\n"
@@ -824,6 +829,10 @@ msgstr ""
 "elementów zamiast zastępowania całego wartości. Znak „-” umożliwia\n"
 "usuwanie zaznaczonych elementów zamiast całej wartości.\n"
 "\n"
+"PARAMETRY := remove <ustawienie>\n"
+"\n"
+"Usuwa ustawienie z profilu połączenia.\n"
+"\n"
 "Przykłady:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
 "nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
@@ -833,9 +842,10 @@ msgstr ""
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
 "nmcli con mod bond0 +bond.options mii=500\n"
 "nmcli con mod bond0 -bond.options downdelay\n"
+"nmcli con mod em1-1 remove sriov\n"
 "\n"
 
-#: ../clients/cli/connections.c:1127
+#: ../clients/cli/connections.c:1135
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -857,7 +867,7 @@ msgstr ""
 "utworzona) oraz „id” (podana jako parametr <nowa nazwa>).\n"
 "\n"
 
-#: ../clients/cli/connections.c:1139
+#: ../clients/cli/connections.c:1147
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -885,7 +895,7 @@ msgstr ""
 "Dodaje nowy profil połączenia w interaktywnym edytorze.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1154
+#: ../clients/cli/connections.c:1162
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -904,7 +914,7 @@ msgstr ""
 "Profil jest identyfikowany po swojej nazwie, UUID lub ścieżce D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1165
+#: ../clients/cli/connections.c:1173
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -925,7 +935,7 @@ msgstr ""
 "Monitoruje wszystkie profile połączeń, jeśli żaden nie zostanie podany.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1177
+#: ../clients/cli/connections.c:1185
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -938,7 +948,7 @@ msgstr ""
 "Wczytuje ponownie wszystkie pliki połączeń z dysku.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1185
+#: ../clients/cli/connections.c:1193
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -960,7 +970,7 @@ msgstr ""
 "usługa NetworkManager zna jego najnowszy stan.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1197
+#: ../clients/cli/connections.c:1205
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -985,7 +995,7 @@ msgstr ""
 "importowana przez wtyczki VPN usługi NetworkManager.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1210
+#: ../clients/cli/connections.c:1218
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1005,348 +1015,362 @@ msgstr ""
 "nazwę.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1301
+#: ../clients/cli/connections.c:1309
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Błąd podczas aktualizowania haseł dla %s: %s\n"
 
-#: ../clients/cli/connections.c:1348
+#: ../clients/cli/connections.c:1356
 msgid "Connection profile details"
 msgstr "Szczegóły profilu połączenia"
 
-#: ../clients/cli/connections.c:1361 ../clients/cli/connections.c:1446
+#: ../clients/cli/connections.c:1369 ../clients/cli/connections.c:1458
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Błąd: „connection show”: %s"
 
-#: ../clients/cli/connections.c:1436
+#: ../clients/cli/connections.c:1448
 msgid "Activate connection details"
 msgstr "Szczegóły aktywowania połączenia"
 
-#: ../clients/cli/connections.c:1544 ../clients/cli/devices.c:1485
-#: ../clients/cli/devices.c:1499 ../clients/cli/devices.c:1513
-#: ../clients/cli/devices.c:1528 ../clients/cli/devices.c:1586
-#: ../clients/cli/devices.c:1688
+#: ../clients/cli/connections.c:1560 ../clients/cli/devices.c:1498
+#: ../clients/cli/devices.c:1512 ../clients/cli/devices.c:1526
+#: ../clients/cli/devices.c:1541 ../clients/cli/devices.c:1598
+#: ../clients/cli/devices.c:1700
 msgid "NAME"
 msgstr "NAZWA"
 
-#: ../clients/cli/connections.c:1637
+#: ../clients/cli/connections.c:1653
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "nieprawidłowe pole „%s”; dozwolone pola: %s i %s, albo %s,%s"
 
-#: ../clients/cli/connections.c:1647 ../clients/cli/connections.c:1655
+#: ../clients/cli/connections.c:1663 ../clients/cli/connections.c:1671
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "„%s” musi być same"
 
-#: ../clients/cli/connections.c:1915
+#: ../clients/cli/connections.c:1931
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "niepoprawny ciąg „%s” opcji „--order”"
 
-#: ../clients/cli/connections.c:1940
+#: ../clients/cli/connections.c:1956
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "niepoprawny element „%s” w opcji „--order”"
 
-#: ../clients/cli/connections.c:1978
+#: ../clients/cli/connections.c:1994
 msgid "No connection specified"
 msgstr "Nie podano połączenia"
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:2005
 #, c-format
 msgid "%s argument is missing"
 msgstr "Brak parametru %s"
 
-#: ../clients/cli/connections.c:2007
+#: ../clients/cli/connections.c:2023
 #, c-format
 msgid "unknown connection '%s'"
 msgstr "nieznane połączenie „%s”"
 
-#: ../clients/cli/connections.c:2036
+#: ../clients/cli/connections.c:2052
 msgid "'--order' argument is missing"
 msgstr "Brak parametru „--order”"
 
-#: ../clients/cli/connections.c:2096
+#: ../clients/cli/connections.c:2112
 msgid "NetworkManager active profiles"
 msgstr "Aktywne profile usługi NetworkManager"
 
-#: ../clients/cli/connections.c:2097
+#: ../clients/cli/connections.c:2113
 msgid "NetworkManager connection profiles"
 msgstr "Profile połączeń usługi NetworkManager"
 
-#: ../clients/cli/connections.c:2149 ../clients/cli/connections.c:2895
-#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:2919
-#: ../clients/cli/connections.c:3149 ../clients/cli/connections.c:8969
-#: ../clients/cli/connections.c:8990 ../clients/cli/devices.c:3019
-#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3044
-#: ../clients/cli/devices.c:3299 ../clients/cli/devices.c:3310
-#: ../clients/cli/devices.c:3328 ../clients/cli/devices.c:3337
-#: ../clients/cli/devices.c:3358 ../clients/cli/devices.c:3369
-#: ../clients/cli/devices.c:3387 ../clients/cli/devices.c:3905
-#: ../clients/cli/devices.c:3915 ../clients/cli/devices.c:3923
-#: ../clients/cli/devices.c:3935 ../clients/cli/devices.c:3950
-#: ../clients/cli/devices.c:3958 ../clients/cli/devices.c:4101
-#: ../clients/cli/devices.c:4112 ../clients/cli/devices.c:4326
-#: ../clients/cli/devices.c:4495
+#: ../clients/cli/connections.c:2165 ../clients/cli/connections.c:2911
+#: ../clients/cli/connections.c:2924 ../clients/cli/connections.c:2937
+#: ../clients/cli/connections.c:3169 ../clients/cli/connections.c:9056
+#: ../clients/cli/connections.c:9078 ../clients/cli/devices.c:3064
+#: ../clients/cli/devices.c:3077 ../clients/cli/devices.c:3089
+#: ../clients/cli/devices.c:3381 ../clients/cli/devices.c:3392
+#: ../clients/cli/devices.c:3410 ../clients/cli/devices.c:3419
+#: ../clients/cli/devices.c:3440 ../clients/cli/devices.c:3451
+#: ../clients/cli/devices.c:3469 ../clients/cli/devices.c:3985
+#: ../clients/cli/devices.c:3996 ../clients/cli/devices.c:4005
+#: ../clients/cli/devices.c:4019 ../clients/cli/devices.c:4036
+#: ../clients/cli/devices.c:4045 ../clients/cli/devices.c:4192
+#: ../clients/cli/devices.c:4203 ../clients/cli/devices.c:4419
+#: ../clients/cli/devices.c:4588
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Błąd: brak parametru %s."
 
-#: ../clients/cli/connections.c:2177
+#: ../clients/cli/connections.c:2193
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Błąd: %s — nie ma takiego profilu połączenia."
 
-#: ../clients/cli/connections.c:2268 ../clients/cli/connections.c:2882
-#: ../clients/cli/connections.c:2947 ../clients/cli/connections.c:8506
-#: ../clients/cli/connections.c:8597 ../clients/cli/connections.c:9090
-#: ../clients/cli/devices.c:1773 ../clients/cli/devices.c:2041
-#: ../clients/cli/devices.c:2211 ../clients/cli/devices.c:2319
-#: ../clients/cli/devices.c:2511 ../clients/cli/devices.c:3178
-#: ../clients/cli/devices.c:4064 ../clients/cli/devices.c:4501
-#: ../clients/cli/general.c:982
+#: ../clients/cli/connections.c:2284 ../clients/cli/connections.c:2897
+#: ../clients/cli/connections.c:2967 ../clients/cli/connections.c:8597
+#: ../clients/cli/connections.c:8689 ../clients/cli/connections.c:9183
+#: ../clients/cli/devices.c:1785 ../clients/cli/devices.c:2053
+#: ../clients/cli/devices.c:2223 ../clients/cli/devices.c:2336
+#: ../clients/cli/devices.c:2525 ../clients/cli/devices.c:3260
+#: ../clients/cli/devices.c:4156 ../clients/cli/devices.c:4595
+#: ../clients/cli/general.c:993
 #, c-format
 msgid "Error: %s."
 msgstr "Błąd: %s."
 
-#: ../clients/cli/connections.c:2361 ../clients/cli/devices.c:4278
+#: ../clients/cli/connections.c:2376 ../clients/cli/devices.c:4370
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "brak aktywnych połączeń na urządzeniu „%s”"
 
-#: ../clients/cli/connections.c:2369
+#: ../clients/cli/connections.c:2384
 msgid "no active connection or device"
 msgstr "brak aktywnych połączeń na urządzeń"
 
-#: ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2404
 #, c-format
 msgid "device '%s' not compatible with connection '%s': "
 msgstr "urządzenie „%s” jest niezgodne z połączeniem „%s”: "
 
-#: ../clients/cli/connections.c:2422
+#: ../clients/cli/connections.c:2437
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "urządzenie „%s” jest niezgodne z połączeniem „%s”"
 
-#: ../clients/cli/connections.c:2425
+#: ../clients/cli/connections.c:2440
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "nie odnaleziono urządzenia dla połączenia „%s”"
 
-#: ../clients/cli/connections.c:2476
+#: ../clients/cli/connections.c:2491
 #, c-format
 msgid "Hint: use '%s' to get more details."
 msgstr "Wskazówka: „%s” wyświetli więcej informacji."
 
-#: ../clients/cli/connections.c:2494
+#: ../clients/cli/connections.c:2509
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
 msgstr "Pomyślnie aktywowano połączenie (%s) (ścieżka aktywacji D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2498 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:6798
+#: ../clients/cli/connections.c:2513 ../clients/cli/connections.c:2663
+#: ../clients/cli/connections.c:6898
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Pomyślnie aktywowano połączenie (ścieżka aktywacji D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2505 ../clients/cli/connections.c:2627
+#: ../clients/cli/connections.c:2520 ../clients/cli/connections.c:2642
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Błąd: aktywacja połączenia się nie powiodła: %s"
 
-#: ../clients/cli/connections.c:2542
+#: ../clients/cli/connections.c:2557
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr "Błąd: przekroczono czas oczekiwania (%d s)"
 
-#: ../clients/cli/connections.c:2709
+#: ../clients/cli/connections.c:2724
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "odczytanie passwd-file „%s” się nie powiodło: %s"
 
-#: ../clients/cli/connections.c:2722
+#: ../clients/cli/connections.c:2737
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "brak dwukropka we wpisie „password” „%s”"
 
-#: ../clients/cli/connections.c:2730
+#: ../clients/cli/connections.c:2745
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "brak kropki we wpisie „password” „%s”"
 
-#: ../clients/cli/connections.c:2743
+#: ../clients/cli/connections.c:2758
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "nieprawidłowa nazwa ustawienia we wpisie „password” „%s”"
 
-#: ../clients/cli/connections.c:2800
+#: ../clients/cli/connections.c:2815
 #, c-format
 msgid "unknown device '%s'."
 msgstr "nieznane urządzenie „%s”."
 
-#: ../clients/cli/connections.c:2805
+#: ../clients/cli/connections.c:2820
 msgid "neither a valid connection nor device given"
 msgstr "nie podano prawidłowego połączenia ani urządzenia"
 
-#: ../clients/cli/connections.c:2929 ../clients/cli/connections.c:9000
-#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:1778
-#: ../clients/cli/devices.c:2216 ../clients/cli/devices.c:3076
-#: ../clients/cli/devices.c:3400 ../clients/cli/devices.c:3967
-#: ../clients/cli/devices.c:4118 ../clients/cli/devices.c:4335
-#: ../clients/cli/devices.c:4505
+#: ../clients/cli/connections.c:2948 ../clients/cli/connections.c:9089
+#: ../clients/cli/devices.c:1744 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:2229 ../clients/cli/devices.c:3123
+#: ../clients/cli/devices.c:3482 ../clients/cli/devices.c:4055
+#: ../clients/cli/devices.c:4209 ../clients/cli/devices.c:4429
+#: ../clients/cli/devices.c:4600
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Błąd: nieprawidłowy dodatkowy parametr „%s”."
 
-#: ../clients/cli/connections.c:2955
+#: ../clients/cli/connections.c:2976
 msgid "preparing"
 msgstr "przygotowywanie"
 
-#: ../clients/cli/connections.c:3064
+#: ../clients/cli/connections.c:3083
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "Pomyślnie usunięto połączenie „%s” (%s).\n"
 
-#: ../clients/cli/connections.c:3080
+#: ../clients/cli/connections.c:3099
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 "Pomyślnie dezaktywowano połączenie „%s” (ścieżka aktywacji D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:3131 ../clients/cli/connections.c:8693
-#: ../clients/cli/connections.c:8724 ../clients/cli/connections.c:8890
+#: ../clients/cli/connections.c:3150 ../clients/cli/connections.c:8786
+#: ../clients/cli/connections.c:8817 ../clients/cli/connections.c:8980
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Błąd: nie podano połączenia."
 
-#: ../clients/cli/connections.c:3161
+#: ../clients/cli/connections.c:3182
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Błąd: „%s” nie jest aktywnym połączeniem.\n"
 
-#: ../clients/cli/connections.c:3162
+#: ../clients/cli/connections.c:3183
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Błąd: nie odnaleziono wszystkich aktywnych połączeń."
 
-#: ../clients/cli/connections.c:3170
+#: ../clients/cli/connections.c:3191
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Błąd: nie podano aktywnego połączenia."
 
-#: ../clients/cli/connections.c:3201
+#: ../clients/cli/connections.c:3223
 #, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
 msgstr "Dezaktywacja połączenia „%s” się nie powiodła: %s\n"
 
-#: ../clients/cli/connections.c:3461 ../clients/cli/connections.c:3518
+#: ../clients/cli/connections.c:3481 ../clients/cli/connections.c:3538
 #: ../clients/common/nm-client-utils.c:211
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "„%s” nie jest w [%s]"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3481 ../clients/cli/connections.c:3541
+#: ../clients/cli/connections.c:3501 ../clients/cli/connections.c:3561
 #: ../clients/common/nm-client-utils.c:279
 #, c-format
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
-#: ../clients/cli/connections.c:3675
+#: ../clients/cli/connections.c:3695
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr ""
 "Ostrzeżenie: master=„%s” nie odnosi się do żadnego istniejącego profilu.\n"
 
-#: ../clients/cli/connections.c:4038
+#: ../clients/cli/connections.c:4058
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "Błąd: nieprawidłowa właściwość „%s”: %s."
 
-#: ../clients/cli/connections.c:4053
+#: ../clients/cli/connections.c:4073
 #, c-format
 msgid "Error: failed to %s %s.%s: %s."
 msgstr "Błąd: %s %s.%s się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:4095
+#: ../clients/cli/connections.c:4115
 #, c-format
 msgid "Error: '%s' is mandatory."
-msgstr "Błąd: „%s” jest wymagane."
+msgstr "Błąd: „%s” jest obowiązkowe."
 
-#: ../clients/cli/connections.c:4122
+#: ../clients/cli/connections.c:4142
 #, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "Błąd: nieznany typ podrzędnego; %s."
 
-#: ../clients/cli/connections.c:4130
+#: ../clients/cli/connections.c:4150
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Błąd: nieznany typ połączenia; %s."
 
-#: ../clients/cli/connections.c:4207
+#: ../clients/cli/connections.c:4227
 #, c-format
 msgid "Error: bad connection type: %s"
 msgstr "Błąd: błędny typ połączenia: %s"
 
-#: ../clients/cli/connections.c:4263
-#, c-format
-msgid "Error: '%s': %s"
-msgstr "Błąd: „%s”: %s"
-
-#: ../clients/cli/connections.c:4290
+#: ../clients/cli/connections.c:4302
 msgid "Error: master is required"
 msgstr "Błąd: „master” jest wymagane"
 
-#: ../clients/cli/connections.c:4359
+#: ../clients/cli/connections.c:4371
 #, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "Błąd: błąd podczas dodawania opcji wiązania „%s=%s”."
 
-#: ../clients/cli/connections.c:4390
+#: ../clients/cli/connections.c:4402
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 "Błąd: „%s” nie jest prawidłowym trybem monitorowania; należy użyć „%s” lub "
 "„%s”.\n"
 
-#: ../clients/cli/connections.c:4421
+#: ../clients/cli/connections.c:4433
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
 msgstr ""
 "Błąd: „bt-type”: „%s” jest nieprawidłowe; należy użyć [%s, %s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:4686
+#: ../clients/cli/connections.c:4727
+#, c-format
+msgid "Error: setting '%s' is mandatory and cannot be removed."
+msgstr "Błąd: ustawienie „%s” jest obowiązkowe i nie może być usuwane."
+
+#: ../clients/cli/connections.c:4737
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "Błąd: brak wartości dla „%s”."
 
-#: ../clients/cli/connections.c:4730
+#: ../clients/cli/connections.c:4782
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Błąd: brak parametru <ustawienie>.<właściwość>."
 
-#: ../clients/cli/connections.c:4756
+#: ../clients/cli/connections.c:4808
+msgid "Error: missing setting."
+msgstr "Błąd: brak ustawienia."
+
+#: ../clients/cli/connections.c:4826
+#, c-format
+msgid "Setting '%s' is not present in the connection."
+msgstr "Ustawienie „%s” nie jest obecne w połączeniu."
+
+#: ../clients/cli/connections.c:4830
+#, c-format
+msgid "Error: invalid setting argument '%s'."
+msgstr "Błąd: nieprawidłowy parametr ustawienia „%s”."
+
+#: ../clients/cli/connections.c:4854
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Błąd: nieprawidłowe lub niedozwolone ustawienie „%s”: %s."
 
-#: ../clients/cli/connections.c:4805 ../clients/cli/connections.c:4821
+#: ../clients/cli/connections.c:4903 ../clients/cli/connections.c:4919
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr "Błąd: „%s” jest niejednoznaczne (%s.%s lub %s.%s)."
 
-#: ../clients/cli/connections.c:4837
+#: ../clients/cli/connections.c:4939
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "Błąd: nieprawidłowe <ustawienie>.<właściwość> „%s”."
 
-#: ../clients/cli/connections.c:4876 ../clients/cli/connections.c:8545
+#: ../clients/cli/connections.c:4977 ../clients/cli/connections.c:8637
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Błąd: dodanie połączenia „%s” się nie powiodło: %s"
 
-#: ../clients/cli/connections.c:4894
+#: ../clients/cli/connections.c:4995
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
@@ -1364,32 +1388,32 @@ msgstr[2] ""
 "Ostrzeżenie: istnieje %3$u innych połączeń o nazwie „%1$s”. Należy odwoływać "
 "się do połączenia za pomocą UUID „%2$s”\n"
 
-#: ../clients/cli/connections.c:4903
+#: ../clients/cli/connections.c:5004
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "Pomyślnie dodano połączenie „%s” (%s).\n"
 
-#: ../clients/cli/connections.c:4965 ../clients/cli/connections.c:6921
-#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:518
-#: ../clients/cli/devices.c:525 ../clients/cli/devices.c:1239
-#: ../clients/cli/general.c:123 ../clients/cli/utils.h:291
+#: ../clients/cli/connections.c:5066 ../clients/cli/connections.c:7004
+#: ../clients/cli/connections.c:7005 ../clients/cli/devices.c:524
+#: ../clients/cli/devices.c:531 ../clients/cli/devices.c:1248
+#: ../clients/cli/general.c:93 ../clients/cli/utils.h:293
 #: ../clients/common/nm-client-utils.c:269
-#: ../clients/common/nm-meta-setting-desc.c:866
-#: ../clients/common/nm-meta-setting-desc.c:2682
+#: ../clients/common/nm-meta-setting-desc.c:847
+#: ../clients/common/nm-meta-setting-desc.c:2641
 msgid "no"
 msgstr "nie"
 
-#: ../clients/cli/connections.c:4966 ../clients/cli/connections.c:6921
-#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:517
-#: ../clients/cli/devices.c:524 ../clients/cli/devices.c:1239
-#: ../clients/cli/general.c:122 ../clients/cli/utils.h:291
+#: ../clients/cli/connections.c:5067 ../clients/cli/connections.c:7004
+#: ../clients/cli/connections.c:7005 ../clients/cli/devices.c:523
+#: ../clients/cli/devices.c:530 ../clients/cli/devices.c:1248
+#: ../clients/cli/general.c:92 ../clients/cli/utils.h:293
 #: ../clients/common/nm-client-utils.c:268
-#: ../clients/common/nm-meta-setting-desc.c:866
-#: ../clients/common/nm-meta-setting-desc.c:2679
+#: ../clients/common/nm-meta-setting-desc.c:847
+#: ../clients/common/nm-meta-setting-desc.c:2638
 msgid "yes"
 msgstr "tak"
 
-#: ../clients/cli/connections.c:5052
+#: ../clients/cli/connections.c:5153
 #, c-format
 msgid ""
 "You can specify this option more than once. Press <Enter> when you're done.\n"
@@ -1398,7 +1422,7 @@ msgstr ""
 "ukończeniu.\n"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:5154
+#: ../clients/cli/connections.c:5255
 #, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
@@ -1406,7 +1430,7 @@ msgstr[0] "Istnieje %d opcjonalne ustawienie dla %s.\n"
 msgstr[1] "Istnieją %d opcjonalne ustawienia dla %s.\n"
 msgstr[2] "Istnieje %d opcjonalnych ustawień dla %s.\n"
 
-#: ../clients/cli/connections.c:5160
+#: ../clients/cli/connections.c:5261
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
@@ -1414,22 +1438,22 @@ msgstr[0] "Podać go? %s"
 msgstr[1] "Podać je? %s"
 msgstr[2] "Podać je? %s"
 
-#: ../clients/cli/connections.c:5292 ../clients/cli/utils.c:279
+#: ../clients/cli/connections.c:5393 ../clients/cli/utils.c:279
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "Błąd: wartość dla parametru „%s” jest wymagana."
 
-#: ../clients/cli/connections.c:5299
+#: ../clients/cli/connections.c:5400
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Błąd: „save”: %s."
 
-#: ../clients/cli/connections.c:5384 ../clients/cli/connections.c:5395
+#: ../clients/cli/connections.c:5485 ../clients/cli/connections.c:5496
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr "Błąd: parametr „%s” jest wymagany."
 
-#: ../clients/cli/connections.c:6354
+#: ../clients/cli/connections.c:6454
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[wartości ustawienia „%s”]\n"
@@ -1437,7 +1461,7 @@ msgstr "[wartości ustawienia „%s”]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6463
+#: ../clients/cli/connections.c:6563
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1474,7 +1498,7 @@ msgstr ""
 "nmcli    <opcja konfiguracji> <wartość>        :: konfiguracja nmcli\n"
 "quit                                           :: kończy działanie nmcli\n"
 
-#: ../clients/cli/connections.c:6490
+#: ../clients/cli/connections.c:6590
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1495,7 +1519,7 @@ msgstr ""
 "           nmcli connection> goto secondaries\n"
 "           nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6497
+#: ../clients/cli/connections.c:6597
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -1516,7 +1540,7 @@ msgstr ""
 "Przykłady: nmcli> remove wifi-sec\n"
 "           nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6504
+#: ../clients/cli/connections.c:6604
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1531,7 +1555,7 @@ msgstr ""
 "\n"
 "Przykład: nmcli> set con.id Moje połączenie\n"
 
-#: ../clients/cli/connections.c:6509
+#: ../clients/cli/connections.c:6609
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -1544,7 +1568,7 @@ msgstr ""
 "Wyświetla opis właściwości. Wszystkie ustawienia i właściwości usługi NM\n"
 "można znaleźć na stronie podręcznika nm-settings(5).\n"
 
-#: ../clients/cli/connections.c:6514
+#: ../clients/cli/connections.c:6614
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1559,7 +1583,7 @@ msgstr ""
 "\n"
 "Przykład: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6519
+#: ../clients/cli/connections.c:6619
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -1583,7 +1607,7 @@ msgstr ""
 "           nmcli> verify fix\n"
 "           nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6528
+#: ../clients/cli/connections.c:6628
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1609,7 +1633,7 @@ msgstr ""
 "między ponownymi uruchomieniami. Aby w pełni usunąć trwałe połączenie,\n"
 "należy usunąć profil połączenia.\n"
 
-#: ../clients/cli/connections.c:6539
+#: ../clients/cli/connections.c:6639
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1631,7 +1655,7 @@ msgstr ""
 "                     poprzedzić znakiem /, kiedy nie podano\n"
 "                     <nazwy-interfejsu>)\n"
 
-#: ../clients/cli/connections.c:6546 ../clients/cli/connections.c:6704
+#: ../clients/cli/connections.c:6646 ../clients/cli/connections.c:6804
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -1640,7 +1664,7 @@ msgstr ""
 "back  :: przechodzi do menu wyższego poziomu\n"
 "\n"
 
-#: ../clients/cli/connections.c:6549
+#: ../clients/cli/connections.c:6649
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -1649,7 +1673,7 @@ msgstr ""
 "help/? [<polecenie>]  :: pomoc dla poleceń nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6552
+#: ../clients/cli/connections.c:6652
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1676,7 +1700,7 @@ msgstr ""
 "           nmcli> nmcli save-confirmation no\n"
 "           nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6574 ../clients/cli/connections.c:6710
+#: ../clients/cli/connections.c:6674 ../clients/cli/connections.c:6810
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1689,8 +1713,8 @@ msgstr ""
 "To polecenie kończy działanie nmcli. Jeśli modyfikowane połączenie nie jest "
 "zapisane, użytkownik zostanie poproszony o potwierdzenie działania.\n"
 
-#: ../clients/cli/connections.c:6579 ../clients/cli/connections.c:6715
-#: ../clients/cli/connections.c:7126 ../clients/cli/connections.c:8129
+#: ../clients/cli/connections.c:6679 ../clients/cli/connections.c:6815
+#: ../clients/cli/connections.c:7209 ../clients/cli/connections.c:8219
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Nieznane polecenie: „%s”\n"
@@ -1698,7 +1722,7 @@ msgstr "Nieznane polecenie: „%s”\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6644
+#: ../clients/cli/connections.c:6744
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1725,7 +1749,7 @@ msgstr ""
 "help/?   [<polecenie>]           :: wyświetla tę pomoc lub opis polecenia\n"
 "quit                             :: kończy działanie nmcli\n"
 
-#: ../clients/cli/connections.c:6669
+#: ../clients/cli/connections.c:6769
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1736,7 +1760,7 @@ msgstr ""
 "\n"
 "To polecenie ustawia podaną <wartość> tej właściwości\n"
 
-#: ../clients/cli/connections.c:6673
+#: ../clients/cli/connections.c:6773
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1751,7 +1775,7 @@ msgstr ""
 "jest typu kontener. W przypadku właściwości zawierających jedną wartość "
 "zastępuje tę wartość (podobnie jak „set”).\n"
 
-#: ../clients/cli/connections.c:6679
+#: ../clients/cli/connections.c:6779
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1762,7 +1786,7 @@ msgstr ""
 "\n"
 "Wyświetla bieżącą wartość i umożliwia jej modyfikację.\n"
 
-#: ../clients/cli/connections.c:6683
+#: ../clients/cli/connections.c:6783
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1795,7 +1819,7 @@ msgstr ""
 "           nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6694
+#: ../clients/cli/connections.c:6794
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -1808,7 +1832,7 @@ msgstr ""
 "Wyświetla opis właściwości. Wszystkie ustawienia i właściwości usługi NM "
 "można znaleźć na stronie podręcznika nm-settings(5).\n"
 
-#: ../clients/cli/connections.c:6699
+#: ../clients/cli/connections.c:6799
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1823,7 +1847,7 @@ msgstr ""
 "Wyświetla wartość właściwości. Podając parametr można także wyświetlić "
 "wartości dla całego ustawienia lub połączenia.\n"
 
-#: ../clients/cli/connections.c:6707
+#: ../clients/cli/connections.c:6807
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -1832,28 +1856,23 @@ msgstr ""
 "help/? [<polecenie>]  :: pomoc dla poleceń nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6804
+#: ../clients/cli/connections.c:6904
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "Błąd: aktywacja połączenia się nie powiodła.\n"
 
-#: ../clients/cli/connections.c:6901
-#, c-format
-msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
-msgstr "Błąd: ustawienie „%s” jest wymagane i nie może być usuwane.\n"
-
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6919
+#: ../clients/cli/connections.c:7002
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Typ: %s | nazwa: %s | UUID: %s | dirty: %s | tymczasowe: %s ]\n"
 
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:7038
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "Połączenie nie jest zapisane. Na pewno zakończyć? %s"
 
-#: ../clients/cli/connections.c:6996
+#: ../clients/cli/connections.c:7079
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -1862,60 +1881,60 @@ msgstr ""
 "Profil połączenia został usunięty z innego klienta. Można wpisać „save” "
 "w głównym oknie, aby go przywrócić.\n"
 
-#: ../clients/cli/connections.c:7030 ../clients/cli/connections.c:7424
-#: ../clients/cli/connections.c:7488
+#: ../clients/cli/connections.c:7113 ../clients/cli/connections.c:7507
+#: ../clients/cli/connections.c:7571
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Dozwolone wartości dla właściwości „%s”: %s\n"
 
-#: ../clients/cli/connections.c:7034 ../clients/cli/connections.c:7428
-#: ../clients/cli/connections.c:7492
+#: ../clients/cli/connections.c:7117 ../clients/cli/connections.c:7511
+#: ../clients/cli/connections.c:7575
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Proszę podać wartość „%s”: "
 
-#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7066
-#: ../clients/cli/connections.c:7437 ../clients/cli/connections.c:7505
+#: ../clients/cli/connections.c:7131 ../clients/cli/connections.c:7149
+#: ../clients/cli/connections.c:7520 ../clients/cli/connections.c:7588
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Błąd: ustawienie właściwości „%s” się nie powiodło: %s\n"
 
-#: ../clients/cli/connections.c:7057
+#: ../clients/cli/connections.c:7140
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Modyfikacja wartości „%s”: "
 
-#: ../clients/cli/connections.c:7080 ../clients/cli/settings.c:400
+#: ../clients/cli/connections.c:7163 ../clients/cli/settings.c:400
 #, c-format
 msgid "Error: %s\n"
 msgstr "Błąd: %s\n"
 
-#: ../clients/cli/connections.c:7099
+#: ../clients/cli/connections.c:7182
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Nieznany parametr polecenia: „%s”\n"
 
-#: ../clients/cli/connections.c:7190
+#: ../clients/cli/connections.c:7273
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Dostępne ustawienia: %s\n"
 
-#: ../clients/cli/connections.c:7202
+#: ../clients/cli/connections.c:7285
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Błąd: nieprawidłowa nazwa ustawienia; %s\n"
 
-#: ../clients/cli/connections.c:7220
+#: ../clients/cli/connections.c:7303
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Dostępne właściwości: %s\n"
 
-#: ../clients/cli/connections.c:7228
+#: ../clients/cli/connections.c:7311
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Błąd: właściwość %s\n"
 
-#: ../clients/cli/connections.c:7273
+#: ../clients/cli/connections.c:7356
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -1926,12 +1945,12 @@ msgstr ""
 "natychmiastową aktywację połączenia.\n"
 "Na pewno zapisać? %s"
 
-#: ../clients/cli/connections.c:7358
+#: ../clients/cli/connections.c:7441
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Można modyfikować następujące ustawienia: %s\n"
 
-#: ../clients/cli/connections.c:7389
+#: ../clients/cli/connections.c:7472
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -1940,227 +1959,227 @@ msgstr ""
 "Profil połączenia został usunięty z innego klienta. Można wpisać „save”, aby "
 "go przywrócić.\n"
 
-#: ../clients/cli/connections.c:7441 ../clients/cli/connections.c:7709
-#: ../clients/cli/connections.c:7741
+#: ../clients/cli/connections.c:7524 ../clients/cli/connections.c:7799
+#: ../clients/cli/connections.c:7831
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "Błąd: nie wybrano ustawienia; prawidłowe to [%s]\n"
 
-#: ../clients/cli/connections.c:7442
+#: ../clients/cli/connections.c:7525
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 "należy najpierw użyć „goto <ustawienie>” lub „set <ustawienie>."
 "<właściwość>”\n"
 
-#: ../clients/cli/connections.c:7457 ../clients/cli/connections.c:7634
-#: ../clients/cli/connections.c:7731
+#: ../clients/cli/connections.c:7540 ../clients/cli/connections.c:7717
+#: ../clients/cli/connections.c:7821
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "Błąd: nieprawidłowy parametr ustawienia „%s”; prawidłowe to [%s]\n"
 
-#: ../clients/cli/connections.c:7466
+#: ../clients/cli/connections.c:7549
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Błąd: brak ustawienia dla właściwości „%s”\n"
 
-#: ../clients/cli/connections.c:7473
+#: ../clients/cli/connections.c:7556
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Błąd: nieprawidłowa właściwość: %s\n"
 
-#: ../clients/cli/connections.c:7537
+#: ../clients/cli/connections.c:7620
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Błąd: nieznane ustawienie „%s”\n"
 
-#: ../clients/cli/connections.c:7562
+#: ../clients/cli/connections.c:7645
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Można modyfikować następujące właściwości: %s\n"
 
-#: ../clients/cli/connections.c:7607 ../clients/cli/connections.c:7662
+#: ../clients/cli/connections.c:7690 ../clients/cli/connections.c:7749
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Błąd: usunięcie wartości „%s” się nie powiodło: %s\n"
 
-#: ../clients/cli/connections.c:7612
+#: ../clients/cli/connections.c:7695
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Błąd: nie podano żadnego parametru; prawidłowe to [%s]\n"
 
-#: ../clients/cli/connections.c:7631
+#: ../clients/cli/connections.c:7714
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "Ustawienie „%s” nie jest obecne w połączeniu.\n"
 
-#: ../clients/cli/connections.c:7685
+#: ../clients/cli/connections.c:7775
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Błąd: właściwości %s, ani nie jest nazwą ustawiania.\n"
 
-#: ../clients/cli/connections.c:7710 ../clients/cli/connections.c:7742
+#: ../clients/cli/connections.c:7800 ../clients/cli/connections.c:7832
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "należy najpierw użyć „goto <ustawienie>” lub „describe <ustawienie>."
 "<właściwość>”\n"
 
-#: ../clients/cli/connections.c:7765
+#: ../clients/cli/connections.c:7855
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "Błąd: nieprawidłowa właściwość: %s: ani prawidłową nazwą ustawienia.\n"
 
-#: ../clients/cli/connections.c:7795
+#: ../clients/cli/connections.c:7885
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Błąd: nieznane ustawienie: „%s”\n"
 
-#: ../clients/cli/connections.c:7800
+#: ../clients/cli/connections.c:7890
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "Błąd: ustawienie „%s” nie jest obecne w połączeniu\n"
 
-#: ../clients/cli/connections.c:7831
+#: ../clients/cli/connections.c:7921
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "Błąd: nieprawidłowa właściwość: %s%s\n"
 
-#: ../clients/cli/connections.c:7833
+#: ../clients/cli/connections.c:7923
 msgid ", neither a valid setting name"
 msgstr ", ani prawidłową nazwą ustawienia"
 
-#: ../clients/cli/connections.c:7849
+#: ../clients/cli/connections.c:7939
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Nieprawidłowa opcja sprawdzania: %s\n"
 
-#: ../clients/cli/connections.c:7858
+#: ../clients/cli/connections.c:7948
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Sprawdzenie ustawienia „%s”: %s\n"
 
-#: ../clients/cli/connections.c:7874
+#: ../clients/cli/connections.c:7964
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Sprawdzenie połączenia: %s\n"
 
-#: ../clients/cli/connections.c:7877
+#: ../clients/cli/connections.c:7967
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "Nie można automatycznie naprawić błędu.\n"
 
-#: ../clients/cli/connections.c:7897
+#: ../clients/cli/connections.c:7987
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "Błąd: nieprawidłowy parametr „%s”\n"
 
-#: ../clients/cli/connections.c:7947
+#: ../clients/cli/connections.c:8037
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "Błąd: zapisanie połączenia „%s” (%s) się nie powiodło: %s\n"
 
-#: ../clients/cli/connections.c:7953
+#: ../clients/cli/connections.c:8043
 #, c-format
 msgid "Error: Timeout saving '%s' (%s) connection\n"
 msgstr ""
 "Błąd: przekroczono czas oczekiwania podczas zapisywania połączenia "
 "„%s” (%s)\n"
 
-#: ../clients/cli/connections.c:7958
+#: ../clients/cli/connections.c:8048
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Pomyślnie zapisano połączenie „%s” (%s).\n"
 
-#: ../clients/cli/connections.c:7959
+#: ../clients/cli/connections.c:8049
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "Pomyślnie zaktualizowano połączenie „%s” (%s).\n"
 
-#: ../clients/cli/connections.c:7992
+#: ../clients/cli/connections.c:8082
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Błąd: sprawdzenie połączenia się nie powiodło: %s\n"
 
-#: ../clients/cli/connections.c:7993
+#: ../clients/cli/connections.c:8083
 msgid "(unknown error)"
 msgstr "(nieznany błąd)"
 
-#: ../clients/cli/connections.c:7994
+#: ../clients/cli/connections.c:8084
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "Można spróbować wykonać „verify fix”, aby naprawić błędy.\n"
 
 #. TRANSLATORS: do not translate 'save', leave it as it is
-#: ../clients/cli/connections.c:8017
+#: ../clients/cli/connections.c:8107
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "Błąd: połączenie nie jest zapisane. Należy najpierw wpisać „save”.\n"
 
-#: ../clients/cli/connections.c:8021
+#: ../clients/cli/connections.c:8111
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Błąd: połączenie jest nieprawidłowe: %s\n"
 
-#: ../clients/cli/connections.c:8031
+#: ../clients/cli/connections.c:8121
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Błąd: nie można aktywować połączenia: %s.\n"
 
-#: ../clients/cli/connections.c:8040
+#: ../clients/cli/connections.c:8130
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "Błąd: aktywowanie połączenia „%s” (%s) się nie powiodło: %s\n"
 
-#: ../clients/cli/connections.c:8047
+#: ../clients/cli/connections.c:8137
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Aktywacja monitorowania połączenia (naciśnięcie dowolnego klawisza "
 "kontynuuje)\n"
 
-#: ../clients/cli/connections.c:8083
+#: ../clients/cli/connections.c:8173
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Błąd: status-line: %s\n"
 
-#: ../clients/cli/connections.c:8091
+#: ../clients/cli/connections.c:8181
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Błąd: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:8099
+#: ../clients/cli/connections.c:8189
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "Błąd: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:8106
+#: ../clients/cli/connections.c:8196
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Obecna konfiguracja nmcli:\n"
 
-#: ../clients/cli/connections.c:8114
+#: ../clients/cli/connections.c:8204
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "Nieprawidłowa opcja konfiguracji „%s”; dozwolone [%s]\n"
 
-#: ../clients/cli/connections.c:8335
+#: ../clients/cli/connections.c:8426
 #, c-format
 msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
 msgstr "Błąd: tylko jedno z „id”, „filename”, UUID lub „path” może być podane."
 
-#: ../clients/cli/connections.c:8349 ../clients/cli/connections.c:8513
+#: ../clients/cli/connections.c:8441 ../clients/cli/connections.c:8605
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Błąd: nieznane połączenie „%s”."
 
-#: ../clients/cli/connections.c:8365
+#: ../clients/cli/connections.c:8458
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 "Ostrzeżenie: modyfikowanie istniejącego połączenia „%s”; parametr „type” "
 "jest ignorowany\n"
 
-#: ../clients/cli/connections.c:8368
+#: ../clients/cli/connections.c:8461
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -2168,200 +2187,200 @@ msgstr ""
 "Ostrzeżenie: modyfikowanie istniejącego połączenia „%s”; parametr „con-name” "
 "jest ignorowany\n"
 
-#: ../clients/cli/connections.c:8395
+#: ../clients/cli/connections.c:8488
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Prawidłowe typy połączeń: %s\n"
 
-#: ../clients/cli/connections.c:8397
+#: ../clients/cli/connections.c:8490
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Błąd: nieznany typ połączenia; %s\n"
 
-#: ../clients/cli/connections.c:8433
+#: ../clients/cli/connections.c:8526
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| interaktywny edytor połączeń nmcli |==="
 
-#: ../clients/cli/connections.c:8436
+#: ../clients/cli/connections.c:8529
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Modyfikowanie istniejącego połączenia „%s”: „%s”"
 
-#: ../clients/cli/connections.c:8438
+#: ../clients/cli/connections.c:8531
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Dodawanie nowego połączenia „%s”"
 
 #. TRANSLATORS: do not translate 'help', leave it as it is
-#: ../clients/cli/connections.c:8441
+#: ../clients/cli/connections.c:8534
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Wpisanie „help” lub „?” wyświetla dostępne polecenia."
 
 #. TRANSLATORS: do not translate 'print', leave it as it is
-#: ../clients/cli/connections.c:8444
+#: ../clients/cli/connections.c:8537
 #, c-format
 msgid "Type 'print' to show all the connection properties."
 msgstr "Wpisanie „print” wyświetla wszystkie właściwości połączenia."
 
 #. TRANSLATORS: do not translate 'describe', leave it as it is
-#: ../clients/cli/connections.c:8447
+#: ../clients/cli/connections.c:8540
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Wpisanie „describe [<ustawienie>.<właściwość>]” wyświetla szczegółowy opis "
 "właściwości."
 
-#: ../clients/cli/connections.c:8475
+#: ../clients/cli/connections.c:8568
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Błąd: zmodyfikowanie połączenia „%s” się nie powiodło: %s"
 
-#: ../clients/cli/connections.c:8481
+#: ../clients/cli/connections.c:8574
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "Pomyślnie zmodyfikowano połączenie „%s” (%s).\n"
 
-#: ../clients/cli/connections.c:8549
+#: ../clients/cli/connections.c:8641
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "Sklonowano %s (%s) jako %s (%s).\n"
 
-#: ../clients/cli/connections.c:8608
+#: ../clients/cli/connections.c:8701
 msgid "New connection name: "
 msgstr "Nazwa nowego połączenia: "
 
-#: ../clients/cli/connections.c:8610
+#: ../clients/cli/connections.c:8703
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "Błąd: brak parametru <nowa nazwa>."
 
-#: ../clients/cli/connections.c:8615 ../clients/cli/connections.c:9101
+#: ../clients/cli/connections.c:8709 ../clients/cli/connections.c:9194
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "Błąd: nieznany dodatkowy parametr: „%s”."
 
-#: ../clients/cli/connections.c:8648
+#: ../clients/cli/connections.c:8741
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "Błąd: nie usunięto wszystkich połączeń."
 
-#: ../clients/cli/connections.c:8649
+#: ../clients/cli/connections.c:8742
 #, c-format
 msgid "Error: Connection deletion failed: %s\n"
 msgstr "Błąd: usunięcie połączenia się nie powiodło: %s\n"
 
-#: ../clients/cli/connections.c:8705 ../clients/cli/connections.c:8826
+#: ../clients/cli/connections.c:8798 ../clients/cli/connections.c:8918
 #, c-format
 msgid "Error: %s.\n"
 msgstr "Błąd: %s.\n"
 
-#: ../clients/cli/connections.c:8706 ../clients/cli/connections.c:8827
+#: ../clients/cli/connections.c:8799 ../clients/cli/connections.c:8919
 #, c-format
 msgid "Error: not all connections found."
 msgstr "Błąd: nie odnaleziono wszystkich połączeń."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8757
+#: ../clients/cli/connections.c:8850
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "Błąd: nie można usunąć nieznanych połączeń: %s."
 
-#: ../clients/cli/connections.c:8767
+#: ../clients/cli/connections.c:8859
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: zmieniono profil połączenia\n"
 
-#: ../clients/cli/connections.c:8793
+#: ../clients/cli/connections.c:8885
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: utworzono profil połączenia\n"
 
-#: ../clients/cli/connections.c:8802
+#: ../clients/cli/connections.c:8894
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: usunięto profil połączenia\n"
 
-#: ../clients/cli/connections.c:8873
+#: ../clients/cli/connections.c:8964
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Błąd: ponowne wczytanie połączeń się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:8905
+#: ../clients/cli/connections.c:8994
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Błąd: wczytanie połączeń się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:8913
+#: ../clients/cli/connections.c:9002
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Nie można wczytać pliku „%s”\n"
 
-#: ../clients/cli/connections.c:8920
+#: ../clients/cli/connections.c:9006
 msgid "File to import: "
 msgstr "Plik do zaimportowania: "
 
-#: ../clients/cli/connections.c:8953
+#: ../clients/cli/connections.c:9039
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Błąd: nie podano żadnych parametrów."
 
-#: ../clients/cli/connections.c:8984
+#: ../clients/cli/connections.c:9072
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "Ostrzeżenie: „type” zostało już podane, ignorowanie dodatkowego.\n"
 
-#: ../clients/cli/connections.c:8998
+#: ../clients/cli/connections.c:9087
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "Ostrzeżenie: „file” zostało już podane, ignorowanie dodatkowego.\n"
 
-#: ../clients/cli/connections.c:9011
+#: ../clients/cli/connections.c:9101
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Błąd: parametr „type” jest wymagany."
 
-#: ../clients/cli/connections.c:9015
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "Błąd: parametr „file” jest wymagany."
 
-#: ../clients/cli/connections.c:9024
+#: ../clients/cli/connections.c:9116
 #, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr "Błąd: odnalezienie wtyczki VPN dla %s się nie powiodło."
 
-#: ../clients/cli/connections.c:9031 ../clients/cli/connections.c:9122
+#: ../clients/cli/connections.c:9124 ../clients/cli/connections.c:9215
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "Błąd: wczytanie wtyczki VPN się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:9040
+#: ../clients/cli/connections.c:9134
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "Błąd: zaimportowanie „%s” się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:9108
+#: ../clients/cli/connections.c:9201
 msgid "Output file name: "
 msgstr "Nazwa pliku wyjściowego: "
 
-#: ../clients/cli/connections.c:9113
+#: ../clients/cli/connections.c:9206
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "Błąd: połączenie nie jest VPN."
 
-#: ../clients/cli/connections.c:9135
+#: ../clients/cli/connections.c:9228
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "Błąd: utworzenie pliku tymczasowego %s się nie powiodło."
 
-#: ../clients/cli/connections.c:9143
+#: ../clients/cli/connections.c:9236
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "Błąd: wyeksportowanie „%s” się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:9155
+#: ../clients/cli/connections.c:9248
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "Błąd: odczytanie pliku tymczasowego „%s” się nie powiodło: %s."
@@ -2375,29 +2394,29 @@ msgstr "Interfejs: "
 msgid "Interface(s): "
 msgstr "Interfejsy: "
 
-#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:1267
+#: ../clients/cli/devices.c:64 ../clients/cli/devices.c:1276
 msgid "(none)"
 msgstr "(brak)"
 
-#: ../clients/cli/devices.c:166 ../clients/cli/devices.c:173
+#: ../clients/cli/devices.c:172 ../clients/cli/devices.c:179
 msgid "(unknown)"
 msgstr "(nieznane)"
 
-#: ../clients/cli/devices.c:322
+#: ../clients/cli/devices.c:328
 #, c-format
 msgid "<invisible> | %s"
 msgstr "<niewidoczne> | %s"
 
-#: ../clients/cli/devices.c:323
+#: ../clients/cli/devices.c:329
 msgid "<invisible>"
 msgstr "<niewidoczne>"
 
-#: ../clients/cli/devices.c:424
+#: ../clients/cli/devices.c:430
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:725
+#: ../clients/cli/devices.c:731
 #, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -2480,7 +2499,7 @@ msgstr ""
 "  lldp [list [ifname <nazwa interfejsu>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:755
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2510,7 +2529,7 @@ msgstr ""
 "device” wywołuje „nmcli device status”.\n"
 "\n"
 
-#: ../clients/cli/devices.c:764
+#: ../clients/cli/devices.c:770
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2529,7 +2548,7 @@ msgstr ""
 "Polecenie wyświetla szczegóły dla wszystkich urządzeń lub tylko podanego.\n"
 "\n"
 
-#: ../clients/cli/devices.c:775
+#: ../clients/cli/devices.c:781
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2552,7 +2571,7 @@ msgstr ""
 "automatyczne łączenie.\n"
 "\n"
 
-#: ../clients/cli/devices.c:787
+#: ../clients/cli/devices.c:793
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -2571,7 +2590,7 @@ msgstr ""
 "połączenia od ostatniego zastosowania zmian.\n"
 "\n"
 
-#: ../clients/cli/devices.c:798
+#: ../clients/cli/devices.c:804
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2610,7 +2629,7 @@ msgstr ""
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 
-#: ../clients/cli/devices.c:818
+#: ../clients/cli/devices.c:824
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2631,7 +2650,7 @@ msgstr ""
 "aktywowanie połączeń bez działania użytkownika.\n"
 "\n"
 
-#: ../clients/cli/devices.c:830
+#: ../clients/cli/devices.c:836
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2654,7 +2673,7 @@ msgstr ""
 "tym poleceniem.\n"
 "\n"
 
-#: ../clients/cli/devices.c:843
+#: ../clients/cli/devices.c:849
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2677,7 +2696,7 @@ msgstr ""
 "Modyfikuje właściwości urządzenia.\n"
 "\n"
 
-#: ../clients/cli/devices.c:856
+#: ../clients/cli/devices.c:862
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2698,7 +2717,7 @@ msgstr ""
 "Monitoruje wszystkie urządzenia, jeśli nie podano żadnego interfejsu.\n"
 "\n"
 
-#: ../clients/cli/devices.c:868
+#: ../clients/cli/devices.c:874
 #, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -2805,7 +2824,7 @@ msgstr ""
 "należy użyć „nmcli device wifi list”.\n"
 "\n"
 
-#: ../clients/cli/devices.c:915
+#: ../clients/cli/devices.c:921
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -2825,90 +2844,90 @@ msgstr ""
 "może być używana do wyświetlania listy sąsiadów dla konkretnego interfejsu.\n"
 "\n"
 
-#: ../clients/cli/devices.c:1013
+#: ../clients/cli/devices.c:1019
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Błąd: nie podano żadnego interfejsu."
 
-#: ../clients/cli/devices.c:1036
+#: ../clients/cli/devices.c:1042
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "Ostrzeżenie: podwójny parametr „%s”.\n"
 
-#: ../clients/cli/devices.c:1039
+#: ../clients/cli/devices.c:1045
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "Błąd: nie odnaleziono urządzenia „%s”.\n"
 
-#: ../clients/cli/devices.c:1040
+#: ../clients/cli/devices.c:1046
 #, c-format
 msgid "Error: not all devices found."
 msgstr "Błąd: nie odnaleziono wszystkich urządzeń."
 
-#: ../clients/cli/devices.c:1071
+#: ../clients/cli/devices.c:1077
 msgid "No interface specified"
 msgstr "Nie podano żadnego interfejsu"
 
-#: ../clients/cli/devices.c:1090
+#: ../clients/cli/devices.c:1096
 #, c-format
 msgid "Device '%s' not found"
 msgstr "Nie odnaleziono urządzenia „%s”"
 
-#: ../clients/cli/devices.c:1186
+#: ../clients/cli/devices.c:1192
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:1187
+#: ../clients/cli/devices.c:1193
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1226
+#: ../clients/cli/devices.c:1235
 msgid "Ad-Hoc"
 msgstr "Ad-hoc"
 
-#: ../clients/cli/devices.c:1227
+#: ../clients/cli/devices.c:1236
 msgid "Infra"
 msgstr "Infrastruktura"
 
-#: ../clients/cli/devices.c:1228 ../src/devices/wifi/nm-device-olpc-mesh.c:118
+#: ../clients/cli/devices.c:1237 ../src/devices/wifi/nm-device-olpc-mesh.c:118
 msgid "Mesh"
 msgstr "Sieć kratowa"
 
-#: ../clients/cli/devices.c:1229
+#: ../clients/cli/devices.c:1238
 msgid "N/A"
 msgstr "Nie dotyczy"
 
-#: ../clients/cli/devices.c:1424
+#: ../clients/cli/devices.c:1433
 msgid "Device details"
 msgstr "Informacje o urządzeniu"
 
-#: ../clients/cli/devices.c:1435
+#: ../clients/cli/devices.c:1444
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "Błąd: „device show”: %s"
 
-#: ../clients/cli/devices.c:1747
+#: ../clients/cli/devices.c:1760
 msgid "Status of devices"
 msgstr "Stan urządzenia"
 
-#: ../clients/cli/devices.c:1751
+#: ../clients/cli/devices.c:1764
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Błąd: „device status”: %s"
 
-#: ../clients/cli/devices.c:1814 ../clients/cli/general.c:537
+#: ../clients/cli/devices.c:1826 ../clients/cli/general.c:511
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Błąd: przekroczono czas oczekiwania o %d sekund."
 
-#: ../clients/cli/devices.c:1886
+#: ../clients/cli/devices.c:1898
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "Pomyślnie aktywowano urządzenie „%s” za pomocą „%s”.\n"
 
-#: ../clients/cli/devices.c:1891
+#: ../clients/cli/devices.c:1903
 #, c-format
 msgid ""
 "Hint: \"nmcli dev wifi show-password\" shows the Wi-Fi name and password.\n"
@@ -2916,154 +2935,154 @@ msgstr ""
 "Wskazówka: „nmcli dev wifi show-password” wyświetla nazwę i hasło sieci Wi-"
 "Fi.\n"
 
-#: ../clients/cli/devices.c:1895
+#: ../clients/cli/devices.c:1907
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "Błąd: aktywacja połączenia się nie powiodła: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1925
+#: ../clients/cli/devices.c:1937
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "Błąd: ustawienie hotspotu Wi-Fi się nie powiodło: %s"
 
-#: ../clients/cli/devices.c:1928
+#: ../clients/cli/devices.c:1940
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "Błąd: dodanie/aktywacja nowego połączenia się nie powiodła: %s"
 
-#: ../clients/cli/devices.c:1931
+#: ../clients/cli/devices.c:1943
 #, c-format
 msgid "Error: Failed to activate connection: %s"
 msgstr "Błąd: aktywacja połączenia się nie powiodła: %s"
 
-#: ../clients/cli/devices.c:1996
+#: ../clients/cli/devices.c:2008
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "Błąd: aktywacja urządzenia się nie powiodła: %s"
 
-#: ../clients/cli/devices.c:2046
+#: ../clients/cli/devices.c:2059
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Błąd: niedozwolony dodatkowy parametr: „%s”."
 
-#: ../clients/cli/devices.c:2116 ../clients/cli/devices.c:2131
-#: ../clients/cli/devices.c:2368
+#: ../clients/cli/devices.c:2128 ../clients/cli/devices.c:2143
+#: ../clients/cli/devices.c:2384
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "Pomyślnie rozłączono urządzenie „%s”.\n"
 
-#: ../clients/cli/devices.c:2119 ../clients/cli/devices.c:2442
+#: ../clients/cli/devices.c:2131 ../clients/cli/devices.c:2457
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "Pomyślnie usunięto urządzenie „%s”.\n"
 
-#: ../clients/cli/devices.c:2181 ../clients/cli/devices.c:2251
+#: ../clients/cli/devices.c:2193 ../clients/cli/devices.c:2263
 #, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr ""
 "Błąd: ponowne zastosowanie połączenia do urządzenia „%s” (%s) się nie "
 "powiodło: %s"
 
-#: ../clients/cli/devices.c:2191 ../clients/cli/devices.c:2260
+#: ../clients/cli/devices.c:2203 ../clients/cli/devices.c:2272
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "Pomyślnie zastosowano ponownie połączenie do urządzenia „%s”.\n"
 
-#: ../clients/cli/devices.c:2285
+#: ../clients/cli/devices.c:2299
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr ""
 "Błąd: odczytanie zastosowanego połączenia od urządzenia „%s” (%s) się nie "
 "powiodło: %s"
 
-#: ../clients/cli/devices.c:2352
+#: ../clients/cli/devices.c:2368
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "Błąd: nie rozłączono wszystkich połączeń."
 
-#: ../clients/cli/devices.c:2353
+#: ../clients/cli/devices.c:2369
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "Błąd: rozłączenie urządzenia „%s” (%s) się nie powiodło: %s\n"
 
-#: ../clients/cli/devices.c:2433
+#: ../clients/cli/devices.c:2448
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "Błąd: nie usunięto wszystkich urządzeń."
 
-#: ../clients/cli/devices.c:2434
+#: ../clients/cli/devices.c:2449
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "Błąd: usunięcie urządzenia „%s” (%s) się nie powiodło: %s\n"
 
-#: ../clients/cli/devices.c:2516
+#: ../clients/cli/devices.c:2531
 #, c-format
 msgid "Error: No property specified."
 msgstr "Błąd: nie podano właściwości."
 
-#: ../clients/cli/devices.c:2531 ../clients/cli/devices.c:2548
-#: ../clients/cli/general.c:777 ../clients/cli/general.c:789
+#: ../clients/cli/devices.c:2547 ../clients/cli/devices.c:2566
+#: ../clients/cli/general.c:769 ../clients/cli/general.c:782
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Błąd: brak parametru „%s”."
 
-#: ../clients/cli/devices.c:2537
+#: ../clients/cli/devices.c:2554
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "Błąd: „managed”: %s."
 
-#: ../clients/cli/devices.c:2554
+#: ../clients/cli/devices.c:2573
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Błąd: „autoconnect”: %s."
 
-#: ../clients/cli/devices.c:2562 ../clients/cli/general.c:803
+#: ../clients/cli/devices.c:2582 ../clients/cli/general.c:797
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "Błąd: nieznana właściwość „%s”."
 
-#: ../clients/cli/devices.c:2611
+#: ../clients/cli/devices.c:2630
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: używanie połączenia „%s”\n"
 
-#: ../clients/cli/devices.c:2637
+#: ../clients/cli/devices.c:2656
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: utworzono urządzenie\n"
 
-#: ../clients/cli/devices.c:2644
+#: ../clients/cli/devices.c:2663
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: usunięto urządzenie\n"
 
-#: ../clients/cli/devices.c:2824
+#: ../clients/cli/devices.c:2842
 msgid "Wi-Fi scan list"
 msgstr "Lista skanowania sieci Wi-Fi"
 
-#: ../clients/cli/devices.c:2911
+#: ../clients/cli/devices.c:2960 ../clients/cli/devices.c:3193
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Błąd: nie odnaleziono punktu dostępowego z BSSID „%s”."
 
-#: ../clients/cli/devices.c:3067
+#: ../clients/cli/devices.c:3116
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Błąd: „device wifi”: %s"
 
-#: ../clients/cli/devices.c:3087
+#: ../clients/cli/devices.c:3135
 #, c-format
 msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
 msgstr ""
 "Błąd: nieprawidłowy parametr ponownego skanowania: „%s” nie jest jednym "
 "z [auto, no, yes]"
 
-#: ../clients/cli/devices.c:3094
+#: ../clients/cli/devices.c:3174
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Błąd: nie odnaleziono urządzenia „%s”."
 
-#: ../clients/cli/devices.c:3105
+#: ../clients/cli/devices.c:3179
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -3072,28 +3091,28 @@ msgstr ""
 "Błąd: urządzenie „%s” nie zostało rozpoznane jako urządzenie Wi-Fi. Proszę "
 "sprawdzić poprawność instalacji wtyczki Wi-Fi usługi NetworkManager."
 
-#: ../clients/cli/devices.c:3109 ../clients/cli/devices.c:3430
-#: ../clients/cli/devices.c:4006 ../clients/cli/devices.c:4134
-#: ../clients/cli/devices.c:4266
+#: ../clients/cli/devices.c:3183 ../clients/cli/devices.c:3512
+#: ../clients/cli/devices.c:4097 ../clients/cli/devices.c:4225
+#: ../clients/cli/devices.c:4358
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Błąd: urządzenie „%s” nie jest urządzeniem Wi-Fi."
 
-#: ../clients/cli/devices.c:3277
+#: ../clients/cli/devices.c:3359
 msgid "SSID or BSSID: "
 msgstr "SSID lub BSSID: "
 
-#: ../clients/cli/devices.c:3282
+#: ../clients/cli/devices.c:3364
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Błąd: brak SSID lub BSSID."
 
-#: ../clients/cli/devices.c:3319
+#: ../clients/cli/devices.c:3401
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Błąd: wartość parametru BSSID „%s” nie jest prawidłowym BSSID."
 
-#: ../clients/cli/devices.c:3349
+#: ../clients/cli/devices.c:3431
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -3101,48 +3120,48 @@ msgstr ""
 "Błąd: wartość „%s” parametru wep-key-type jest nieprawidłowa, należy użyć "
 "„key” lub „phrase”."
 
-#: ../clients/cli/devices.c:3376 ../clients/cli/devices.c:3394
+#: ../clients/cli/devices.c:3458 ../clients/cli/devices.c:3476
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Błąd: %s: %s."
 
-#: ../clients/cli/devices.c:3413
+#: ../clients/cli/devices.c:3495
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "Błąd: BSSID do połączenia (%s) różni się od parametru BSSID (%s)."
 
-#: ../clients/cli/devices.c:3419
+#: ../clients/cli/devices.c:3501
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Błąd: parametr „%s” nie wynosi SSID ani BSSID."
 
-#: ../clients/cli/devices.c:3432 ../clients/cli/devices.c:4008
-#: ../clients/cli/devices.c:4136 ../clients/cli/devices.c:4367
+#: ../clients/cli/devices.c:3514 ../clients/cli/devices.c:4099
+#: ../clients/cli/devices.c:4227 ../clients/cli/devices.c:4463
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Błąd: nie odnaleziono urządzenia Wi-Fi."
 
-#: ../clients/cli/devices.c:3452
+#: ../clients/cli/devices.c:3534
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "Błąd: skanowanie ukrytego SSID się nie powiodło: %s."
 
-#: ../clients/cli/devices.c:3479
+#: ../clients/cli/devices.c:3561
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Błąd: nie odnaleziono sieci z SSID „%s”."
 
-#: ../clients/cli/devices.c:3481
+#: ../clients/cli/devices.c:3563
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Błąd: nie odnaleziono punktu dostępowego z BSSID „%s”."
 
-#: ../clients/cli/devices.c:3508
+#: ../clients/cli/devices.c:3590
 #, c-format
 msgid "Error: Connection '%s' exists but properties don't match."
 msgstr "Błąd: połączenie „%s” istnieje, ale właściwości się nie zgadzają."
 
-#: ../clients/cli/devices.c:3551
+#: ../clients/cli/devices.c:3633
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
@@ -3150,74 +3169,75 @@ msgstr ""
 "Ostrzeżenie: „%s” musi być SSID dla ukrytych punktów dostępowych, ale "
 "wygląda jak BSSID.\n"
 
-#: ../clients/cli/devices.c:3588
+#: ../clients/cli/devices.c:3670
 msgid "Password: "
 msgstr "Hasło: "
 
-#: ../clients/cli/devices.c:3729
+#: ../clients/cli/devices.c:3809
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "„%s” nie jest prawidłowym PSK WPA"
 
-#: ../clients/cli/devices.c:3746
+#: ../clients/cli/devices.c:3826
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr ""
 "„%s” nie jest prawidłowym kluczem WEP (musi mieć 5 lub 13 znaków ASCII)"
 
-#: ../clients/cli/devices.c:3762
+#: ../clients/cli/devices.c:3842
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "Hasło hotspota: %s\n"
 
-#: ../clients/cli/devices.c:3927
+#: ../clients/cli/devices.c:4010
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "Błąd: SSID jest za długie."
 
-#: ../clients/cli/devices.c:3942
+#: ../clients/cli/devices.c:4027
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
 "Błąd: wartość „%s” parametru pasma jest nieprawidłowa; należy użyć „a” lub "
 "„bg”."
 
-#: ../clients/cli/devices.c:3989
+#: ../clients/cli/devices.c:4078
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "Błąd: kanał także wymaga pasma."
 
-#: ../clients/cli/devices.c:3994
+#: ../clients/cli/devices.c:4084
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "Błąd: kanał „%s” jest nieprawidłowy dla pasma „%s”."
 
-#: ../clients/cli/devices.c:4019
+#: ../clients/cli/devices.c:4111
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr ""
 "Błąd: urządzenie „%s” nie obsługuje trybu punktu dostępowego ani Ad-Hoc."
 
-#: ../clients/cli/devices.c:4041
+#: ../clients/cli/devices.c:4134
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "Błąd: nieprawidłowe „password”: %s."
 
-#: ../clients/cli/devices.c:4094 ../clients/cli/devices.c:4318
+#: ../clients/cli/devices.c:4185 ../clients/cli/devices.c:4410
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "Błąd: „%s” nie może się powtarzać."
 
-#: ../clients/cli/devices.c:4227 ../clients/cli/devices.c:4231
-#: ../clients/cli/devices.c:4236 ../clients/tui/nmt-page-wifi.c:249
+#: ../clients/cli/devices.c:4316 ../clients/cli/devices.c:4320
+#: ../clients/cli/devices.c:4325 ../clients/cli/devices.c:4328
+#: ../clients/tui/nmt-page-wifi.c:250
 msgid "Security"
 msgstr "Zabezpieczenia"
 
-#: ../clients/cli/devices.c:4227
+#: ../clients/cli/devices.c:4316
 msgid "None"
 msgstr "Brak"
 
-#: ../clients/cli/devices.c:4240 ../clients/common/nm-secret-agent-simple.c:273
+#: ../clients/cli/devices.c:4332 ../clients/common/nm-secret-agent-simple.c:273
 #: ../clients/common/nm-secret-agent-simple.c:310
 #: ../clients/common/nm-secret-agent-simple.c:333
 #: ../clients/common/nm-secret-agent-simple.c:366
@@ -3228,79 +3248,79 @@ msgstr "Brak"
 #: ../clients/common/nm-vpn-helpers.c:114
 #: ../clients/common/nm-vpn-helpers.c:120
 #: ../clients/common/nm-vpn-helpers.c:125 ../clients/tui/nmt-page-dsl.c:62
-#: ../clients/tui/nmt-page-wifi.c:265 ../clients/tui/nmt-page-wifi.c:297
-#: ../clients/tui/nmt-page-wifi.c:330
+#: ../clients/tui/nmt-page-wifi.c:266 ../clients/tui/nmt-page-wifi.c:298
+#: ../clients/tui/nmt-page-wifi.c:331
 msgid "Password"
 msgstr "Hasło"
 
-#: ../clients/cli/devices.c:4355
+#: ../clients/cli/devices.c:4450
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. Main header name
-#: ../clients/cli/devices.c:4411
+#: ../clients/cli/devices.c:4504
 msgid "Device LLDP neighbors"
 msgstr "Sąsiedzi LLDP urządzenia"
 
-#: ../clients/cli/devices.c:4521
+#: ../clients/cli/devices.c:4617
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "Błąd: „device lldp lis”: %s"
 
-#: ../clients/cli/general.c:27
+#: ../clients/cli/general.c:32
 msgid "asleep"
 msgstr "wstrzymane"
 
-#: ../clients/cli/general.c:28
+#: ../clients/cli/general.c:33
 msgid "connecting"
 msgstr "łączenie"
 
-#: ../clients/cli/general.c:29
+#: ../clients/cli/general.c:34
 msgid "connected (local only)"
 msgstr "połączono (tylko lokalnie)"
 
-#: ../clients/cli/general.c:30
+#: ../clients/cli/general.c:35
 msgid "connected (site only)"
 msgstr "połączono (tylko witryny)"
 
-#: ../clients/cli/general.c:31 ../clients/common/nm-client-utils.c:260
+#: ../clients/cli/general.c:36 ../clients/common/nm-client-utils.c:260
 msgid "connected"
 msgstr "połączono"
 
-#: ../clients/cli/general.c:32
+#: ../clients/cli/general.c:37
 msgid "disconnecting"
 msgstr "rozłączanie"
 
-#: ../clients/cli/general.c:33 ../clients/common/nm-client-utils.c:253
+#: ../clients/cli/general.c:38 ../clients/common/nm-client-utils.c:253
 msgid "disconnected"
 msgstr "rozłączono"
 
-#: ../clients/cli/general.c:124
+#: ../clients/cli/general.c:94
 msgid "auth"
 msgstr "uwierzytelnianie"
 
-#: ../clients/cli/general.c:152
+#: ../clients/cli/general.c:123
 msgid "running"
 msgstr "uruchamiany"
 
-#: ../clients/cli/general.c:166
+#: ../clients/cli/general.c:137
 msgid "starting"
 msgstr "uruchamianie"
 
-#: ../clients/cli/general.c:166
+#: ../clients/cli/general.c:137
 msgid "started"
 msgstr "uruchomiono"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:171
 msgid "enabled"
 msgstr "włączone"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:171
 msgid "disabled"
 msgstr "wyłączone"
 
-#: ../clients/cli/general.c:318
+#: ../clients/cli/general.c:289
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3329,7 +3349,7 @@ msgstr ""
 "  logging [level <poziom dziennika>] [domains <domeny dziennika>]\n"
 "\n"
 
-#: ../clients/cli/general.c:329
+#: ../clients/cli/general.c:300
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3346,7 +3366,7 @@ msgstr ""
 "„nmcli gen status”\n"
 "\n"
 
-#: ../clients/cli/general.c:338
+#: ../clients/cli/general.c:309
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3369,7 +3389,7 @@ msgstr ""
 "ustawi ją jako nową trwałą systemową nazwę komputera.\n"
 "\n"
 
-#: ../clients/cli/general.c:350
+#: ../clients/cli/general.c:321
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -3382,7 +3402,7 @@ msgstr ""
 "Wyświetla uprawnienia dzwoniącego dla uwierzytelnionych działań.\n"
 "\n"
 
-#: ../clients/cli/general.c:358
+#: ../clients/cli/general.c:329
 #, c-format
 msgid ""
 "Usage: nmcli general reload { ARGUMENTS | help }\n"
@@ -3445,7 +3465,7 @@ msgstr ""
 "Bez flag wszystkie obsługiwane elementy są wczytywane ponownie, co jest\n"
 "identyczne z wysłaniem sygnału SIGHUP.\n"
 
-#: ../clients/cli/general.c:390
+#: ../clients/cli/general.c:361
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3471,7 +3491,7 @@ msgstr ""
 "podręcznika.\n"
 "\n"
 
-#: ../clients/cli/general.c:403
+#: ../clients/cli/general.c:374
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3496,7 +3516,7 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:413
+#: ../clients/cli/general.c:384
 #, c-format
 msgid ""
 "Usage: nmcli networking on { help }\n"
@@ -3509,7 +3529,7 @@ msgstr ""
 "Włącza sieć.\n"
 "\n"
 
-#: ../clients/cli/general.c:421
+#: ../clients/cli/general.c:392
 #, c-format
 msgid ""
 "Usage: nmcli networking off { help }\n"
@@ -3522,7 +3542,7 @@ msgstr ""
 "Wyłącza sieć.\n"
 "\n"
 
-#: ../clients/cli/general.c:429
+#: ../clients/cli/general.c:400
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3543,7 +3563,7 @@ msgstr ""
 "sprawdzi łączność.\n"
 "\n"
 
-#: ../clients/cli/general.c:441
+#: ../clients/cli/general.c:412
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3560,7 +3580,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:450
+#: ../clients/cli/general.c:421
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3577,7 +3597,7 @@ msgstr ""
 "Uzyskuje stan wszystkich przełączników radia lub włącza/wyłącza je.\n"
 "\n"
 
-#: ../clients/cli/general.c:460
+#: ../clients/cli/general.c:431
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3594,7 +3614,7 @@ msgstr ""
 "Uzyskuje stan przełącznika radia Wi-Fi lub włącza/wyłącza go.\n"
 "\n"
 
-#: ../clients/cli/general.c:470
+#: ../clients/cli/general.c:441
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3611,7 +3631,7 @@ msgstr ""
 "Uzyskuje stan przełącznika radia komórkowego lub włącza/wyłącza go.\n"
 "\n"
 
-#: ../clients/cli/general.c:480
+#: ../clients/cli/general.c:451
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3626,50 +3646,56 @@ msgstr ""
 "Wyświetla wiersz, kiedy usługa NetworkManager ulegnie zmianie\n"
 "\n"
 
-#: ../clients/cli/general.c:510
+#: ../clients/cli/general.c:481
 msgid "NetworkManager status"
 msgstr "Stan usługi NetworkManager"
 
-#: ../clients/cli/general.c:514
+#: ../clients/cli/general.c:485
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Błąd: tylko te pola są dozwolone: %s"
 
-#: ../clients/cli/general.c:567
+#. NetworkManager quit while we were waiting.
+#: ../clients/cli/general.c:541 ../clients/tui/nmtui.c:246
+#, c-format
+msgid "NetworkManager is not running."
+msgstr "Usługa NetworkManager nie jest uruchomiona."
+
+#: ../clients/cli/general.c:561
 msgid "NetworkManager permissions"
 msgstr "Uprawnienia usługi NetworkManager"
 
-#: ../clients/cli/general.c:571
+#: ../clients/cli/general.c:565
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Błąd: „general permissions”: %s"
 
-#: ../clients/cli/general.c:664
+#: ../clients/cli/general.c:642
 #, c-format
 msgid "Error: invalid reload flag '%s'. Allowed flags are: %s"
 msgstr ""
 "Błąd: nieprawidłowa flaga ponownego wczytania „%s”. Dozwolone flagi: %s"
 
-#: ../clients/cli/general.c:674
+#: ../clients/cli/general.c:653
 #, c-format
 msgid "Error: extra argument '%s'"
 msgstr "Błąd: dodatkowy parametr „%s”"
 
-#: ../clients/cli/general.c:688
+#: ../clients/cli/general.c:668
 #, c-format
 msgid "Error: failed to reload: %s"
 msgstr "Błąd: ponowne wczytanie się nie powiodło: %s"
 
-#: ../clients/cli/general.c:727
+#: ../clients/cli/general.c:704
 msgid "NetworkManager logging"
 msgstr "Dziennik usługi NetworkManager"
 
-#: ../clients/cli/general.c:731
+#: ../clients/cli/general.c:708
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Błąd: „general logging”: %s"
 
-#: ../clients/cli/general.c:813
+#: ../clients/cli/general.c:740
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "Błąd: ustawienie zapisywania w dzienniku się nie powiodło: %s"
@@ -3679,151 +3705,161 @@ msgstr "Błąd: ustawienie zapisywania w dzienniku się nie powiodło: %s"
 msgid "Error: failed to set hostname: %s"
 msgstr "Błąd: ustawienie nazwy komputera się nie powiodło: %s"
 
-#: ../clients/cli/general.c:900
+#: ../clients/cli/general.c:891
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "Błąd: wartość „--fields” „%s” jest nieprawidłowa (dozwolone pola: %s)"
 
-#: ../clients/cli/general.c:925
+#: ../clients/cli/general.c:916
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Błąd: nieprawidłowy parametr „%s”: „%s” (należy użyć on/off)."
 
+#: ../clients/cli/general.c:939
+#, c-format
+msgid "Error: failed to set networking: %s"
+msgstr "Błąd: ustawienie sieci się nie powiodło: %s"
+
 #. no arguments -> get current state
-#: ../clients/cli/general.c:973 ../clients/cli/general.c:985
+#: ../clients/cli/general.c:984 ../clients/cli/general.c:996
 msgid "Connectivity"
 msgstr "Łączność"
 
-#: ../clients/cli/general.c:988
+#: ../clients/cli/general.c:999
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Błąd: polecenie „networking” „%s” jest nieprawidłowe."
 
-#: ../clients/cli/general.c:1002
+#: ../clients/cli/general.c:1011
 msgid "Networking"
 msgstr "Sieć"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:1037
+#: ../clients/cli/general.c:1039
 msgid "Radio switches"
-msgstr "Przełączniki radiowe"
+msgstr "Przełączniki radia"
+
+#: ../clients/cli/general.c:1064
+#, c-format
+msgid "Error: failed to set Wi-Fi radio: %s"
+msgstr "Błąd: ustawienie radia Wi-Fi się nie powiodło: %s"
 
 #. no argument, show current Wi-Fi state
-#: ../clients/cli/general.c:1067
+#: ../clients/cli/general.c:1082
 msgid "Wi-Fi radio switch"
-msgstr "Przełącznik radiowy Wi-Fi"
+msgstr "Przełącznik radia Wi-Fi"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1094
+#: ../clients/cli/general.c:1118
 msgid "WWAN radio switch"
-msgstr "Przełącznik radiowy WWAN"
+msgstr "Przełącznik radia WWAN"
 
-#: ../clients/cli/general.c:1142
+#: ../clients/cli/general.c:1158
 msgid "NetworkManager has started"
 msgstr "Uruchomiono usługę NetworkManager"
 
-#: ../clients/cli/general.c:1142
+#: ../clients/cli/general.c:1158
 msgid "NetworkManager has stopped"
 msgstr "Zatrzymano usługę NetworkManager"
 
-#: ../clients/cli/general.c:1153
+#: ../clients/cli/general.c:1169
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "Ustawiono nazwę komputera na „%s”\n"
 
-#: ../clients/cli/general.c:1168
+#: ../clients/cli/general.c:1184
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "„%s” jest teraz głównym połączeniem\n"
 
-#: ../clients/cli/general.c:1170
+#: ../clients/cli/general.c:1186
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "Brak głównego połączenia\n"
 
-#: ../clients/cli/general.c:1182
+#: ../clients/cli/general.c:1198
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "Łączność wynosi teraz „%s”\n"
 
-#: ../clients/cli/general.c:1196
+#: ../clients/cli/general.c:1212
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "Usługa NetworkManager jest teraz w stanie „%s”\n"
 
-#: ../clients/cli/general.c:1216
+#: ../clients/cli/general.c:1232
 msgid "connection available"
 msgstr "połączenie jest dostępne"
 
-#: ../clients/cli/general.c:1218
+#: ../clients/cli/general.c:1234
 msgid "connections available"
 msgstr "połączenia są dostępne"
 
-#: ../clients/cli/general.c:1236
+#: ../clients/cli/general.c:1252
 msgid "autoconnect"
 msgstr "łączenie automatyczne"
 
-#: ../clients/cli/general.c:1238
+#: ../clients/cli/general.c:1254
 msgid "fw missing"
 msgstr "brak oprogramowana sprzętowego"
 
-#: ../clients/cli/general.c:1243
+#: ../clients/cli/general.c:1259
 msgid "plugin missing"
 msgstr "brak wtyczki"
 
-#: ../clients/cli/general.c:1253 ../clients/cli/general.c:1267
+#: ../clients/cli/general.c:1269 ../clients/cli/general.c:1283
 msgid "sw disabled"
 msgstr "wyłączone programowo"
 
-#: ../clients/cli/general.c:1258 ../clients/cli/general.c:1272
+#: ../clients/cli/general.c:1274 ../clients/cli/general.c:1288
 msgid "hw disabled"
 msgstr "wyłączone sprzętowo"
 
-#: ../clients/cli/general.c:1283
+#: ../clients/cli/general.c:1299
 msgid "sw"
 msgstr "oprogramowanie"
 
-#: ../clients/cli/general.c:1285
+#: ../clients/cli/general.c:1301
 msgid "hw"
 msgstr "sprzęt"
 
-#: ../clients/cli/general.c:1290
+#: ../clients/cli/general.c:1306
 msgid "iface"
 msgstr "interfejs"
 
-#: ../clients/cli/general.c:1293
+#: ../clients/cli/general.c:1309
 msgid "port"
 msgstr "port"
 
-#: ../clients/cli/general.c:1296
+#: ../clients/cli/general.c:1312
 msgid "mtu"
 msgstr "MTU"
 
-#: ../clients/cli/general.c:1313
+#: ../clients/cli/general.c:1329
 msgid "master"
 msgstr "master"
 
-#: ../clients/cli/general.c:1317 ../clients/tui/nm-editor-utils.c:235
+#: ../clients/cli/general.c:1333 ../clients/tui/nm-editor-utils.c:230
 #: ../clients/tui/nmt-connect-connection-list.c:394
 msgid "VPN"
 msgstr "VPN"
 
-#: ../clients/cli/general.c:1319
+#: ../clients/cli/general.c:1335
 msgid "ip4 default"
 msgstr "domyślne IPv4"
 
-#: ../clients/cli/general.c:1321
+#: ../clients/cli/general.c:1337
 msgid "ip6 default"
 msgstr "domyślne IPv6"
 
-#: ../clients/cli/general.c:1403
+#: ../clients/cli/general.c:1416
 #, c-format
 msgid "%s VPN connection"
 msgstr "Połączenie VPN %s"
 
 #. TRANSLATORS: prints header line for activated device in plain `nmcli` overview output as
 #. * "<interface-name>: <device-state> to <connection-id>"
-#: ../clients/cli/general.c:1423
+#: ../clients/cli/general.c:1436
 #, c-format
 msgctxt "nmcli-overview"
 msgid "%s: %s to %s"
@@ -3831,13 +3867,13 @@ msgstr "%s: %s do %s"
 
 #. TRANSLATORS: prints header line for not active device in plain `nmcli` overview output as
 #. * "<interface-name>: <device-state>"
-#: ../clients/cli/general.c:1430
+#: ../clients/cli/general.c:1443
 #, c-format
 msgctxt "nmcli-overview"
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../clients/cli/general.c:1480
+#: ../clients/cli/general.c:1493
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3854,17 +3890,17 @@ msgstr ""
 "Strony podręcznika nmcli(1) i nmcli-examples(7) zawierają pełne informacje\n"
 "o użyciu.\n"
 
-#: ../clients/cli/general.c:1501
+#: ../clients/cli/general.c:1509
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "Błąd: polecenie „monitor” „%s” jest nieprawidłowe."
 
-#: ../clients/cli/general.c:1513
+#: ../clients/cli/general.c:1521
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr ""
 "Usługa NetworkManager nie jest uruchomiona (oczekiwanie na uruchomienie)\n"
 
-#: ../clients/cli/nmcli.c:230
+#: ../clients/cli/nmcli.c:231
 #, c-format
 msgid ""
 "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -3918,104 +3954,99 @@ msgstr ""
 "OBJECT\n"
 "  g[eneral]       ogólny stan i działania usługi NetworkManager\n"
 "  n[etworking]    ogólne sterowanie siecią\n"
-"  r[adio]         przełączniki radiowe usługi NetworkManager\n"
+"  r[adio]         przełączniki radia usługi NetworkManager\n"
 "  c[onnection]    połączenia usługi NetworkManager\n"
 "  d[evice]        urządzenia zarządzane przez usługę NetworkManager\n"
 "  a[gent]         agent haseł lub agent polkit usługi NetworkManager\n"
 "  m[onitor]       monitoruje zmiany usługi NetworkManager\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:310
+#: ../clients/cli/nmcli.c:306
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Błąd: brak parametru dla opcji „%s”."
 
-#: ../clients/cli/nmcli.c:618
+#: ../clients/cli/nmcli.c:617
 #, c-format
 msgid "Unexpected end of file following '%s'\n"
 msgstr "Nieoczekiwany koniec pliku po „%s”\n"
 
-#: ../clients/cli/nmcli.c:626
+#: ../clients/cli/nmcli.c:625
 #, c-format
 msgid "Expected whitespace following '%s'\n"
 msgstr "Nieoczekiwana spacja po „%s”\n"
 
-#: ../clients/cli/nmcli.c:638
+#: ../clients/cli/nmcli.c:637
 #, c-format
 msgid "Expected a value for '%s'\n"
 msgstr "Oczekiwano wartości dla „%s”\n"
 
-#: ../clients/cli/nmcli.c:652
+#: ../clients/cli/nmcli.c:651
 #, c-format
 msgid "Expected a line break following '%s'\n"
 msgstr "Oczekiwano nowego wiersza po „%s”\n"
 
-#: ../clients/cli/nmcli.c:741
+#: ../clients/cli/nmcli.c:757
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Błąd: opcja „--terse” został podana po raz drugi."
 
-#: ../clients/cli/nmcli.c:746
+#: ../clients/cli/nmcli.c:762
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Błąd: opcja „--terse” jest wzajemnie wykluczająca z opcją „--pretty”."
 
-#: ../clients/cli/nmcli.c:754
+#: ../clients/cli/nmcli.c:770
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Błąd: opcja „--pretty” został podana po raz drugi."
 
-#: ../clients/cli/nmcli.c:759
+#: ../clients/cli/nmcli.c:775
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Błąd: opcja „--pretty” jest wzajemnie wykluczająca z opcją „--terse”."
 
-#: ../clients/cli/nmcli.c:774
+#: ../clients/cli/nmcli.c:790
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
 msgstr "Błąd: „%s” nie jest prawidłowym parametrem dla opcji „%s”."
 
-#: ../clients/cli/nmcli.c:788 ../clients/cli/nmcli.c:800
+#: ../clients/cli/nmcli.c:804 ../clients/cli/nmcli.c:816
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Błąd: „%s” nie jest prawidłowym parametrem dla opcji „%s”."
 
-#: ../clients/cli/nmcli.c:824
+#: ../clients/cli/nmcli.c:840
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
 msgstr "Błąd: „%s” nie jest prawidłowym czasem oczekiwania."
 
-#: ../clients/cli/nmcli.c:831
+#: ../clients/cli/nmcli.c:847
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "narzędzie nmcli, wersja %s\n"
 
-#: ../clients/cli/nmcli.c:839
+#: ../clients/cli/nmcli.c:855
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr ""
 "Błąd: opcja „%s” jest nieznana. Można spróbować polecenie „nmcli help”."
 
-#: ../clients/cli/nmcli.c:895 ../clients/cli/nmcli.c:902
+#: ../clients/cli/nmcli.c:911 ../clients/cli/nmcli.c:918
 #, c-format
 msgid "Error: nmcli terminated by signal %s (%d)"
 msgstr "Błąd: nmcli zostało zakończone sygnałem %s (%d)"
 
-#: ../clients/cli/nmcli.c:968
+#: ../clients/cli/nmcli.c:986
 msgid "Success"
 msgstr "Powodzenie"
 
-#: ../clients/cli/polkit-agent.c:54
+#: ../clients/cli/polkit-agent.c:41
 #, c-format
-msgid "Authentication message: %s\n"
-msgstr "Komunikat uwierzytelnienia: %s\n"
+msgid "Error: polkit agent failed: %s\n"
+msgstr "Błąd: agent polkit się nie powiódł: %s\n"
 
-#: ../clients/cli/polkit-agent.c:62
-#, c-format
-msgid "Authentication error: %s\n"
-msgstr "Błąd uwierzytelnienia: %s\n"
-
-#: ../clients/cli/polkit-agent.c:122
+#: ../clients/cli/polkit-agent.c:99
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "Ostrzeżenie: zainicjowanie agenta polkit się nie powiodło: %s\n"
@@ -4073,19 +4104,19 @@ msgstr "Ostrzeżenie: %s\n"
 msgid "Info: %s\n"
 msgstr "Informacje: %s\n"
 
-#: ../clients/cli/settings.c:490
+#: ../clients/cli/settings.c:488
 msgid "don't know how to get the property value"
 msgstr "nie wiadomo, jak uzyskać wartość właściwości"
 
-#: ../clients/cli/settings.c:580
+#: ../clients/cli/settings.c:578
 msgid "the property can't be changed"
 msgstr "nie można zmieniać tej właściwości"
 
-#: ../clients/cli/settings.c:658
+#: ../clients/cli/settings.c:656
 msgid "[NM property description]"
 msgstr "[opis właściwości NM]"
 
-#: ../clients/cli/settings.c:668
+#: ../clients/cli/settings.c:666
 msgid "[nmcli specific description]"
 msgstr "[konkretny opis nmcli]"
 
@@ -4099,60 +4130,60 @@ msgstr "Błąd: oczekiwano parametru „%s”, ale podano „%s”."
 msgid "Error: Unexpected argument '%s'"
 msgstr "Błąd: nieoczekiwany parametr „%s”"
 
-#: ../clients/cli/utils.c:695
+#: ../clients/cli/utils.c:691
 #, c-format
 msgid "invalid field '%s%s%s'; no such field"
 msgstr "nieprawidłowe pole „%s%s%s”; nie ma takiego pola"
 
-#: ../clients/cli/utils.c:699
+#: ../clients/cli/utils.c:695
 #, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
 msgstr "nieprawidłowe pole „%s%s%s”; dozwolone pola: [%s]"
 
-#: ../clients/cli/utils.c:795
+#: ../clients/cli/utils.c:791
 #, c-format
 msgid "failure to select field"
 msgstr "wybranie pola się nie powiodło"
 
-#: ../clients/cli/utils.c:1424
+#: ../clients/cli/utils.c:1427
 #, c-format
 msgid "Error reading nmcli output: %s\n"
 msgstr "Błąd podczas odczytywania wyjścia nmcli: %s\n"
 
-#: ../clients/cli/utils.c:1429
+#: ../clients/cli/utils.c:1432
 #, c-format
 msgid "Error writing nmcli output: %s\n"
 msgstr "Błąd podczas zapisywania wyjścia nmcli: %s\n"
 
-#: ../clients/cli/utils.c:1455
+#: ../clients/cli/utils.c:1458
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
 msgstr "Utworzenie potoku pagera się nie powiodło: %s\n"
 
-#: ../clients/cli/utils.c:1464
+#: ../clients/cli/utils.c:1467
 #, c-format
 msgid "Failed to fork pager: %s\n"
 msgstr "Rozdzielenie pagera się nie powiodło: %s\n"
 
-#: ../clients/cli/utils.c:1511 ../clients/cli/utils.c:1515
+#: ../clients/cli/utils.c:1514 ../clients/cli/utils.c:1518
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
 msgstr "Powielenie potoku pagera się nie powiodło: %s\n"
 
-#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4136
+#: ../clients/cli/utils.h:299 ../clients/common/nm-meta-setting-desc.c:4099
 msgid "on"
 msgstr "włączone"
 
-#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4138
+#: ../clients/cli/utils.h:299 ../clients/common/nm-meta-setting-desc.c:4101
 msgid "off"
 msgstr "wyłączone"
 
-#: ../clients/cli/utils.h:323
+#: ../clients/cli/utils.h:325
 #, c-format
 msgid "%lld (%s)"
 msgstr "%lld (%s)"
 
-#: ../clients/cli/utils.h:330
+#: ../clients/cli/utils.h:332
 #, c-format
 msgid "%lld - %s"
 msgstr "%lld — %s"
@@ -4233,7 +4264,7 @@ msgstr "nie (prawdopodobnie)"
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
 #. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
 #: ../clients/common/nm-client-utils.c:277
-#: ../clients/common/nm-client-utils.c:350 ../libnm/nm-device.c:1514
+#: ../clients/common/nm-client-utils.c:350 ../libnm/nm-device.c:1583
 msgid "Unknown"
 msgstr "Nieznane"
 
@@ -4579,18 +4610,18 @@ msgstr "pole „%s” musi być same"
 msgid "invalid field '%s%s%s%s%s'; %s%s%s"
 msgstr "nieprawidłowe pole „%s%s%s%s%s”; %s%s%s"
 
-#: ../clients/common/nm-meta-setting-desc.c:297
-#: ../clients/common/nm-meta-setting-desc.c:358
+#: ../clients/common/nm-meta-setting-desc.c:276
+#: ../clients/common/nm-meta-setting-desc.c:337
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "nieprawidłowy przedrostek „%s”; dozwolone <1-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:305
+#: ../clients/common/nm-meta-setting-desc.c:284
 #, c-format
 msgid "invalid IP address: %s"
 msgstr "nieprawidłowy adres IP: %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:330
+#: ../clients/common/nm-meta-setting-desc.c:309
 msgid ""
 "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
 "ip[/prefix] ...]'"
@@ -4598,178 +4629,179 @@ msgstr ""
 "Prawidłowa składnia: „ip[/przedrostek] [next-hop] [parametry] "
 "[atrybut=wartość]… [,ip[/przedrostek] …]”"
 
-#: ../clients/common/nm-meta-setting-desc.c:369
+#: ../clients/common/nm-meta-setting-desc.c:348
 #, c-format
 msgid "the next hop ('%s') must be first"
 msgstr "następny krok („%s”) musi być pierwszy"
 
-#: ../clients/common/nm-meta-setting-desc.c:375
+#: ../clients/common/nm-meta-setting-desc.c:354
 #, c-format
 msgid "the metric ('%s') must be before attributes"
 msgstr "parametry („%s”) muszą być przed atrybutami"
 
-#: ../clients/common/nm-meta-setting-desc.c:423
+#: ../clients/common/nm-meta-setting-desc.c:402
 #, c-format
 msgid "invalid route: %s. %s"
 msgstr "nieprawidłowa trasa: %s. %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:489
+#: ../clients/common/nm-meta-setting-desc.c:468
 #, c-format
 msgid "cannot read pac-script from file '%s'"
 msgstr "nie można odczytać skryptu PAC z pliku „%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:496
+#: ../clients/common/nm-meta-setting-desc.c:475
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
 msgstr "plik „%s” zawiera nieprawidłowy tekst UTF-8"
 
-#: ../clients/common/nm-meta-setting-desc.c:509
+#: ../clients/common/nm-meta-setting-desc.c:488
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
 msgstr "„%s” nie zawiera prawidłowego skryptu PAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:512
+#: ../clients/common/nm-meta-setting-desc.c:491
 #, c-format
 msgid "Not a valid PAC Script"
 msgstr "Nieprawidłowy skrypt PAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:565
+#: ../clients/common/nm-meta-setting-desc.c:544
 #, c-format
 msgid "cannot read team config from file '%s'"
 msgstr "nie można odczytać konfiguracji zespołu z pliku „%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:572
+#: ../clients/common/nm-meta-setting-desc.c:551
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
 msgstr "plik konfiguracji zespołu „%s” zawiera nieprawidłowy tekst UTF-8"
 
-#: ../clients/common/nm-meta-setting-desc.c:1029
+#: ../clients/common/nm-meta-setting-desc.c:1018
 msgid "auto"
 msgstr "automatyczne"
 
-#: ../clients/common/nm-meta-setting-desc.c:1181
+#: ../clients/common/nm-meta-setting-desc.c:1170
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1329
-#: ../clients/common/nm-meta-setting-desc.c:1333
+#: ../clients/common/nm-meta-setting-desc.c:1318
+#: ../clients/common/nm-meta-setting-desc.c:1322
 msgid "'%s' is out of range [%"
 msgstr "„%s” jest poza zakresem [%"
 
-#: ../clients/common/nm-meta-setting-desc.c:1338
+#: ../clients/common/nm-meta-setting-desc.c:1327
 #, c-format
 msgid "'%s' is not a valid number"
 msgstr "„%s” nie jest prawidłową liczbą"
 
-#: ../clients/common/nm-meta-setting-desc.c:1395
+#: ../clients/common/nm-meta-setting-desc.c:1384
 #, c-format
 msgid "'%s' is out of range [0, %u]"
 msgstr "„%s” jest poza zakresem [0, %u]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1441
+#: ../clients/common/nm-meta-setting-desc.c:1430
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "„%s” nie jest prawidłowym adresem MAC Ethernetu"
 
-#: ../clients/common/nm-meta-setting-desc.c:1567
+#: ../clients/common/nm-meta-setting-desc.c:1556
 #, c-format
 msgid "invalid option '%s', use a combination of [%s]"
 msgstr "nieprawidłowa opcja „%s”, należy użyć połączenia [%s]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1572 ../libnm-core/nm-keyfile.c:926
+#: ../clients/common/nm-meta-setting-desc.c:1561
+#: ../shared/nm-keyfile/nm-keyfile.c:926
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "nieprawidłowa opcja „%s”, należy użyć jednej z [%s]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1691
+#: ../clients/common/nm-meta-setting-desc.c:1680
 #, c-format
 msgid "%d (key)"
 msgstr "%d (klucz)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1693
+#: ../clients/common/nm-meta-setting-desc.c:1682
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (hasło)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1696
+#: ../clients/common/nm-meta-setting-desc.c:1685
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (nieznane)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1709
+#: ../clients/common/nm-meta-setting-desc.c:1698
 msgid "0 (NONE)"
 msgstr "0 (BRAK)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1715
+#: ../clients/common/nm-meta-setting-desc.c:1704
 msgid "REORDER_HEADERS, "
 msgstr "ZMIANA_KOLEJNOŚCI_NAGŁÓWKÓW, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1717
+#: ../clients/common/nm-meta-setting-desc.c:1706
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1719
+#: ../clients/common/nm-meta-setting-desc.c:1708
 msgid "LOOSE_BINDING, "
 msgstr "LUŹNE_DOWIĄZANIE, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1721
+#: ../clients/common/nm-meta-setting-desc.c:1710
 msgid "MVRP, "
 msgstr "MVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1742
+#: ../clients/common/nm-meta-setting-desc.c:1731
 msgid "0 (none)"
 msgstr "0 (brak)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1748
+#: ../clients/common/nm-meta-setting-desc.c:1737
 msgid "agent-owned, "
 msgstr "posiadane przez agenta, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1750
+#: ../clients/common/nm-meta-setting-desc.c:1739
 msgid "not saved, "
 msgstr "niezapisane, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1752
+#: ../clients/common/nm-meta-setting-desc.c:1741
 msgid "not required, "
 msgstr "niewymagane, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1970
+#: ../clients/common/nm-meta-setting-desc.c:1941
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "„%s” jest nieprawidłowe; należy użyć <opcja>=<wartość>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1980
+#: ../clients/common/nm-meta-setting-desc.c:1951
 #, c-format
 msgid "cannot set empty \"%s\" option"
 msgstr "nie można ustawić pustej opcji „%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:2039
+#: ../clients/common/nm-meta-setting-desc.c:2010
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "flagi „%u” są nieprawidłowe; należy użyć połączenia %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:2056
+#: ../clients/common/nm-meta-setting-desc.c:2027
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "„%s” nie jest prawidłową liczbą (lub jest poza zakresem)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2077
-#: ../clients/common/nm-meta-setting-desc.c:4052
+#: ../clients/common/nm-meta-setting-desc.c:2048
+#: ../clients/common/nm-meta-setting-desc.c:4015
 #: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:556
 #, c-format
 msgid "'%s' is not valid"
 msgstr "„%s” jest nieprawidłowe"
 
-#: ../clients/common/nm-meta-setting-desc.c:2174
+#: ../clients/common/nm-meta-setting-desc.c:2143
 msgid "not a valid hex-string"
 msgstr "nieprawidłowy ciąg szesnastkowy"
 
-#: ../clients/common/nm-meta-setting-desc.c:2190
+#: ../clients/common/nm-meta-setting-desc.c:2159
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "„%s” nie jest prawidłowym znakiem szesnastkowym"
 
-#: ../clients/common/nm-meta-setting-desc.c:2269
+#: ../clients/common/nm-meta-setting-desc.c:2238
 msgid ""
 "too many arguments. Please only specify a private key file and optionally a "
 "password"
@@ -4777,12 +4809,12 @@ msgstr ""
 "za dużo parametrów. Proszę podać tylko plik klucza prywatnego i opcjonalnie "
 "hasło."
 
-#: ../clients/common/nm-meta-setting-desc.c:2376
+#: ../clients/common/nm-meta-setting-desc.c:2353
 #, c-format
 msgid "failed to set bond option \"%s\""
 msgstr "ustawienie opcji wiązania „%s” się nie powiodło"
 
-#: ../clients/common/nm-meta-setting-desc.c:2393
+#: ../clients/common/nm-meta-setting-desc.c:2370
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4820,129 +4852,122 @@ msgstr ""
 #. * hacky: we can not see if the type is already set, because
 #. * nmc_setting_set_property() is called only after the property
 #. * we're setting (type) has been removed.
-#: ../clients/common/nm-meta-setting-desc.c:2458
+#: ../clients/common/nm-meta-setting-desc.c:2435
 #, c-format
 msgid "Can not change the connection type"
 msgstr "Nie można zmienić typu połączenia"
 
-#: ../clients/common/nm-meta-setting-desc.c:2543
+#: ../clients/common/nm-meta-setting-desc.c:2520
 #, c-format
 msgid "invalid permission \"%s\""
 msgstr "nieprawidłowe uprawnienie „%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:2580
-#, c-format
-msgid "'%s' is not valid master; use ifname or connection UUID"
-msgstr ""
-"„%s” nie jest prawidłowym „master”; należy użyć nazwy interfejsu lub UUID "
-"połączenia"
-
-#: ../clients/common/nm-meta-setting-desc.c:2661
+#: ../clients/common/nm-meta-setting-desc.c:2620
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "wartość „%s” nie jest prawidłowym UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:2732
+#: ../clients/common/nm-meta-setting-desc.c:2691
 msgid "0 (disabled)"
 msgstr "0 (wyłączone)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2738
+#: ../clients/common/nm-meta-setting-desc.c:2697
 msgid "enabled, "
 msgstr "włączone, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2740
+#: ../clients/common/nm-meta-setting-desc.c:2699
 msgid "advertise, "
 msgstr "rozgłaszanie, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2742
+#: ../clients/common/nm-meta-setting-desc.c:2701
 msgid "willing, "
 msgstr "chętne, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2831
+#: ../clients/common/nm-meta-setting-desc.c:2790
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "„%s” nie jest prawidłową flagą DCB"
 
-#: ../clients/common/nm-meta-setting-desc.c:2858
+#: ../clients/common/nm-meta-setting-desc.c:2817
 msgid "must contain 8 comma-separated numbers"
 msgstr "musi zawierać osiem liczb oddzielonych przecinkami"
 
-#: ../clients/common/nm-meta-setting-desc.c:2872
+#: ../clients/common/nm-meta-setting-desc.c:2831
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "„%s” nie jest liczbą między 0 a %u (włącznie) lub %u"
 
-#: ../clients/common/nm-meta-setting-desc.c:2875
+#: ../clients/common/nm-meta-setting-desc.c:2834
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "„%s” nie jest liczbą między 0 a %u (włącznie)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2896
+#: ../clients/common/nm-meta-setting-desc.c:2855
 #, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
 msgstr "zmiany nie zostaną zastosowane, dopóki „%s” zawiera 1 (włączone)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2926
+#: ../clients/common/nm-meta-setting-desc.c:2885
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "procenty szerokości pasma muszą razem wynosić 100%%"
 
-#: ../clients/common/nm-meta-setting-desc.c:2997
-#: ../clients/common/nm-meta-setting-desc.c:3003
+#: ../clients/common/nm-meta-setting-desc.c:2956
+#: ../clients/common/nm-meta-setting-desc.c:2962
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr "Identyfikator operatora SIM musi być kodem MCCMNC o 5 lub 6 liczbach"
 
-#: ../clients/common/nm-meta-setting-desc.c:3027
+#: ../clients/common/nm-meta-setting-desc.c:2986
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "„%s” nie jest prawidłowym P_Key IBoIP"
 
-#: ../clients/common/nm-meta-setting-desc.c:3050
+#: ../clients/common/nm-meta-setting-desc.c:3009
 msgid "default"
 msgstr "domyślne"
 
-#: ../clients/common/nm-meta-setting-desc.c:3214
+#: ../clients/common/nm-meta-setting-desc.c:3173
 #, c-format
 msgid "invalid IPv%c address '%s'"
 msgstr "nieprawidłowy adres IPv%c „%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:3341
+#: ../clients/common/nm-meta-setting-desc.c:3300
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "nieprawidłowy adres bramy „%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:3491
+#: ../clients/common/nm-meta-setting-desc.c:3450
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "„%s” nie jest prawidłowym kanałem; należy użyć <1-13>"
 
-#: ../clients/common/nm-meta-setting-desc.c:3571
+#: ../clients/common/nm-meta-setting-desc.c:3530
 msgid "The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
 msgstr "Prawidłowa składnia: vf [atrybut=wartość]… [,vf [atrybut=wartość]…]"
 
-#: ../clients/common/nm-meta-setting-desc.c:3595
-#: ../clients/common/nm-meta-setting-desc.c:3675
+#: ../clients/common/nm-meta-setting-desc.c:3554
+#: ../clients/common/nm-meta-setting-desc.c:3634
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
 msgstr ""
 "Prawidłowa składnia: „[root | parent <element obsługujący>] [handle <element "
 "obsługujący>] <rodzaj>”"
 
-#: ../clients/common/nm-meta-setting-desc.c:3620
+#: ../clients/common/nm-meta-setting-desc.c:3579
 msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
 msgstr "Prawidłowa składnia: „<vid>[-<vid>] [pvid] [untagged]”"
 
-#: ../clients/common/nm-meta-setting-desc.c:3816
+#: ../clients/common/nm-meta-setting-desc.c:3775
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "nieprawidłowa mapa priorytetów „%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:3904
+#: ../clients/common/nm-meta-setting-desc.c:3867
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "„%s” jest nieprawidłowe; muszą zostać podane dwa lub trzy ciągi"
 
-#: ../clients/common/nm-meta-setting-desc.c:3943
+#: ../clients/common/nm-meta-setting-desc.c:3906
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -4953,26 +4978,26 @@ msgstr ""
 "  opcja = <wartość>, opcja = <wartość>,…\n"
 "Prawidłowe opcje: %s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:3978
+#: ../clients/common/nm-meta-setting-desc.c:3941
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "„%s” nie jest prawidłowym kanałem"
 
-#: ../clients/common/nm-meta-setting-desc.c:3984
+#: ../clients/common/nm-meta-setting-desc.c:3947
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "„%ld” nie jest prawidłowym kanałem"
 
-#: ../clients/common/nm-meta-setting-desc.c:4001
+#: ../clients/common/nm-meta-setting-desc.c:3964
 #: ../libnm-core/nm-setting-sriov.c:438 ../libnm-core/nm-setting-wired.c:758
 #: ../libnm-core/nm-setting-wired.c:771 ../libnm-core/nm-setting-wired.c:824
-#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:876
-#: ../libnm-core/nm-setting-wireless.c:892
+#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:881
+#: ../libnm-core/nm-setting-wireless.c:897
 #, c-format
 msgid "'%s' is not a valid MAC address"
 msgstr "„%s” nie jest prawidłowym adresem MAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:4061
+#: ../clients/common/nm-meta-setting-desc.c:4024
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -4981,62 +5006,62 @@ msgstr ""
 "„%s” nie jest zgodne z %s „%s”, proszę zmienić klucz lub ustawić najpierw "
 "właściwe %s."
 
-#: ../clients/common/nm-meta-setting-desc.c:4071
+#: ../clients/common/nm-meta-setting-desc.c:4034
 #, c-format
 msgid "WEP key is guessed to be of '%s'"
 msgstr "Klucz WEP jest prawdopodobnie typu „%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:4076
+#: ../clients/common/nm-meta-setting-desc.c:4039
 #, c-format
 msgid "WEP key index set to '%d'"
 msgstr "Ustawiono indeks klucza WEP na „%d”"
 
-#: ../clients/common/nm-meta-setting-desc.c:4115
+#: ../clients/common/nm-meta-setting-desc.c:4078
 #, c-format
 msgid "'%s' is not compatible with '%s' type, please change or delete the key."
 msgstr "„%s” nie jest zgodne z typem „%s”, proszę zmienić lub usunąć klucz."
 
-#: ../clients/common/nm-meta-setting-desc.c:4172
+#: ../clients/common/nm-meta-setting-desc.c:4135
 #, c-format
 msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
 msgstr "„%s” jest nieprawidłowe; należy użyć „on”, „off” lub „ignore”"
 
-#: ../clients/common/nm-meta-setting-desc.c:4232
+#: ../clients/common/nm-meta-setting-desc.c:4195
 msgid "Bonding primary interface [none]"
 msgstr "Główny interfejs wiązania [none]"
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4239
+#: ../clients/common/nm-meta-setting-desc.c:4202
 msgid "Bonding monitoring mode"
 msgstr "Tryb monitorowania wiązania"
 
-#: ../clients/common/nm-meta-setting-desc.c:4248
+#: ../clients/common/nm-meta-setting-desc.c:4211
 msgid "Bonding miimon [100]"
 msgstr "„miimon” wiązania [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4256
+#: ../clients/common/nm-meta-setting-desc.c:4219
 msgid "Bonding downdelay [0]"
 msgstr "„downdelay” wiązania [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4264
+#: ../clients/common/nm-meta-setting-desc.c:4227
 msgid "Bonding updelay [0]"
 msgstr "„updelay” wiązania [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4272
+#: ../clients/common/nm-meta-setting-desc.c:4235
 msgid "Bonding arp-interval [0]"
 msgstr "„arp-interval” wiązania [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4280
+#: ../clients/common/nm-meta-setting-desc.c:4243
 msgid "Bonding arp-ip-target [none]"
 msgstr "„arp-ip-target” wiązania [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4288
+#: ../clients/common/nm-meta-setting-desc.c:4251
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "Prędkość LACP („slow” lub „fast”) [slow]"
 
 #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
 #. * that the actual type is (guint32(*)(type *)).
-#: ../clients/common/nm-meta-setting-desc.c:4455
+#: ../clients/common/nm-meta-setting-desc.c:4418
 msgid ""
 "nmcli can accepts both direct JSON configuration data and a file name "
 "containing the configuration. In the latter case the file is read and the "
@@ -5054,7 +5079,7 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/mój-zespół.conf\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4463
+#: ../clients/common/nm-meta-setting-desc.c:4426
 msgid ""
 "Enter a list of link watchers formatted as dictionaries where the keys are "
 "teamd properties. Dictionary pairs are in the form: key=value and pairs are "
@@ -5103,11 +5128,11 @@ msgstr ""
 "   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
 "name=ethtool delay-up=3\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4496
+#: ../clients/common/nm-meta-setting-desc.c:4475
 msgid "IEEE 802.15.4 (WPAN) parent device or connection UUID"
 msgstr "Urządzenie nadrzędne IEEE 802.15.4 (WPAN) lub UUID połączenia"
 
-#: ../clients/common/nm-meta-setting-desc.c:4532
+#: ../clients/common/nm-meta-setting-desc.c:4511
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5121,7 +5146,7 @@ msgstr ""
 "danych typu blob.\n"
 "Przykład: /home/cimrman/cacert.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4571
+#: ../clients/common/nm-meta-setting-desc.c:4553
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5135,7 +5160,7 @@ msgstr ""
 "danych typu blob.\n"
 "Przykład: /home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4628
+#: ../clients/common/nm-meta-setting-desc.c:4610
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5151,7 +5176,7 @@ msgstr ""
 "danych typu blob.\n"
 "Przykład: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4668
+#: ../clients/common/nm-meta-setting-desc.c:4653
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5167,7 +5192,7 @@ msgstr ""
 "danych typu blob.\n"
 "Przykład: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4695
+#: ../clients/common/nm-meta-setting-desc.c:4680
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -5188,8 +5213,8 @@ msgstr ""
 "Przykłady: ab0455a6ea3a74C2\n"
 "           ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4712
-#: ../clients/common/nm-meta-setting-desc.c:4730
+#: ../clients/common/nm-meta-setting-desc.c:4697
+#: ../clients/common/nm-meta-setting-desc.c:4715
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5203,84 +5228,84 @@ msgstr ""
 "surowych danych typu blob.\n"
 "Przykład: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4769
+#: ../clients/common/nm-meta-setting-desc.c:4754
 #: ../clients/common/nm-secret-agent-simple.c:268
 #: ../clients/common/nm-secret-agent-simple.c:356
-#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:321
+#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:322
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: ../clients/common/nm-meta-setting-desc.c:4775
-#: ../clients/common/nm-meta-setting-desc.c:4990
-#: ../clients/common/nm-meta-setting-desc.c:5385
-#: ../clients/common/nm-meta-setting-desc.c:6328
+#: ../clients/common/nm-meta-setting-desc.c:4760
+#: ../clients/common/nm-meta-setting-desc.c:5002
+#: ../clients/common/nm-meta-setting-desc.c:5398
+#: ../clients/common/nm-meta-setting-desc.c:6338
 msgid "Password [none]"
 msgstr "Hasło [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4821
+#: ../clients/common/nm-meta-setting-desc.c:4806
 msgid "Bluetooth device address"
 msgstr "Adres urządzenia Bluetooth"
 
-#: ../clients/common/nm-meta-setting-desc.c:4869
-#: ../clients/common/nm-meta-setting-desc.c:5438
-#: ../clients/common/nm-meta-setting-desc.c:7024
-#: ../clients/common/nm-meta-setting-desc.c:7062
-#: ../clients/common/nm-meta-setting-desc.c:7244
-#: ../clients/common/nm-meta-setting-desc.c:7474
+#: ../clients/common/nm-meta-setting-desc.c:4854
+#: ../clients/common/nm-meta-setting-desc.c:5451
+#: ../clients/common/nm-meta-setting-desc.c:7046
+#: ../clients/common/nm-meta-setting-desc.c:7084
+#: ../clients/common/nm-meta-setting-desc.c:7266
+#: ../clients/common/nm-meta-setting-desc.c:7496
 msgid "MAC [none]"
 msgstr "MAC [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4875
+#: ../clients/common/nm-meta-setting-desc.c:4860
 msgid "Enable STP [no]"
 msgstr "Włączenie STP [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4881
+#: ../clients/common/nm-meta-setting-desc.c:4866
 msgid "STP priority [32768]"
 msgstr "Priorytet STP [32768]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4887
+#: ../clients/common/nm-meta-setting-desc.c:4872
 msgid "Forward delay [15]"
 msgstr "Forward-delay [15]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4893
+#: ../clients/common/nm-meta-setting-desc.c:4878
 msgid "Hello time [2]"
 msgstr "Hello-time [2]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4899
+#: ../clients/common/nm-meta-setting-desc.c:4884
 msgid "Max age [20]"
 msgstr "Max-age [20]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4905
+#: ../clients/common/nm-meta-setting-desc.c:4890
 msgid "MAC address ageing time [300]"
 msgstr "Czas starzenia adresu MAC [300]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4911
+#: ../clients/common/nm-meta-setting-desc.c:4899
 msgid "Group forward mask [0]"
 msgstr "Maska przekierowania grupy [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4917
+#: ../clients/common/nm-meta-setting-desc.c:4911
 msgid "Enable IGMP snooping [no]"
 msgstr "Włączenie węszenia IGMP [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4946
+#: ../clients/common/nm-meta-setting-desc.c:4958
 msgid "Bridge port priority [32]"
 msgstr "Priorytet portu mostku [32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4952
+#: ../clients/common/nm-meta-setting-desc.c:4964
 msgid "Bridge port STP path cost [100]"
 msgstr "Koszt ścieżki STP portu mostku [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4958
+#: ../clients/common/nm-meta-setting-desc.c:4970
 msgid "Hairpin [no]"
 msgstr "Hairpin [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4984
-#: ../clients/common/nm-meta-setting-desc.c:5379
-#: ../clients/common/nm-meta-setting-desc.c:6882
+#: ../clients/common/nm-meta-setting-desc.c:4996
+#: ../clients/common/nm-meta-setting-desc.c:5392
+#: ../clients/common/nm-meta-setting-desc.c:6892
 msgid "Username [none]"
 msgstr "Nazwa użytkownika [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5086
+#: ../clients/common/nm-meta-setting-desc.c:5098
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -5296,7 +5321,7 @@ msgstr ""
 "\n"
 "Przykład: alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5138
+#: ../clients/common/nm-meta-setting-desc.c:5151
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -5317,7 +5342,7 @@ msgstr ""
 "\n"
 "Przykład: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5161
+#: ../clients/common/nm-meta-setting-desc.c:5174
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
@@ -5332,25 +5357,25 @@ msgstr ""
 "„unknown” umożliwia usłudze NetworkManager wybranie wartości za pomocą "
 "heurystyki\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5395
+#: ../clients/common/nm-meta-setting-desc.c:5408
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:5447
-#: ../clients/common/nm-meta-setting-desc.c:7093
-#: ../clients/common/nm-meta-setting-desc.c:7284
+#: ../clients/common/nm-meta-setting-desc.c:5460
+#: ../clients/common/nm-meta-setting-desc.c:7115
+#: ../clients/common/nm-meta-setting-desc.c:7306
 msgid "MTU [auto]"
 msgstr "MTU [auto]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5466
+#: ../clients/common/nm-meta-setting-desc.c:5479
 msgid "P_KEY [none]"
 msgstr "P_KEY [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5475
+#: ../clients/common/nm-meta-setting-desc.c:5488
 msgid "Parent interface [none]"
 msgstr "Interfejs nadrzędny [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5502
+#: ../clients/common/nm-meta-setting-desc.c:5515
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5360,11 +5385,11 @@ msgstr ""
 "\n"
 "Przykład: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5550
+#: ../clients/common/nm-meta-setting-desc.c:5563
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "Adres IPv4 (IP[/plen]) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5552
+#: ../clients/common/nm-meta-setting-desc.c:5565
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5378,11 +5403,11 @@ msgstr ""
 "\n"
 "Przykład: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5571
+#: ../clients/common/nm-meta-setting-desc.c:5584
 msgid "IPv4 gateway [none]"
 msgstr "Brama IPv4 [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5579
+#: ../clients/common/nm-meta-setting-desc.c:5592
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5405,7 +5430,7 @@ msgstr ""
 "Przykłady: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "           10.1.2.0/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5619
+#: ../clients/common/nm-meta-setting-desc.c:5632
 msgid ""
 "Enter a list of IPv4 routing rules formatted as:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
@@ -5415,7 +5440,7 @@ msgstr ""
 "  priority [priorytet] [from [źródło]] [to [cel]], ,…\n"
 "\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5721
+#: ../clients/common/nm-meta-setting-desc.c:5723
 msgid ""
 "Enter a list of IPv6 addresses of DNS servers.  If the IPv6 configuration "
 "method is 'auto' these DNS servers are appended to those (if any) returned "
@@ -5436,11 +5461,11 @@ msgstr ""
 "\n"
 "Przykład: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5775
+#: ../clients/common/nm-meta-setting-desc.c:5777
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "Adres IPv6 (IP[/plen]) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5777
+#: ../clients/common/nm-meta-setting-desc.c:5779
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5454,11 +5479,11 @@ msgstr ""
 "\n"
 "Przykład: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5796
+#: ../clients/common/nm-meta-setting-desc.c:5798
 msgid "IPv6 gateway [none]"
 msgstr "Brama IPv6 [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5804
+#: ../clients/common/nm-meta-setting-desc.c:5806
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5483,7 +5508,7 @@ msgstr ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5844
+#: ../clients/common/nm-meta-setting-desc.c:5846
 msgid ""
 "Enter a list of IPv6 routing rules formatted as:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
@@ -5493,166 +5518,170 @@ msgstr ""
 "  priority [priorytet] [from [źródło]] [to [cel]], ,…\n"
 "\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5943
-#: ../clients/common/nm-meta-setting-desc.c:6923
+#: ../clients/common/nm-meta-setting-desc.c:5953
+#: ../clients/common/nm-meta-setting-desc.c:6945
 msgid "Parent device [none]"
 msgstr "Urządzenie nadrzędne [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5949
+#: ../clients/common/nm-meta-setting-desc.c:5959
 msgid "Local endpoint [none]"
 msgstr "Lokalny punkt końcowy [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5956
-#: ../clients/common/nm-meta-setting-desc.c:6943
+#: ../clients/common/nm-meta-setting-desc.c:5966
+#: ../clients/common/nm-meta-setting-desc.c:6965
 msgid "Remote"
 msgstr "Zdalne"
 
-#: ../clients/common/nm-meta-setting-desc.c:6001
+#: ../clients/common/nm-meta-setting-desc.c:6011
 msgid "MACsec parent device or connection UUID"
 msgstr "Urządzenie nadrzędne MACsec lub UUID połączenia"
 
-#: ../clients/common/nm-meta-setting-desc.c:6022
+#: ../clients/common/nm-meta-setting-desc.c:6032
 msgid "Enable encryption [yes]"
 msgstr "Włączenie szyfrowania [yes]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6028
+#: ../clients/common/nm-meta-setting-desc.c:6038
 #: ../clients/common/nm-secret-agent-simple.c:917
 msgid "MKA CAK"
 msgstr "MKA CAK"
 
-#: ../clients/common/nm-meta-setting-desc.c:6038
+#: ../clients/common/nm-meta-setting-desc.c:6048
 msgid "MKA_CKN"
 msgstr "MKA_CKN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6044
+#: ../clients/common/nm-meta-setting-desc.c:6054
 msgid "SCI port [1]"
 msgstr "Port SCI [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6070
+#: ../clients/common/nm-meta-setting-desc.c:6080
 msgid "MACVLAN parent device or connection UUID"
 msgstr "Urządzenie nadrzędne MACVLAN lub UUID połączenia"
 
-#: ../clients/common/nm-meta-setting-desc.c:6091
+#: ../clients/common/nm-meta-setting-desc.c:6101
 msgid "Tap [no]"
 msgstr "Tap [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6126
-#: ../clients/common/nm-meta-setting-desc.c:7198
-#: ../clients/tui/nmt-page-wifi.c:212
+#: ../clients/common/nm-meta-setting-desc.c:6136
+#: ../clients/common/nm-meta-setting-desc.c:7220
+#: ../clients/tui/nmt-page-wifi.c:213
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6135
+#: ../clients/common/nm-meta-setting-desc.c:6145
 msgid "OLPC Mesh channel [1]"
 msgstr "Kanał sieci kratowej OLPC [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6144
+#: ../clients/common/nm-meta-setting-desc.c:6154
 msgid "DHCP anycast MAC address [none]"
 msgstr "Adres MAC „anycast” DHCP [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6309
+#: ../clients/common/nm-meta-setting-desc.c:6319
 msgid "PPPoE parent device"
 msgstr "Urządzenie nadrzędne PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:6315
+#: ../clients/common/nm-meta-setting-desc.c:6325
 msgid "Service [none]"
 msgstr "Usługa [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6322
+#: ../clients/common/nm-meta-setting-desc.c:6332
 msgid "PPPoE username"
 msgstr "Nazwa użytkownika PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:6358
+#: ../clients/common/nm-meta-setting-desc.c:6368
 msgid "Browser only [no]"
 msgstr "Tylko przeglądarka [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6364
+#: ../clients/common/nm-meta-setting-desc.c:6374
 msgid "PAC URL"
 msgstr "Adres URL PAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:6370
+#: ../clients/common/nm-meta-setting-desc.c:6380
 msgid "PAC script"
 msgstr "Skrypt PAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:6494
-#: ../clients/common/nm-meta-setting-desc.c:6682
+#: ../clients/common/nm-meta-setting-desc.c:6504
+#: ../clients/common/nm-meta-setting-desc.c:6692
 msgid "Team JSON configuration [none]"
 msgstr "Konfiguracja JSON zespołu [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6785
+#: ../clients/common/nm-meta-setting-desc.c:6795
 msgid "User ID [none]"
 msgstr "Identyfikator użytkownika [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6791
+#: ../clients/common/nm-meta-setting-desc.c:6801
 msgid "Group ID [none]"
 msgstr "Identyfikator grupy [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6797
+#: ../clients/common/nm-meta-setting-desc.c:6807
 msgid "Enable PI [no]"
 msgstr "Włączenie PI [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6803
+#: ../clients/common/nm-meta-setting-desc.c:6813
 msgid "Enable VNET header [no]"
 msgstr "Włączenie nagłówka VNET [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6809
+#: ../clients/common/nm-meta-setting-desc.c:6819
 msgid "Enable multi queue [no]"
 msgstr "Włączenie wielokrotnej kolejki [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6822
+#: ../clients/common/nm-meta-setting-desc.c:6832
 msgid "VLAN parent device or connection UUID"
 msgstr "Urządzenie nadrzędne VLAN lub UUID połączenia"
 
-#: ../clients/common/nm-meta-setting-desc.c:6829
+#: ../clients/common/nm-meta-setting-desc.c:6839
 msgid "VLAN ID (<0-4094>)"
 msgstr "Identyfikator VLAN (<0-4094>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:6835
+#: ../clients/common/nm-meta-setting-desc.c:6845
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "Flagi VLAN (<0-7>) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6844
+#: ../clients/common/nm-meta-setting-desc.c:6854
 msgid "Ingress priority maps [none]"
 msgstr "Wejściowe mapy priorytetów [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6854
+#: ../clients/common/nm-meta-setting-desc.c:6864
 msgid "Egress priority maps [none]"
 msgstr "Wyjściowe mapy priorytetów [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6930
+#: ../clients/common/nm-meta-setting-desc.c:6932
+msgid "Table [0]"
+msgstr "Tabela [0]"
+
+#: ../clients/common/nm-meta-setting-desc.c:6952
 msgid "VXLAN ID"
 msgstr "Identyfikator VXLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6936
+#: ../clients/common/nm-meta-setting-desc.c:6958
 msgid "Local address [none]"
 msgstr "Lokalny adres [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6949
+#: ../clients/common/nm-meta-setting-desc.c:6971
 msgid "Minimum source port [0]"
 msgstr "Minimalny port źródłowy [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6955
+#: ../clients/common/nm-meta-setting-desc.c:6977
 msgid "Maximum source port [0]"
 msgstr "Maksymalny port źródłowy [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6961
+#: ../clients/common/nm-meta-setting-desc.c:6983
 msgid "Destination port [8472]"
 msgstr "Port docelowy [8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7001
+#: ../clients/common/nm-meta-setting-desc.c:7023
 msgid "Peer"
 msgstr "Partner"
 
-#: ../clients/common/nm-meta-setting-desc.c:7031
+#: ../clients/common/nm-meta-setting-desc.c:7053
 msgid "WiMAX NSP name"
 msgstr "Nazwa NSP sieci WiMAX"
 
-#: ../clients/common/nm-meta-setting-desc.c:7068
-#: ../clients/common/nm-meta-setting-desc.c:7249
+#: ../clients/common/nm-meta-setting-desc.c:7090
+#: ../clients/common/nm-meta-setting-desc.c:7271
 msgid "Cloned MAC [none]"
 msgstr "Sklonowany MAC [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7101
+#: ../clients/common/nm-meta-setting-desc.c:7123
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -5662,7 +5691,7 @@ msgstr ""
 "\n"
 "Przykład: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7423
+#: ../clients/common/nm-meta-setting-desc.c:7445
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
@@ -5670,222 +5699,233 @@ msgstr ""
 "Proszę podać typ kluczy WEP. Możliwe wartości: 0 lub „unknown”, 1 lub „key” "
 "i 2 lub „passphrase”.\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7482
+#: ../clients/common/nm-meta-setting-desc.c:7504
 msgid "Short address (<0x0000-0xffff>)"
 msgstr "Krótki adres (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7498
+#: ../clients/common/nm-meta-setting-desc.c:7520
 msgid "PAN Identifier (<0x0000-0xffff>)"
 msgstr "Identyfikator PAN (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7513
+#: ../clients/common/nm-meta-setting-desc.c:7535
 msgid "Page (<default|0-31>)"
 msgstr "Strona (<domyślna|0-31>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7527
+#: ../clients/common/nm-meta-setting-desc.c:7549
 msgid "Channel (<default|0-26>)"
 msgstr "Kanał (<domyślny|0-26>)"
 
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7662
+#: ../clients/common/nm-meta-setting-desc.c:7684
 msgid "6LOWPAN settings"
 msgstr "Ustawienia 6LoWPAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7663
+#: ../clients/common/nm-meta-setting-desc.c:7685
 msgid "802-1x settings"
 msgstr "Ustawienia 802-1x"
 
-#: ../clients/common/nm-meta-setting-desc.c:7664
+#: ../clients/common/nm-meta-setting-desc.c:7686
 #: ../src/devices/adsl/nm-device-adsl.c:117
 msgid "ADSL connection"
 msgstr "Połączenie ADSL"
 
-#: ../clients/common/nm-meta-setting-desc.c:7665
+#: ../clients/common/nm-meta-setting-desc.c:7687
 msgid "bluetooth connection"
 msgstr "Połączenie Bluetooth"
 
-#: ../clients/common/nm-meta-setting-desc.c:7666
+#: ../clients/common/nm-meta-setting-desc.c:7688
 msgid "Bond device"
 msgstr "Urządzenie wiązania"
 
-#: ../clients/common/nm-meta-setting-desc.c:7667
+#: ../clients/common/nm-meta-setting-desc.c:7689
 msgid "Bridge device"
 msgstr "Urządzenie mostka"
 
-#: ../clients/common/nm-meta-setting-desc.c:7668
+#: ../clients/common/nm-meta-setting-desc.c:7690
 msgid "Bridge port"
 msgstr "Port mostka"
 
-#: ../clients/common/nm-meta-setting-desc.c:7669
+#: ../clients/common/nm-meta-setting-desc.c:7691
 msgid "CDMA mobile broadband connection"
 msgstr "Połączenie komórkowe CDMA"
 
-#: ../clients/common/nm-meta-setting-desc.c:7670
+#: ../clients/common/nm-meta-setting-desc.c:7692
 msgid "General settings"
 msgstr "Ogólne ustawienia"
 
-#: ../clients/common/nm-meta-setting-desc.c:7671
+#: ../clients/common/nm-meta-setting-desc.c:7693
 msgid "DCB settings"
 msgstr "Ustawienia DCB"
 
-#: ../clients/common/nm-meta-setting-desc.c:7672
+#: ../clients/common/nm-meta-setting-desc.c:7694
 msgid "Dummy settings"
 msgstr "Ustawienia atrapy"
 
-#: ../clients/common/nm-meta-setting-desc.c:7673
+#: ../clients/common/nm-meta-setting-desc.c:7695
 msgid "Ethtool settings"
 msgstr "Ustawienia ethtool"
 
-#: ../clients/common/nm-meta-setting-desc.c:7674
+#: ../clients/common/nm-meta-setting-desc.c:7696
 msgid "Generic settings"
 msgstr "Ogólne ustawienia"
 
-#: ../clients/common/nm-meta-setting-desc.c:7675
+#: ../clients/common/nm-meta-setting-desc.c:7697
 msgid "GSM mobile broadband connection"
 msgstr "Połączenie komórkowe GSM"
 
-#: ../clients/common/nm-meta-setting-desc.c:7676
+#: ../clients/common/nm-meta-setting-desc.c:7698
 #: ../src/devices/nm-device-infiniband.c:158
 msgid "InfiniBand connection"
 msgstr "Połączenie InfiniBand"
 
-#: ../clients/common/nm-meta-setting-desc.c:7677
+#: ../clients/common/nm-meta-setting-desc.c:7699
 msgid "IPv4 protocol"
 msgstr "Protokół IPv4"
 
-#: ../clients/common/nm-meta-setting-desc.c:7678
+#: ../clients/common/nm-meta-setting-desc.c:7700
 msgid "IPv6 protocol"
 msgstr "Protokół IPv6"
 
-#: ../clients/common/nm-meta-setting-desc.c:7679
+#: ../clients/common/nm-meta-setting-desc.c:7701
 msgid "IP-tunnel settings"
 msgstr "Ustawienia tunelu IP"
 
-#: ../clients/common/nm-meta-setting-desc.c:7680
+#: ../clients/common/nm-meta-setting-desc.c:7702
 msgid "MACsec connection"
 msgstr "Połączenie MACsec"
 
-#: ../clients/common/nm-meta-setting-desc.c:7681
+#: ../clients/common/nm-meta-setting-desc.c:7703
 msgid "macvlan connection"
 msgstr "Połączenie MACVLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7682
+#: ../clients/common/nm-meta-setting-desc.c:7704
 msgid "Match"
 msgstr "Dopasowanie"
 
-#: ../clients/common/nm-meta-setting-desc.c:7683
+#: ../clients/common/nm-meta-setting-desc.c:7705
 msgid "OLPC Mesh connection"
 msgstr "Połączenie kratowe OLPC"
 
-#: ../clients/common/nm-meta-setting-desc.c:7684
+#: ../clients/common/nm-meta-setting-desc.c:7706
 msgid "Open vSwitch bridge settings"
 msgstr "Ustawienia mostka Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7685
+#: ../clients/common/nm-meta-setting-desc.c:7707
 msgid "Open vSwitch DPDK interface settings"
 msgstr "Ustawienia interfejsu DPDK Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7686
+#: ../clients/common/nm-meta-setting-desc.c:7708
 msgid "Open vSwitch interface settings"
 msgstr "Ustawienia interfejsu Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7687
+#: ../clients/common/nm-meta-setting-desc.c:7709
 msgid "Open vSwitch patch interface settings"
 msgstr "Ustawienia interfejsu ścieżki Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7688
+#: ../clients/common/nm-meta-setting-desc.c:7710
 msgid "Open vSwitch port settings"
 msgstr "Ustawienia portu Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7689
+#: ../clients/common/nm-meta-setting-desc.c:7711
 msgid "PPP settings"
 msgstr "Ustawienia PPP"
 
-#: ../clients/common/nm-meta-setting-desc.c:7690
+#: ../clients/common/nm-meta-setting-desc.c:7712
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:7691
+#: ../clients/common/nm-meta-setting-desc.c:7713
 msgid "Proxy"
 msgstr "Pośrednik"
 
-#: ../clients/common/nm-meta-setting-desc.c:7692
+#: ../clients/common/nm-meta-setting-desc.c:7714
 msgid "Serial settings"
 msgstr "Ustawienia szeregowe"
 
-#: ../clients/common/nm-meta-setting-desc.c:7693
+#: ../clients/common/nm-meta-setting-desc.c:7715
 msgid "SR-IOV settings"
 msgstr "Ustawienia SR-IOV"
 
-#: ../clients/common/nm-meta-setting-desc.c:7694
+#: ../clients/common/nm-meta-setting-desc.c:7716
 msgid "Traffic controls"
 msgstr "Sterowanie ruchem"
 
-#: ../clients/common/nm-meta-setting-desc.c:7695
+#: ../clients/common/nm-meta-setting-desc.c:7717
 msgid "Team device"
 msgstr "Urządzenie zespołowe"
 
-#: ../clients/common/nm-meta-setting-desc.c:7696
+#: ../clients/common/nm-meta-setting-desc.c:7718
 msgid "Team port"
 msgstr "Port zespołu"
 
-#: ../clients/common/nm-meta-setting-desc.c:7697
+#: ../clients/common/nm-meta-setting-desc.c:7719
 msgid "Tun device"
 msgstr "Urządzenie TUN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7698
+#: ../clients/common/nm-meta-setting-desc.c:7720
 msgid "User settings"
 msgstr "Ustawienia użytkownika"
 
-#: ../clients/common/nm-meta-setting-desc.c:7699
+#: ../clients/common/nm-meta-setting-desc.c:7721
 #: ../src/devices/nm-device-vlan.c:385
 msgid "VLAN connection"
 msgstr "Połączenie VLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7700 ../src/nm-manager.c:5652
+#: ../clients/common/nm-meta-setting-desc.c:7722 ../src/nm-manager.c:5644
 msgid "VPN connection"
 msgstr "Połączenie VPN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7701
+#: ../clients/common/nm-meta-setting-desc.c:7723
+#: ../src/devices/nm-device-vrf.c:175
+msgid "VRF connection"
+msgstr "Połączenie VRF"
+
+#: ../clients/common/nm-meta-setting-desc.c:7724
 #: ../src/devices/nm-device-vxlan.c:354
 msgid "VXLAN connection"
 msgstr "Połączenie VXLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7702
+#: ../clients/common/nm-meta-setting-desc.c:7725
 msgid "Wi-Fi P2P connection"
 msgstr "Połączenie P2P sieci Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7703
+#: ../clients/common/nm-meta-setting-desc.c:7726
 msgid "WiMAX connection"
 msgstr "Połączenie WiMAX"
 
-#: ../clients/common/nm-meta-setting-desc.c:7704
+#: ../clients/common/nm-meta-setting-desc.c:7727
 msgid "Wired Ethernet"
 msgstr "Przewodowy Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:7705
+#: ../clients/common/nm-meta-setting-desc.c:7728
 msgid "WireGuard VPN settings"
 msgstr "Ustawienia WireGuard VPN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7706
+#: ../clients/common/nm-meta-setting-desc.c:7729
 msgid "Wi-Fi connection"
 msgstr "Połączenie Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7707
+#: ../clients/common/nm-meta-setting-desc.c:7730
 msgid "Wi-Fi security settings"
 msgstr "Ustawienia zabezpieczeń Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7708
+#: ../clients/common/nm-meta-setting-desc.c:7731
 msgid "WPAN settings"
 msgstr "Ustawienia WPAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:8074
+#: ../clients/common/nm-meta-setting-desc.c:8108
 msgid "name"
 msgstr "nazwa"
 
-#: ../clients/common/nm-polkit-listener.c:225
-msgid "An authentication session is already underway."
-msgstr "Sesja uwierzytelnienia jest już w drodze."
+#: ../clients/common/nm-polkit-listener.c:368
+#, c-format
+msgid "Could not find any session id for uid %d"
+msgstr "Nie można odnaleźć żadnego identyfikatora sesji dla UID %d"
+
+#: ../clients/common/nm-polkit-listener.c:370
+#, c-format
+msgid "Could not retrieve session id: %s"
+msgstr "Nie można uzyskać identyfikatora sesji: %s"
 
 #: ../clients/common/nm-secret-agent-simple.c:217
 #, c-format
@@ -5901,7 +5941,7 @@ msgid "Private key password"
 msgstr "Hasło klucza prywatnego"
 
 #: ../clients/common/nm-secret-agent-simple.c:323
-#: ../clients/tui/nmt-page-wifi.c:278
+#: ../clients/tui/nmt-page-wifi.c:279
 msgid "Key"
 msgstr "Klucz"
 
@@ -6053,55 +6093,56 @@ msgstr "Nieprawidłowy partner zaczynając od %s:%zu: %s"
 
 #: ../clients/common/nm-vpn-helpers.c:377
 msgid ""
-"The WireGuard config file must be a valid interface name followed by \".conf"
-"\""
+"The name of the WireGuard config must be a valid interface name followed by "
+"\".conf\""
 msgstr ""
-"Plik konfiguracji  musi być prawidłową nazwą interfejsu z końcówką „.conf”"
+"Plik konfiguracji WireGuard musi być prawidłową nazwą interfejsu z końcówką "
+"„.conf”"
 
-#: ../clients/common/nm-vpn-helpers.c:666
+#: ../clients/common/nm-vpn-helpers.c:665
 #, c-format
 msgid "unrecognized line at %s:%zu"
 msgstr "nieznany wiersz w %s:%zu"
 
-#: ../clients/common/nm-vpn-helpers.c:671
+#: ../clients/common/nm-vpn-helpers.c:670
 #, c-format
 msgid "invalid value for '%s' at %s:%zu"
 msgstr "nieprawidłowa wartość dla „%s” w %s:%zu"
 
-#: ../clients/common/nm-vpn-helpers.c:676
+#: ../clients/common/nm-vpn-helpers.c:675
 #, c-format
 msgid "invalid secret '%s' at %s:%zu"
 msgstr "nieprawidłowe hasło „%s” w %s:%zu"
 
-#: ../clients/common/nm-vpn-helpers.c:789
+#: ../clients/common/nm-vpn-helpers.c:801
 #, c-format
 msgid "Failed to create WireGuard connection: %s"
 msgstr "Utworzenie połączenia WireGuard się nie powiodło: %s"
 
-#: ../clients/nm-online.c:75
+#: ../clients/nm-online.c:77
 msgid "Connecting"
 msgstr "Łączenie"
 
-#: ../clients/nm-online.c:191
+#: ../clients/nm-online.c:193
 #, c-format
 msgid "Error: timeout creating NMClient object\n"
 msgstr ""
 "Błąd: przekroczono czas oczekiwania podczas tworzenia obiektu NMClient\n"
 
-#: ../clients/nm-online.c:211
+#: ../clients/nm-online.c:216
 #, c-format
 msgid "Error: Could not create NMClient object: %s\n"
 msgstr "Błąd: nie można utworzyć obiektu NMClient: %s\n"
 
-#: ../clients/nm-online.c:237
+#: ../clients/nm-online.c:240
 msgid "Don't print anything"
 msgstr "Bez wyświetlania czegokolwiek"
 
-#: ../clients/nm-online.c:238
+#: ../clients/nm-online.c:241
 msgid "Wait for NetworkManager startup instead of a connection"
 msgstr "Czeka na uruchomienie usługi NetworkManager zamiast połączenia"
 
-#: ../clients/nm-online.c:239
+#: ../clients/nm-online.c:242
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
@@ -6109,19 +6150,19 @@ msgstr ""
 "Czas oczekiwania na połączenie w sekundach (bez opcji, domyślna wartość to "
 "30)"
 
-#: ../clients/nm-online.c:240
+#: ../clients/nm-online.c:243
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr ""
 "Kończy działanie od razu, jeśli usługa NetworkManager nie jest uruchomiona "
 "lub nie łączy"
 
-#: ../clients/nm-online.c:260
+#: ../clients/nm-online.c:263
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
 msgstr ""
 "Czeka, aż usługa NetworkManager ukończy aktywowanie połączeń sieciowych."
 
-#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
+#: ../clients/nm-online.c:270 ../clients/nm-online.c:276
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr ""
 "Nieprawidłowa opcja. Parametr --help wyświetli listę prawidłowych opcji."
@@ -6129,7 +6170,7 @@ msgstr ""
 #: ../clients/tui/newt/nmt-newt-utils.c:163 ../clients/tui/nmt-editor.c:420
 #: ../clients/tui/nmt-password-dialog.c:161
 #: ../clients/tui/nmt-route-editor.c:109 ../clients/tui/nmtui-hostname.c:56
-#: ../clients/tui/nmtui.c:121
+#: ../clients/tui/nmtui.c:123
 msgid "OK"
 msgstr "OK"
 
@@ -6149,105 +6190,105 @@ msgstr "Edytor się nie powiódł: %s"
 msgid "Could not re-read file: %s"
 msgstr "Nie można ponownie odczytać pliku: %s"
 
-#: ../clients/tui/nm-editor-utils.c:140 ../libnm/nm-device.c:1455
+#: ../clients/tui/nm-editor-utils.c:135 ../libnm/nm-device.c:1522
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/tui/nm-editor-utils.c:144
+#: ../clients/tui/nm-editor-utils.c:139
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Połączenie ethernet %d"
 
-#: ../clients/tui/nm-editor-utils.c:148 ../libnm/nm-device.c:1457
+#: ../clients/tui/nm-editor-utils.c:143 ../libnm/nm-device.c:1524
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../clients/tui/nm-editor-utils.c:152
+#: ../clients/tui/nm-editor-utils.c:147
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Połączenie Wi-Fi %d"
 
-#: ../clients/tui/nm-editor-utils.c:157 ../libnm-core/nm-connection.c:2752
-#: ../libnm/nm-device.c:1473
+#: ../clients/tui/nm-editor-utils.c:152 ../libnm-core/nm-connection.c:2713
+#: ../libnm/nm-device.c:1540
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/tui/nm-editor-utils.c:161
+#: ../clients/tui/nm-editor-utils.c:156
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Połączenie InfiniBand %d"
 
-#: ../clients/tui/nm-editor-utils.c:166 ../libnm/nm-device.c:1471
+#: ../clients/tui/nm-editor-utils.c:161 ../libnm/nm-device.c:1538
 msgid "Mobile Broadband"
 msgstr "Komórkowe"
 
-#: ../clients/tui/nm-editor-utils.c:169
+#: ../clients/tui/nm-editor-utils.c:164
 #, c-format
 msgid "Mobile broadband connection %d"
 msgstr "Połączenie komórkowe %d"
 
-#: ../clients/tui/nm-editor-utils.c:175 ../clients/tui/nmt-page-dsl.c:49
+#: ../clients/tui/nm-editor-utils.c:170 ../clients/tui/nmt-page-dsl.c:49
 msgid "DSL"
 msgstr "DSL"
 
-#: ../clients/tui/nm-editor-utils.c:179
+#: ../clients/tui/nm-editor-utils.c:174
 #, c-format
 msgid "DSL connection %d"
 msgstr "Połączenie DSL %d"
 
-#: ../clients/tui/nm-editor-utils.c:184 ../libnm-core/nm-connection.c:2744
-#: ../libnm/nm-device.c:1475
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4959
+#: ../clients/tui/nm-editor-utils.c:179 ../libnm-core/nm-connection.c:2705
+#: ../libnm/nm-device.c:1542
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5022
 msgid "Bond"
 msgstr "Wiązane"
 
-#: ../clients/tui/nm-editor-utils.c:188
+#: ../clients/tui/nm-editor-utils.c:183
 #, c-format
 msgid "Bond connection %d"
 msgstr "Połączenie wiązane %d"
 
-#: ../clients/tui/nm-editor-utils.c:193 ../libnm-core/nm-connection.c:2748
-#: ../libnm/nm-device.c:1479
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5314
+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2709
+#: ../libnm/nm-device.c:1546
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5386
 msgid "Bridge"
 msgstr "Mostek"
 
-#: ../clients/tui/nm-editor-utils.c:198
+#: ../clients/tui/nm-editor-utils.c:193
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Połączenie mostkowane %d"
 
-#: ../clients/tui/nm-editor-utils.c:202 ../libnm-core/nm-connection.c:2746
-#: ../libnm/nm-device.c:1477
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5032
+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2707
+#: ../libnm/nm-device.c:1544
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5095
 msgid "Team"
 msgstr "Zespół"
 
-#: ../clients/tui/nm-editor-utils.c:207
+#: ../clients/tui/nm-editor-utils.c:202
 #, c-format
 msgid "Team connection %d"
 msgstr "Połączenie zespołowe %d"
 
-#: ../clients/tui/nm-editor-utils.c:211 ../clients/tui/nmt-page-vlan.c:69
-#: ../libnm-core/nm-connection.c:2750 ../libnm/nm-device.c:1481
+#: ../clients/tui/nm-editor-utils.c:206 ../clients/tui/nmt-page-vlan.c:69
+#: ../libnm-core/nm-connection.c:2711 ../libnm/nm-device.c:1548
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/tui/nm-editor-utils.c:215
+#: ../clients/tui/nm-editor-utils.c:210
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Połączenie VLAN %d"
 
-#: ../clients/tui/nm-editor-utils.c:219 ../clients/tui/nmt-page-ip-tunnel.c:123
+#: ../clients/tui/nm-editor-utils.c:214 ../clients/tui/nmt-page-ip-tunnel.c:123
 msgid "IP tunnel"
 msgstr "Tunel IP"
 
-#: ../clients/tui/nm-editor-utils.c:223
+#: ../clients/tui/nm-editor-utils.c:218
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "Połączenie tunelu IP %d"
 
-#: ../clients/tui/nm-editor-utils.c:238
+#: ../clients/tui/nm-editor-utils.c:233
 #, c-format
 msgid "VPN connection %d"
 msgstr "Połączenie VPN %d"
@@ -6384,7 +6425,7 @@ msgid "Slaves"
 msgstr "Podrzędne"
 
 #: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-ip-tunnel.c:135
-#: ../clients/tui/nmt-page-wifi.c:218
+#: ../clients/tui/nmt-page-wifi.c:219
 msgid "Mode"
 msgstr "Tryb"
 
@@ -6419,7 +6460,7 @@ msgid "ARP targets"
 msgstr "Cele ARP"
 
 #: ../clients/tui/nmt-page-bond.c:418 ../clients/tui/nmt-page-ethernet.c:64
-#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:353
+#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:354
 msgid "Cloned MAC address"
 msgstr "Sklonowany adres MAC"
 
@@ -6484,7 +6525,7 @@ msgstr "ETHERNET"
 #: ../clients/tui/nmt-page-ethernet.c:70
 #: ../clients/tui/nmt-page-infiniband.c:81
 #: ../clients/tui/nmt-page-ip-tunnel.c:173 ../clients/tui/nmt-page-vlan.c:103
-#: ../clients/tui/nmt-page-wifi.c:359
+#: ../clients/tui/nmt-page-wifi.c:360
 msgid "MTU"
 msgstr "MTU"
 
@@ -6778,63 +6819,67 @@ msgstr "Dynamiczne WEP (802.1x)"
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../clients/tui/nmt-page-wifi.c:79
+#: ../clients/tui/nmt-page-wifi.c:75
+msgid "Enhanced Open (OWE)"
+msgstr "Wzmocnione otwarte (OWE)"
+
+#: ../clients/tui/nmt-page-wifi.c:80
 msgctxt "WEP key index"
 msgid "1 (Default)"
 msgstr "1 (domyślne)"
 
-#: ../clients/tui/nmt-page-wifi.c:80
+#: ../clients/tui/nmt-page-wifi.c:81
 msgctxt "WEP key index"
 msgid "2"
 msgstr "2"
 
-#: ../clients/tui/nmt-page-wifi.c:81
+#: ../clients/tui/nmt-page-wifi.c:82
 msgctxt "WEP key index"
 msgid "3"
 msgstr "3"
 
-#: ../clients/tui/nmt-page-wifi.c:82
+#: ../clients/tui/nmt-page-wifi.c:83
 msgctxt "WEP key index"
 msgid "4"
 msgstr "4"
 
-#: ../clients/tui/nmt-page-wifi.c:87
+#: ../clients/tui/nmt-page-wifi.c:88
 msgid "Open System"
 msgstr "System otwarty"
 
-#: ../clients/tui/nmt-page-wifi.c:88
+#: ../clients/tui/nmt-page-wifi.c:89
 msgid "Shared Key"
 msgstr "Klucz współdzielony"
 
-#: ../clients/tui/nmt-page-wifi.c:202
+#: ../clients/tui/nmt-page-wifi.c:203
 msgid "WI-FI"
 msgstr "WI-FI"
 
-#: ../clients/tui/nmt-page-wifi.c:244
+#: ../clients/tui/nmt-page-wifi.c:245
 msgid "Channel"
 msgstr "Kanał"
 
 #. "wpa-enterprise"
 #. FIXME
-#: ../clients/tui/nmt-page-wifi.c:271
+#: ../clients/tui/nmt-page-wifi.c:272
 msgid "(No support for wpa-enterprise yet...)"
 msgstr "(WPA Enterprise nie jest jeszcze obsługiwane)"
 
-#: ../clients/tui/nmt-page-wifi.c:281 ../clients/tui/nmt-page-wifi.c:300
+#: ../clients/tui/nmt-page-wifi.c:282 ../clients/tui/nmt-page-wifi.c:301
 msgid "WEP index"
 msgstr "Indeks WEP"
 
-#: ../clients/tui/nmt-page-wifi.c:289 ../clients/tui/nmt-page-wifi.c:308
+#: ../clients/tui/nmt-page-wifi.c:290 ../clients/tui/nmt-page-wifi.c:309
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
 #. "dynamic-wep"
 #. FIXME
-#: ../clients/tui/nmt-page-wifi.c:314
+#: ../clients/tui/nmt-page-wifi.c:315
 msgid "(No support for dynamic-wep yet...)"
 msgstr "(Dynamiczne WEP nie jest jeszcze obsługiwane)"
 
-#: ../clients/tui/nmt-page-wifi.c:347
+#: ../clients/tui/nmt-page-wifi.c:348
 msgid "BSSID"
 msgstr "BSSID"
 
@@ -6924,7 +6969,7 @@ msgid "Deactivate"
 msgstr "Dezaktywuj"
 
 #: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
-#: ../clients/tui/nmtui.c:115
+#: ../clients/tui/nmtui.c:117
 msgid "Quit"
 msgstr "Zakończ"
 
@@ -6995,51 +7040,47 @@ msgstr "Ustawiono nazwę komputera na „%s”"
 msgid "Unable to set hostname: %s"
 msgstr "Nie można ustawić nazwy komputera: %s"
 
-#: ../clients/tui/nmtui.c:38 ../clients/tui/nmtui.c:41
+#: ../clients/tui/nmtui.c:40 ../clients/tui/nmtui.c:43
 msgid "connection"
 msgstr "połączenie"
 
-#: ../clients/tui/nmtui.c:39
+#: ../clients/tui/nmtui.c:41
 msgid "Edit a connection"
 msgstr "Modyfikuj połączanie"
 
-#: ../clients/tui/nmtui.c:42
+#: ../clients/tui/nmtui.c:44
 msgid "Activate a connection"
 msgstr "Aktywuj połączenie"
 
-#: ../clients/tui/nmtui.c:44
+#: ../clients/tui/nmtui.c:46
 msgid "new hostname"
 msgstr "nowa nazwa komputera"
 
-#: ../clients/tui/nmtui.c:45
+#: ../clients/tui/nmtui.c:47
 msgid "Set system hostname"
 msgstr "Ustaw systemową nazwę komputera"
 
-#: ../clients/tui/nmtui.c:89
+#: ../clients/tui/nmtui.c:91
 msgid "NetworkManager TUI"
 msgstr "Tekstowy interfejs usługi NetworkManager"
 
-#: ../clients/tui/nmtui.c:97
+#: ../clients/tui/nmtui.c:99
 msgid "Please select an option"
 msgstr "Proszę wybrać opcję"
 
-#: ../clients/tui/nmtui.c:145
+#: ../clients/tui/nmtui.c:147
 msgid "Usage"
 msgstr "Użycie"
 
-#: ../clients/tui/nmtui.c:226
+#: ../clients/tui/nmtui.c:228
 msgid "Could not parse arguments"
 msgstr "Nie można przetworzyć parametrów"
 
-#: ../clients/tui/nmtui.c:236
+#: ../clients/tui/nmtui.c:241
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "Nie można skontaktować się z usługą NetworkManager: %s.\n"
 
-#: ../clients/tui/nmtui.c:241
-msgid "NetworkManager is not running."
-msgstr "Usługa NetworkManager nie jest uruchomiona."
-
 #: ../libnm-core/nm-crypto.c:204
 #, c-format
 msgid "PEM key file had no start tag"
@@ -7371,57 +7412,57 @@ msgstr "nieznana nazwa ustawienia"
 msgid "duplicate setting name"
 msgstr "podwójna nazwa ustawienia"
 
-#: ../libnm-core/nm-connection.c:1423
+#: ../libnm-core/nm-connection.c:1424
 msgid "setting not found"
 msgstr "nie odnaleziono ustawienia"
 
-#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
-#: ../libnm-core/nm-connection.c:1539
+#: ../libnm-core/nm-connection.c:1476 ../libnm-core/nm-connection.c:1501
+#: ../libnm-core/nm-connection.c:1526
 msgid "setting is required for non-slave connections"
 msgstr "wymagane jest ustawienie dla niepodrzędnych połączeń"
 
-#: ../libnm-core/nm-connection.c:1502 ../libnm-core/nm-connection.c:1527
-#: ../libnm-core/nm-connection.c:1552
+#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
+#: ../libnm-core/nm-connection.c:1539
 msgid "setting not allowed in slave connection"
 msgstr "ustawienie nie jest dozwolone w połączeniu podrzędnym"
 
-#: ../libnm-core/nm-connection.c:1657
+#: ../libnm-core/nm-connection.c:1644
 msgid "Unexpected failure to normalize the connection"
 msgstr "Znormalizowanie połączenia niespodziewanie się nie powiodło"
 
-#: ../libnm-core/nm-connection.c:1720
+#: ../libnm-core/nm-connection.c:1707
 msgid "Unexpected failure to verify the connection"
 msgstr "Sprawdzenie połączenia niespodziewanie się nie powiodło"
 
-#: ../libnm-core/nm-connection.c:1756
+#: ../libnm-core/nm-connection.c:1743
 #, c-format
 msgid "unexpected uuid %s instead of %s"
 msgstr "nieoczekiwany UUID %s zamiast %s"
 
-#: ../libnm-core/nm-connection.c:2609 ../libnm-core/nm-setting-8021x.c:2574
-#: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-8021x.c:2622
-#: ../libnm-core/nm-setting-8021x.c:2639 ../libnm-core/nm-setting-8021x.c:2681
-#: ../libnm-core/nm-setting-8021x.c:2693 ../libnm-core/nm-setting-8021x.c:2711
-#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2747
-#: ../libnm-core/nm-setting-8021x.c:2840 ../libnm-core/nm-setting-adsl.c:158
+#: ../libnm-core/nm-connection.c:2569 ../libnm-core/nm-setting-8021x.c:2610
+#: ../libnm-core/nm-setting-8021x.c:2627 ../libnm-core/nm-setting-8021x.c:2658
+#: ../libnm-core/nm-setting-8021x.c:2675 ../libnm-core/nm-setting-8021x.c:2717
+#: ../libnm-core/nm-setting-8021x.c:2729 ../libnm-core/nm-setting-8021x.c:2747
+#: ../libnm-core/nm-setting-8021x.c:2759 ../libnm-core/nm-setting-8021x.c:2783
+#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-adsl.c:158
 #: ../libnm-core/nm-setting-bluetooth.c:109
 #: ../libnm-core/nm-setting-bluetooth.c:167
 #: ../libnm-core/nm-setting-bluetooth.c:181 ../libnm-core/nm-setting-cdma.c:128
 #: ../libnm-core/nm-setting-connection.c:954
-#: ../libnm-core/nm-setting-connection.c:997
-#: ../libnm-core/nm-setting-connection.c:1177
-#: ../libnm-core/nm-setting-ip-config.c:4946
+#: ../libnm-core/nm-setting-connection.c:983
+#: ../libnm-core/nm-setting-connection.c:1220
+#: ../libnm-core/nm-setting-ip-config.c:4933
 #: ../libnm-core/nm-setting-ip-tunnel.c:359
 #: ../libnm-core/nm-setting-olpc-mesh.c:84
 #: ../libnm-core/nm-setting-ovs-patch.c:77 ../libnm-core/nm-setting-pppoe.c:130
-#: ../libnm-core/nm-setting-vpn.c:516 ../libnm-core/nm-setting-vxlan.c:323
+#: ../libnm-core/nm-setting-vpn.c:551 ../libnm-core/nm-setting-vxlan.c:323
 #: ../libnm-core/nm-setting-wifi-p2p.c:122 ../libnm-core/nm-setting-wimax.c:94
-#: ../libnm-core/nm-setting-wireless-security.c:902
-#: ../libnm-core/nm-setting-wireless.c:759
+#: ../libnm-core/nm-setting-wireless-security.c:894
+#: ../libnm-core/nm-setting-wireless.c:764
 msgid "property is missing"
 msgstr "brak właściwości"
 
-#: ../libnm-core/nm-connection.c:2755
+#: ../libnm-core/nm-connection.c:2716
 msgid "IP Tunnel"
 msgstr "Tunel IP"
 
@@ -7430,220 +7471,6 @@ msgstr "Tunel IP"
 msgid "Method returned type '%s', but expected '%s'"
 msgstr "Metoda zwróciła typ „%s”, ale oczekiwano „%s”"
 
-#: ../libnm-core/nm-keyfile-utils.c:242
-#, c-format
-msgid "value is not an integer in range [%lld, %lld]"
-msgstr "wartość nie jest liczbą całkowitą w zakresie [%lld, %lld]"
-
-#: ../libnm-core/nm-keyfile.c:196
-msgid "ignoring missing number"
-msgstr "ignorowanie brakującej liczby"
-
-#: ../libnm-core/nm-keyfile.c:204
-#, c-format
-msgid "ignoring invalid number '%s'"
-msgstr "ignorowanie nieprawidłowej liczby „%s”"
-
-#: ../libnm-core/nm-keyfile.c:225
-#, c-format
-msgid "ignoring invalid %s address: %s"
-msgstr "ignorowanie nieprawidłowego adresu %s: %s"
-
-#: ../libnm-core/nm-keyfile.c:268
-#, c-format
-msgid "ignoring invalid gateway '%s' for %s route"
-msgstr "ignorowanie nieprawidłowej bramy „%s” dla trasy %s"
-
-#: ../libnm-core/nm-keyfile.c:292
-#, c-format
-msgid "ignoring invalid %s route: %s"
-msgstr "ignorowanie nieprawidłowej trasy %s: %s"
-
-#: ../libnm-core/nm-keyfile.c:464
-#, c-format
-msgid "unexpected character '%c' for address %s: '%s' (position %td)"
-msgstr "nieoczekiwany znak „%c” dla adresu %s: „%s” (położenie %td)"
-
-#: ../libnm-core/nm-keyfile.c:474
-#, c-format
-msgid "unexpected character '%c' for %s: '%s' (position %td)"
-msgstr "nieoczekiwany znak „%c” dla %s: „%s” (położenie %td)"
-
-#: ../libnm-core/nm-keyfile.c:483
-#, c-format
-msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
-msgstr ""
-"nieoczekiwany znak „%c” w długości przedrostka dla %s: „%s” (położenie %td)"
-
-#: ../libnm-core/nm-keyfile.c:494
-#, c-format
-msgid "garbage at the end of value %s: '%s'"
-msgstr "śmiecie na końcu wartości %s: „%s”"
-
-#: ../libnm-core/nm-keyfile.c:500
-#, c-format
-msgid "deprecated semicolon at the end of value %s: '%s'"
-msgstr "przestarzały średnik na końcu wartości %s: „%s”"
-
-#: ../libnm-core/nm-keyfile.c:514
-#, c-format
-msgid "invalid prefix length for %s '%s', defaulting to %d"
-msgstr "nieprawidłowa długość przedrostka dla %s „%s”, domyślnie %d"
-
-#: ../libnm-core/nm-keyfile.c:521
-#, c-format
-msgid "missing prefix length for %s '%s', defaulting to %d"
-msgstr "brak długości przedrostka dla %s „%s”, domyślnie %d"
-
-#: ../libnm-core/nm-keyfile.c:856 ../libnm-core/nm-setting-user.c:358
-#, c-format
-msgid "invalid value for \"%s\": %s"
-msgstr "nieprawidłowa wartość dla „%s”: %s"
-
-#: ../libnm-core/nm-keyfile.c:894
-#, c-format
-msgid "ignoring invalid DNS server IPv%c address '%s'"
-msgstr "ignorowanie nieprawidłowego adresu IPv%c serwera DNS „%s”"
-
-#: ../libnm-core/nm-keyfile.c:990 ../libnm-core/nm-keyfile.c:3143
-#, c-format
-msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
-msgstr ""
-"ignorowanie nieprawidłowego elementu bajtu „%d” (nie jest między 0 a 255, "
-"włącznie)"
-
-#: ../libnm-core/nm-keyfile.c:1001
-msgid "ignoring invalid MAC address"
-msgstr "ignorowanie nieprawidłowego adresu MAC"
-
-#: ../libnm-core/nm-keyfile.c:1260
-msgid "ignoring invalid SSID"
-msgstr "ignorowanie nieprawidłowego SSID"
-
-#: ../libnm-core/nm-keyfile.c:1276
-msgid "ignoring invalid raw password"
-msgstr "ignorowanie nieprawidłowego surowego hasła"
-
-#: ../libnm-core/nm-keyfile.c:1416
-msgid "invalid key/cert value"
-msgstr "nieprawidłowa wartość klucz/certyfikat"
-
-#: ../libnm-core/nm-keyfile.c:1427
-#, c-format
-msgid "invalid key/cert value path \"%s\""
-msgstr "nieprawidłowa ścieżka wartości klucz/certyfikat „%s”"
-
-#: ../libnm-core/nm-keyfile.c:1447 ../libnm-core/nm-keyfile.c:1530
-#, c-format
-msgid "certificate or key file '%s' does not exist"
-msgstr "certyfikat lub plik klucza „%s” nie istnieje"
-
-#: ../libnm-core/nm-keyfile.c:1456
-#, c-format
-msgid "invalid PKCS#11 URI \"%s\""
-msgstr "nieprawidłowy adres URI PKCS#11 „%s”"
-
-#: ../libnm-core/nm-keyfile.c:1500
-msgid "invalid key/cert value data:;base64, is not base64"
-msgstr "nieprawidłowe dane wartości klucz/certyfikat:;base64, nie jest base64"
-
-#: ../libnm-core/nm-keyfile.c:1509
-msgid "invalid key/cert value data:;base64,file://"
-msgstr "nieprawidłowe dane wartości klucz/certyfikat:;base64,file://"
-
-#: ../libnm-core/nm-keyfile.c:1542
-msgid "invalid key/cert value is not a valid blob"
-msgstr ""
-"nieprawidłowa wartość klucz/certyfikat nie jest prawidłowymi danymi typu blob"
-
-#: ../libnm-core/nm-keyfile.c:1644
-#, c-format
-msgid "invalid parity value '%s'"
-msgstr "nieprawidłowa wartość parzystości „%s”"
-
-#: ../libnm-core/nm-keyfile.c:1661 ../libnm-core/nm-keyfile.c:3198
-#, c-format
-msgid "invalid setting: %s"
-msgstr "nieprawidłowe ustawienie: %s"
-
-#: ../libnm-core/nm-keyfile.c:1678
-#, c-format
-msgid "ignoring invalid team configuration: %s"
-msgstr "ignorowanie nieprawidłowej konfiguracji zespołu: %s"
-
-#: ../libnm-core/nm-keyfile.c:1756
-#, c-format
-msgid "invalid qdisc: %s"
-msgstr "nieprawidłowe qdisc: %s"
-
-#: ../libnm-core/nm-keyfile.c:1802
-#, c-format
-msgid "invalid tfilter: %s"
-msgstr "nieprawidłowe tfilter: %s"
-
-#: ../libnm-core/nm-keyfile.c:3042
-#, c-format
-msgid "error loading setting value: %s"
-msgstr "błąd podczas wczytywania wartości ustawienia: %s"
-
-#: ../libnm-core/nm-keyfile.c:3070 ../libnm-core/nm-keyfile.c:3081
-#: ../libnm-core/nm-keyfile.c:3099 ../libnm-core/nm-keyfile.c:3110
-#: ../libnm-core/nm-keyfile.c:3121 ../libnm-core/nm-keyfile.c:3173
-#: ../libnm-core/nm-keyfile.c:3184
-msgid "value cannot be interpreted as integer"
-msgstr "wartość nie może zostać zinterpretowana jako liczba całkowita"
-
-#: ../libnm-core/nm-keyfile.c:3219
-#, c-format
-msgid "invalid setting name '%s'"
-msgstr "nieprawidłowa nazwa ustawienia „%s”"
-
-#: ../libnm-core/nm-keyfile.c:3264
-#, c-format
-msgid "invalid key '%s.%s'"
-msgstr "nieprawidłowy klucz „%s.%s”"
-
-#: ../libnm-core/nm-keyfile.c:3279
-#, c-format
-msgid "key '%s.%s' is not boolean"
-msgstr "klucz „%s.%s” nie jest wartością logiczną"
-
-#: ../libnm-core/nm-keyfile.c:3336
-#, c-format
-msgid "invalid peer public key in section '%s'"
-msgstr "nieprawidłowy klucz publiczny partnera w sekcji „%s”"
-
-#: ../libnm-core/nm-keyfile.c:3348
-#, c-format
-msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
-msgstr ""
-"klucz „%s.%s” nie jest prawidłowym 256-bitowym kluczem w kodowaniu base64"
-
-#: ../libnm-core/nm-keyfile.c:3361
-#, c-format
-msgid "key '%s.%s' is not a valid secret flag"
-msgstr "klucz „%s.%s” nie jest prawidłową flagą hasła"
-
-#: ../libnm-core/nm-keyfile.c:3373
-#, c-format
-msgid "key '%s.%s' is not a integer in range 0 to 2^32"
-msgstr "klucz „%s.%s” nie jest liczbą całkowitą w zakresie 0 do 2^32"
-
-#: ../libnm-core/nm-keyfile.c:3385
-#, c-format
-msgid "key '%s.%s' is not a valid endpoint"
-msgstr "klucz „%s.%s” nie jest prawidłowym punktem końcowym"
-
-#: ../libnm-core/nm-keyfile.c:3407
-#, c-format
-msgid "key '%s.%s' has invalid allowed-ips"
-msgstr "klucz „%s.%s” ma nieprawidłowe dozwolone adresy IP"
-
-#: ../libnm-core/nm-keyfile.c:3419
-#, c-format
-msgid "peer '%s' is invalid: %s"
-msgstr "partner „%s” jest nieprawidłowy: %s"
-
 #: ../libnm-core/nm-setting-6lowpan.c:79
 #, c-format
 msgid "property is not specified"
@@ -7663,115 +7490,114 @@ msgstr "wartość „%s” nie pasuje do „%s=%s”"
 msgid "'%s' is neither an UUID nor an interface name"
 msgstr "„%s” nie jest UUID ani nazwą interfejsu"
 
-#: ../libnm-core/nm-setting-8021x.c:213
+#: ../libnm-core/nm-setting-8021x.c:217
 msgid "binary data missing"
 msgstr "brak danych binarnych"
 
-#: ../libnm-core/nm-setting-8021x.c:241
+#: ../libnm-core/nm-setting-8021x.c:245
 msgid "URI not NUL terminated"
 msgstr "adres URI nie kończy się NUL"
 
-#: ../libnm-core/nm-setting-8021x.c:250
+#: ../libnm-core/nm-setting-8021x.c:254
 msgid "URI is empty"
 msgstr "adres URI jest pusty"
 
-#: ../libnm-core/nm-setting-8021x.c:258
+#: ../libnm-core/nm-setting-8021x.c:262
 msgid "URI is not valid UTF-8"
 msgstr "adres URI nie jest prawidłowym tekstem UTF-8"
 
-#: ../libnm-core/nm-setting-8021x.c:276
+#: ../libnm-core/nm-setting-8021x.c:280
 msgid "data missing"
 msgstr "brak danych"
 
-#: ../libnm-core/nm-setting-8021x.c:299 ../libnm-core/nm-setting-8021x.c:666
+#: ../libnm-core/nm-setting-8021x.c:303 ../libnm-core/nm-setting-8021x.c:670
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "certyfikat jest nieprawidłowy: %s"
 
-#: ../libnm-core/nm-setting-8021x.c:307
+#: ../libnm-core/nm-setting-8021x.c:311
 #, c-format
 msgid "certificate detected as invalid scheme"
 msgstr "wykryto certyfikat jako nieprawidłowy schemat"
 
-#: ../libnm-core/nm-setting-8021x.c:521
+#: ../libnm-core/nm-setting-8021x.c:525
 msgid "CA certificate must be in X.509 format"
 msgstr "Certyfikat CA musi być w formacie X.509"
 
-#: ../libnm-core/nm-setting-8021x.c:537
+#: ../libnm-core/nm-setting-8021x.c:541
 msgid "invalid certificate format"
 msgstr "nieprawidłowy format certyfikatu"
 
-#: ../libnm-core/nm-setting-8021x.c:676
+#: ../libnm-core/nm-setting-8021x.c:680
 #, c-format
 msgid "password is not supported when certificate is not on a PKCS#11 token"
 msgstr "hasło nie jest obsługiwane, kiedy certyfikat nie jest tokenem PKCS#11"
 
-#: ../libnm-core/nm-setting-8021x.c:2581 ../libnm-core/nm-setting-8021x.c:2598
-#: ../libnm-core/nm-setting-8021x.c:2629 ../libnm-core/nm-setting-8021x.c:2646
-#: ../libnm-core/nm-setting-8021x.c:2687 ../libnm-core/nm-setting-8021x.c:2699
-#: ../libnm-core/nm-setting-8021x.c:2717 ../libnm-core/nm-setting-8021x.c:2729
-#: ../libnm-core/nm-setting-8021x.c:2754 ../libnm-core/nm-setting-adsl.c:165
+#: ../libnm-core/nm-setting-8021x.c:2617 ../libnm-core/nm-setting-8021x.c:2634
+#: ../libnm-core/nm-setting-8021x.c:2665 ../libnm-core/nm-setting-8021x.c:2682
+#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2735
+#: ../libnm-core/nm-setting-8021x.c:2753 ../libnm-core/nm-setting-8021x.c:2765
+#: ../libnm-core/nm-setting-8021x.c:2790 ../libnm-core/nm-setting-adsl.c:166
 #: ../libnm-core/nm-setting-cdma.c:135 ../libnm-core/nm-setting-cdma.c:144
 #: ../libnm-core/nm-setting-connection.c:961
-#: ../libnm-core/nm-setting-connection.c:1009
-#: ../libnm-core/nm-setting-gsm.c:289 ../libnm-core/nm-setting-gsm.c:347
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-gsm.c:393
-#: ../libnm-core/nm-setting-ip-config.c:4953
+#: ../libnm-core/nm-setting-connection.c:995 ../libnm-core/nm-setting-gsm.c:283
+#: ../libnm-core/nm-setting-gsm.c:341 ../libnm-core/nm-setting-gsm.c:378
+#: ../libnm-core/nm-setting-gsm.c:387 ../libnm-core/nm-setting-ip-config.c:4940
 #: ../libnm-core/nm-setting-ip4-config.c:167
 #: ../libnm-core/nm-setting-ip4-config.c:174
 #: ../libnm-core/nm-setting-pppoe.c:137 ../libnm-core/nm-setting-pppoe.c:146
-#: ../libnm-core/nm-setting-vpn.c:525 ../libnm-core/nm-setting-vpn.c:535
+#: ../libnm-core/nm-setting-vpn.c:559 ../libnm-core/nm-setting-vpn.c:570
 #: ../libnm-core/nm-setting-wimax.c:103
-#: ../libnm-core/nm-setting-wireless-security.c:945
-#: ../libnm-core/nm-setting-wireless-security.c:969
-#: ../libnm-core/nm-setting.c:1243
+#: ../libnm-core/nm-setting-wireless-security.c:937
+#: ../libnm-core/nm-setting-wireless-security.c:961
+#: ../libnm-core/nm-setting.c:1246
 msgid "property is empty"
 msgstr "właściwość jest pusta"
 
-#: ../libnm-core/nm-setting-8021x.c:2611 ../libnm-core/nm-setting-8021x.c:2659
+#: ../libnm-core/nm-setting-8021x.c:2647 ../libnm-core/nm-setting-8021x.c:2695
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
 msgstr "musi pasować do właściwości „%s” dla PKCS#12"
 
-#: ../libnm-core/nm-setting-8021x.c:2831
+#: ../libnm-core/nm-setting-8021x.c:2867
 msgid "can be enabled only on Ethernet connections"
 msgstr "można włączyć tylko na połączeniach ethernetowych"
 
-#: ../libnm-core/nm-setting-8021x.c:2849
+#: ../libnm-core/nm-setting-8021x.c:2885
 #: ../libnm-core/nm-setting-bluetooth.c:94
-#: ../libnm-core/nm-setting-infiniband.c:162
-#: ../libnm-core/nm-setting-infiniband.c:172
+#: ../libnm-core/nm-setting-infiniband.c:163
+#: ../libnm-core/nm-setting-infiniband.c:173
 #: ../libnm-core/nm-setting-ip4-config.c:158
-#: ../libnm-core/nm-setting-ip6-config.c:207
-#: ../libnm-core/nm-setting-ip6-config.c:218
+#: ../libnm-core/nm-setting-ip6-config.c:226
+#: ../libnm-core/nm-setting-ip6-config.c:237
 #: ../libnm-core/nm-setting-olpc-mesh.c:113
 #: ../libnm-core/nm-setting-wifi-p2p.c:131 ../libnm-core/nm-setting-wimax.c:112
 #: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:795
-#: ../libnm-core/nm-setting-wireless-security.c:988
-#: ../libnm-core/nm-setting-wireless-security.c:997
-#: ../libnm-core/nm-setting-wireless-security.c:1006
-#: ../libnm-core/nm-setting-wireless-security.c:1016
-#: ../libnm-core/nm-setting-wireless-security.c:1026
-#: ../libnm-core/nm-setting-wireless-security.c:1049
-#: ../libnm-core/nm-setting-wireless-security.c:1087
-#: ../libnm-core/nm-setting-wireless-security.c:1128
-#: ../libnm-core/nm-setting-wireless.c:830
-#: ../libnm-core/nm-setting-wireless.c:839
-#: ../libnm-core/nm-setting-wireless.c:850 ../libnm-core/nm-setting-wpan.c:162
-#: ../libnm-core/nm-utils.c:4566
+#: ../libnm-core/nm-setting-wireless-security.c:980
+#: ../libnm-core/nm-setting-wireless-security.c:989
+#: ../libnm-core/nm-setting-wireless-security.c:998
+#: ../libnm-core/nm-setting-wireless-security.c:1008
+#: ../libnm-core/nm-setting-wireless-security.c:1018
+#: ../libnm-core/nm-setting-wireless-security.c:1041
+#: ../libnm-core/nm-setting-wireless-security.c:1079
+#: ../libnm-core/nm-setting-wireless-security.c:1120
+#: ../libnm-core/nm-setting-wireless.c:835
+#: ../libnm-core/nm-setting-wireless.c:844
+#: ../libnm-core/nm-setting-wireless.c:855 ../libnm-core/nm-setting-wpan.c:162
+#: ../libnm-core/nm-utils.c:4555
 msgid "property is invalid"
 msgstr "właściwość jest nieprawidłowa"
 
-#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-8021x.c:2888
-#: ../libnm-core/nm-setting-8021x.c:2902 ../libnm-core/nm-setting-8021x.c:2929
-#: ../libnm-core/nm-setting-8021x.c:2944 ../libnm-core/nm-setting-adsl.c:177
+#: ../libnm-core/nm-setting-8021x.c:2912 ../libnm-core/nm-setting-8021x.c:2924
+#: ../libnm-core/nm-setting-8021x.c:2938 ../libnm-core/nm-setting-8021x.c:2965
+#: ../libnm-core/nm-setting-8021x.c:2980 ../libnm-core/nm-setting-adsl.c:177
 #: ../libnm-core/nm-setting-adsl.c:189 ../libnm-core/nm-setting-bluetooth.c:122
-#: ../libnm-core/nm-setting-wireless-security.c:923
+#: ../libnm-core/nm-setting-wireless-security.c:915
 #, c-format
 msgid "'%s' is not a valid value for the property"
 msgstr "„%s” nie jest prawidłową wartością dla właściwości"
 
-#: ../libnm-core/nm-setting-8021x.c:2912
+#: ../libnm-core/nm-setting-8021x.c:2948
 msgid "invalid auth flags"
 msgstr "nieprawidłowe flagi uwierzytelniania"
 
@@ -7785,85 +7611,85 @@ msgstr "połączenie „%s” wymaga ustawienia „%s” lub „%s”"
 msgid "'%s' connection requires '%s' setting"
 msgstr "połączenie „%s” wymaga ustawienia „%s”"
 
-#: ../libnm-core/nm-setting-bond.c:541
+#: ../libnm-core/nm-setting-bond.c:757
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr "nieprawidłowa opcja „%s” lub jej wartość „%s”"
 
-#: ../libnm-core/nm-setting-bond.c:566
-#, c-format
-msgid "only one of '%s' and '%s' can be set"
-msgstr "tylko jedno z „%s” lub „%s” może być ustawione"
-
-#: ../libnm-core/nm-setting-bond.c:579
+#: ../libnm-core/nm-setting-bond.c:789
 #, c-format
 msgid "mandatory option '%s' is missing"
-msgstr "brak wymaganej opcji „%s”"
+msgstr "brak obowiązkowej opcji „%s”"
 
-#: ../libnm-core/nm-setting-bond.c:589
+#: ../libnm-core/nm-setting-bond.c:799
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr "„%s” nie jest prawidłową wartością dla „%s”"
 
-#: ../libnm-core/nm-setting-bond.c:603
+#: ../libnm-core/nm-setting-bond.c:816
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr "„%s=%s” nie jest zgodne z „%s > 0”"
 
-#: ../libnm-core/nm-setting-bond.c:618
+#: ../libnm-core/nm-setting-bond.c:836
 #, c-format
 msgid "'%s' is not valid for the '%s' option: %s"
 msgstr "„%s” nie jest prawidłowe dla opcji „%s”: %s"
 
-#: ../libnm-core/nm-setting-bond.c:629
+#: ../libnm-core/nm-setting-bond.c:849
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr "opcja „%s” jest prawidłowa tylko dla „%s=%s”"
 
-#: ../libnm-core/nm-setting-bond.c:642
+#: ../libnm-core/nm-setting-bond.c:862
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "„%s=%s” nie jest prawidłową konfiguracją dla „%s”"
 
-#: ../libnm-core/nm-setting-bond.c:655 ../libnm-core/nm-setting-bond.c:664
-#: ../libnm-core/nm-setting-bond.c:684 ../libnm-core/nm-setting-bond.c:720
+#: ../libnm-core/nm-setting-bond.c:877 ../libnm-core/nm-setting-bond.c:890
+#: ../libnm-core/nm-setting-bridge.c:1145
+#, c-format
+msgid "'%s' option requires '%s' option to be enabled"
+msgstr "opcja „%s” wymaga włączenia opcji „%s”"
+
+#: ../libnm-core/nm-setting-bond.c:912 ../libnm-core/nm-setting-bond.c:958
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
 msgstr "opcja „%s” wymaga ustawienia opcji „%s”"
 
-#: ../libnm-core/nm-setting-bond.c:695
+#: ../libnm-core/nm-setting-bond.c:927
 #, c-format
 msgid "'%s' option is empty"
 msgstr "opcja „%s” jest pusta"
 
-#: ../libnm-core/nm-setting-bond.c:707
+#: ../libnm-core/nm-setting-bond.c:941
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "„%s” nie jest prawidłowym adresem IPv4 dla opcji „%s”"
 
-#: ../libnm-core/nm-setting-bond.c:735
+#: ../libnm-core/nm-setting-bond.c:975
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
 msgstr "opcja „%s” jest prawidłowa tylko z trybem „%s”"
 
-#: ../libnm-core/nm-setting-bond.c:746
+#: ../libnm-core/nm-setting-bond.c:987
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
 msgstr "„%s” i „%s” nie mogą mieć różnych wartości"
 
-#: ../libnm-core/nm-setting-bond.c:762
+#: ../libnm-core/nm-setting-bond.c:1010
 #, c-format
 msgid "'%s' option should be string"
 msgstr "opcja „%s” musi być ciągiem"
 
-#: ../libnm-core/nm-setting-bond.c:778
+#: ../libnm-core/nm-setting-bond.c:1023
 #, c-format
 msgid "'%s' option is not valid with mode '%s'"
 msgstr "opcja „%s” nie jest prawidłowa z trybem „%s”"
 
 #: ../libnm-core/nm-setting-bridge-port.c:301
 #: ../libnm-core/nm-setting-ovs-bridge.c:153
-#: ../libnm-core/nm-setting-ovs-interface.c:259
+#: ../libnm-core/nm-setting-ovs-interface.c:269
 #: ../libnm-core/nm-setting-ovs-port.c:172
 #: ../libnm-core/nm-setting-team-port.c:299
 #, c-format
@@ -7871,7 +7697,7 @@ msgid "missing setting"
 msgstr "brak ustawienia"
 
 #: ../libnm-core/nm-setting-bridge-port.c:312
-#: ../libnm-core/nm-setting-ovs-interface.c:280
+#: ../libnm-core/nm-setting-ovs-interface.c:290
 #: ../libnm-core/nm-setting-ovs-port.c:193
 #: ../libnm-core/nm-setting-team-port.c:310
 #, c-format
@@ -7882,19 +7708,31 @@ msgstr ""
 "Połączenie z ustawieniem „%s” musi mieć slave-type ustawiony na „%s”. "
 "Zamiast tego jest „%s”"
 
-#: ../libnm-core/nm-setting-bridge.c:896
+#: ../libnm-core/nm-setting-bridge.c:1030
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
 msgstr "wartość „%d” jest poza zakresem <%d-%d>"
 
-#: ../libnm-core/nm-setting-bridge.c:913
+#: ../libnm-core/nm-setting-bridge.c:1047
 msgid "is not a valid MAC address"
 msgstr "nie jest prawidłowym adresem MAC"
 
-#: ../libnm-core/nm-setting-bridge.c:954
+#: ../libnm-core/nm-setting-bridge.c:1088
 msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
 msgstr "maska nie może zawierać bitów 0 (STP), 1 (MAC) lub 2 (LACP)"
 
+#: ../libnm-core/nm-setting-bridge.c:1108
+msgid "is not a valid link local MAC address"
+msgstr "nie jest prawidłowym adresem MAC „Link-Local”"
+
+#: ../libnm-core/nm-setting-bridge.c:1120
+msgid "is not a valid VLAN filtering protocol"
+msgstr "nie jest prawidłowym protokołem filtrowania VLAN"
+
+#: ../libnm-core/nm-setting-bridge.c:1133
+msgid "is not a valid option"
+msgstr "nie jest prawidłową opcją"
+
 #: ../libnm-core/nm-setting-connection.c:931
 #, c-format
 msgid "setting required for connection of type '%s'"
@@ -7905,59 +7743,59 @@ msgstr "wymagane jest ustawienie dla połączenia typu „%s”."
 msgid "'%s' is not a valid UUID"
 msgstr "„%s” nie jest prawidłowym UUID"
 
-#: ../libnm-core/nm-setting-connection.c:1020
+#: ../libnm-core/nm-setting-connection.c:1006
 #, c-format
 msgid "connection type '%s' is not valid"
 msgstr "typ połączenia „%s” jest nieprawidłowy"
 
-#: ../libnm-core/nm-setting-connection.c:1056
+#: ../libnm-core/nm-setting-connection.c:1099
 #, c-format
 msgid "Unknown slave type '%s'"
 msgstr "Nieznany typ podrzędny „%s”"
 
-#: ../libnm-core/nm-setting-connection.c:1067
+#: ../libnm-core/nm-setting-connection.c:1110
 #, c-format
 msgid "Slave connections need a valid '%s' property"
 msgstr "Połączenia podrzędne wymagają prawidłowej właściwości „%s”"
 
-#: ../libnm-core/nm-setting-connection.c:1088
+#: ../libnm-core/nm-setting-connection.c:1131
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr "Nie można ustawić „%s” bez „%s”"
 
-#: ../libnm-core/nm-setting-connection.c:1102
+#: ../libnm-core/nm-setting-connection.c:1145
 #, c-format
 msgid "'%s' connections must be enslaved to '%s', not '%s'"
 msgstr "Połączenia „%s” muszą być podrzędne względem „%s”, nie „%s”"
 
-#: ../libnm-core/nm-setting-connection.c:1116
+#: ../libnm-core/nm-setting-connection.c:1159
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "mierzona wartość %d jest nieprawidłowa"
 
-#: ../libnm-core/nm-setting-connection.c:1127
-#: ../libnm-core/nm-setting-connection.c:1138
-#: ../libnm-core/nm-setting-connection.c:1151
+#: ../libnm-core/nm-setting-connection.c:1170
+#: ../libnm-core/nm-setting-connection.c:1181
+#: ../libnm-core/nm-setting-connection.c:1194
 #, c-format
 msgid "value %d is not valid"
 msgstr "wartość %d jest nieprawidłowa"
 
-#: ../libnm-core/nm-setting-connection.c:1164
+#: ../libnm-core/nm-setting-connection.c:1207
 #, c-format
 msgid "wait-device-timeout requires %s"
 msgstr "wait-device-timeout wymaga %s"
 
-#: ../libnm-core/nm-setting-connection.c:1186
+#: ../libnm-core/nm-setting-connection.c:1229
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr "typ właściwości musi zostać ustawiony na „%s”"
 
-#: ../libnm-core/nm-setting-connection.c:1201
+#: ../libnm-core/nm-setting-connection.c:1244
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
 msgstr "slave-type „%s” wymaga ustawienia „%s” w połączeniu"
 
-#: ../libnm-core/nm-setting-connection.c:1211
+#: ../libnm-core/nm-setting-connection.c:1254
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
@@ -7966,37 +7804,37 @@ msgstr ""
 "Wykryto połączenie podrzędne z ustawionym „%s” i typem portu „%s”. „%s” musi "
 "zostać ustawione na „%s”"
 
-#: ../libnm-core/nm-setting-connection.c:1228
+#: ../libnm-core/nm-setting-connection.c:1271
 #, c-format
 msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
 msgstr ""
 "Połączenie podrzędne z „%s” ustawionym na „%s” nie może mieć ustawienia „%s”"
 
-#: ../libnm-core/nm-setting-dcb.c:492
+#: ../libnm-core/nm-setting-dcb.c:486
 msgid "flags invalid"
 msgstr "flagi są nieprawidłowe"
 
-#: ../libnm-core/nm-setting-dcb.c:501
+#: ../libnm-core/nm-setting-dcb.c:495
 msgid "flags invalid - disabled"
 msgstr "flagi są nieprawidłowe — wyłączone"
 
-#: ../libnm-core/nm-setting-dcb.c:527 ../libnm-core/nm-setting-dcb.c:576
+#: ../libnm-core/nm-setting-dcb.c:521 ../libnm-core/nm-setting-dcb.c:570
 msgid "property invalid (not enabled)"
 msgstr "właściwość jest nieprawidłowa (niewłączone)"
 
-#: ../libnm-core/nm-setting-dcb.c:536
+#: ../libnm-core/nm-setting-dcb.c:530
 msgid "element invalid"
 msgstr "element jest nieprawidłowy"
 
-#: ../libnm-core/nm-setting-dcb.c:551
+#: ../libnm-core/nm-setting-dcb.c:545
 msgid "sum not 100%"
 msgstr "suma nie wynosi 100%"
 
-#: ../libnm-core/nm-setting-dcb.c:585 ../libnm-core/nm-setting-dcb.c:617
+#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-core/nm-setting-dcb.c:611
 msgid "property invalid"
 msgstr "właściwość jest nieprawidłowa"
 
-#: ../libnm-core/nm-setting-dcb.c:607
+#: ../libnm-core/nm-setting-dcb.c:601
 msgid "property missing"
 msgstr "brak właściwości"
 
@@ -8013,47 +7851,47 @@ msgstr "funkcja odciążenia ma nieprawidłowy typ wariantu"
 msgid "unknown ethtool option '%s'"
 msgstr "nieznana opcja ethtool „%s”"
 
-#: ../libnm-core/nm-setting-gsm.c:302
+#: ../libnm-core/nm-setting-gsm.c:296
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
 msgstr "wartość właściwości „%s” jest pusta lub za długa (>64)"
 
-#: ../libnm-core/nm-setting-gsm.c:334
+#: ../libnm-core/nm-setting-gsm.c:328
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
 msgstr "„%s” zawiera nieprawidłowe znaki (należy używać [A-Za-z._-])"
 
-#: ../libnm-core/nm-setting-gsm.c:361
+#: ../libnm-core/nm-setting-gsm.c:355
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "długość „%s” jest nieprawidłowa (musi mieć 5 lub 6 cyfr)"
 
-#: ../libnm-core/nm-setting-gsm.c:372
+#: ../libnm-core/nm-setting-gsm.c:366
 #, c-format
 msgid "'%s' is not a number"
 msgstr "„%s” nie jest liczbą"
 
-#: ../libnm-core/nm-setting-gsm.c:406
+#: ../libnm-core/nm-setting-gsm.c:400
 msgid "property is empty or wrong size"
 msgstr "właściwość jest pusta lub ma błędny rozmiar"
 
-#: ../libnm-core/nm-setting-gsm.c:416
+#: ../libnm-core/nm-setting-gsm.c:410
 msgid "property must contain only digits"
 msgstr "właściwość może zawierać tylko cyfry"
 
-#: ../libnm-core/nm-setting-gsm.c:428
+#: ../libnm-core/nm-setting-gsm.c:422
 msgid "can't be enabled when manual configuration is present"
 msgstr "nie można włączyć, kiedy obecna jest ręczna konfiguracja"
 
-#: ../libnm-core/nm-setting-infiniband.c:193
+#: ../libnm-core/nm-setting-infiniband.c:194
 msgid "Must specify a P_Key if specifying parent"
 msgstr "Należy podać P_Key, jeśli podawane jest nadrzędne"
 
-#: ../libnm-core/nm-setting-infiniband.c:203
+#: ../libnm-core/nm-setting-infiniband.c:204
 msgid "InfiniBand P_Key connection did not specify parent interface name"
 msgstr "Połączenie P_Key InfiniBand nie podało nazwy interfejsu nadrzędnego"
 
-#: ../libnm-core/nm-setting-infiniband.c:241
+#: ../libnm-core/nm-setting-infiniband.c:227
 #, c-format
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
@@ -8062,289 +7900,289 @@ msgstr ""
 "nazwa interfejsu programowego urządzenia InfiniBand musi być „%s” lub nie "
 "być ustawiona (zamiast tego jest „%s”)"
 
-#: ../libnm-core/nm-setting-infiniband.c:265
+#: ../libnm-core/nm-setting-infiniband.c:250
 #, c-format
 msgid "mtu can be at most %u but it is %u"
 msgstr "MTU może wynosić co najwyżej %u, ale wynosi %u"
 
-#: ../libnm-core/nm-setting-ip-config.c:120
+#: ../libnm-core/nm-setting-ip-config.c:107
 #, c-format
 msgid "Missing IPv4 address"
 msgstr "Brak adresu IPv4"
 
-#: ../libnm-core/nm-setting-ip-config.c:120
+#: ../libnm-core/nm-setting-ip-config.c:107
 #, c-format
 msgid "Missing IPv6 address"
 msgstr "Brak adresu IPv6"
 
-#: ../libnm-core/nm-setting-ip-config.c:125
+#: ../libnm-core/nm-setting-ip-config.c:112
 #, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr "Nieprawidłowy adres IPv4 „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:125
+#: ../libnm-core/nm-setting-ip-config.c:112
 #, c-format
 msgid "Invalid IPv6 address '%s'"
 msgstr "Nieprawidłowy adres IPv6 „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:140
+#: ../libnm-core/nm-setting-ip-config.c:127
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
 msgstr "Nieprawidłowy przedrostek adresu IPv4 „%u”"
 
-#: ../libnm-core/nm-setting-ip-config.c:140
+#: ../libnm-core/nm-setting-ip-config.c:127
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
 msgstr "Nieprawidłowy przedrostek adresu IPv6 „%u”"
 
-#: ../libnm-core/nm-setting-ip-config.c:155
+#: ../libnm-core/nm-setting-ip-config.c:142
 #, c-format
 msgid "Invalid routing metric '%s'"
 msgstr "Nieprawidłowe parametry trasy „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:1282
+#: ../libnm-core/nm-setting-ip-config.c:1269
 #: ../libnm-core/nm-setting-sriov.c:413
 msgid "unknown attribute"
 msgstr "nieznany atrybut"
 
-#: ../libnm-core/nm-setting-ip-config.c:1292
+#: ../libnm-core/nm-setting-ip-config.c:1279
 #: ../libnm-core/nm-setting-sriov.c:423
 #, c-format
 msgid "invalid attribute type '%s'"
 msgstr "nieprawidłowy typ atrybutu „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:1303
+#: ../libnm-core/nm-setting-ip-config.c:1290
 #, c-format
 msgid "attribute is not valid for a IPv4 route"
 msgstr "atrybut nie jest prawidłowy dla trasy IPv4"
 
-#: ../libnm-core/nm-setting-ip-config.c:1304
+#: ../libnm-core/nm-setting-ip-config.c:1291
 #, c-format
 msgid "attribute is not valid for a IPv6 route"
 msgstr "atrybut nie jest prawidłowy dla trasy IPv6"
 
-#: ../libnm-core/nm-setting-ip-config.c:1318
-#: ../libnm-core/nm-setting-ip-config.c:1346
+#: ../libnm-core/nm-setting-ip-config.c:1305
+#: ../libnm-core/nm-setting-ip-config.c:1333
 #, c-format
 msgid "'%s' is not a valid IPv4 address"
 msgstr "„%s” nie jest prawidłowym adresem IPv4"
 
-#: ../libnm-core/nm-setting-ip-config.c:1319
-#: ../libnm-core/nm-setting-ip-config.c:1347
+#: ../libnm-core/nm-setting-ip-config.c:1306
+#: ../libnm-core/nm-setting-ip-config.c:1334
 #, c-format
 msgid "'%s' is not a valid IPv6 address"
 msgstr "„%s” nie jest prawidłowym adresem IPv6"
 
-#: ../libnm-core/nm-setting-ip-config.c:1337
+#: ../libnm-core/nm-setting-ip-config.c:1324
 #, c-format
 msgid "invalid prefix %s"
 msgstr "nieprawidłowy przedrostek %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2513
+#: ../libnm-core/nm-setting-ip-config.c:2500
 msgid "invalid priority"
 msgstr "nieprawidłowy priorytet"
 
-#: ../libnm-core/nm-setting-ip-config.c:2524
+#: ../libnm-core/nm-setting-ip-config.c:2511
 msgid "missing table"
 msgstr "brak tabeli"
 
-#: ../libnm-core/nm-setting-ip-config.c:2530
+#: ../libnm-core/nm-setting-ip-config.c:2517
 msgid "invalid action"
 msgstr "nieprawidłowe działanie"
 
-#: ../libnm-core/nm-setting-ip-config.c:2537
+#: ../libnm-core/nm-setting-ip-config.c:2524
 msgid "has from/src but the prefix-length is zero"
 msgstr "ma from/src, ale długość przedrostka wynosi zero"
 
-#: ../libnm-core/nm-setting-ip-config.c:2544
+#: ../libnm-core/nm-setting-ip-config.c:2531
 msgid "missing from/src for a non zero prefix-length"
 msgstr "brak from/src dla niezerowej długości przedrostka"
 
-#: ../libnm-core/nm-setting-ip-config.c:2549
+#: ../libnm-core/nm-setting-ip-config.c:2536
 msgid "invalid from/src"
 msgstr "nieprawidłowe from/src"
 
-#: ../libnm-core/nm-setting-ip-config.c:2554
+#: ../libnm-core/nm-setting-ip-config.c:2541
 msgid "invalid prefix length for from/src"
 msgstr "nieprawidłowa długość przedrostka dla from/src"
 
-#: ../libnm-core/nm-setting-ip-config.c:2561
+#: ../libnm-core/nm-setting-ip-config.c:2548
 msgid "has to/dst but the prefix-length is zero"
 msgstr "ma to/dst, ale długość przedrostka wynosi zero"
 
-#: ../libnm-core/nm-setting-ip-config.c:2568
+#: ../libnm-core/nm-setting-ip-config.c:2555
 msgid "missing to/dst for a non zero prefix-length"
 msgstr "brak to/dst dla niezerowej długości przedrostka"
 
-#: ../libnm-core/nm-setting-ip-config.c:2573
+#: ../libnm-core/nm-setting-ip-config.c:2560
 msgid "invalid to/dst"
 msgstr "nieprawidłowe to/dst"
 
-#: ../libnm-core/nm-setting-ip-config.c:2578
+#: ../libnm-core/nm-setting-ip-config.c:2565
 msgid "invalid prefix length for to/dst"
 msgstr "nieprawidłowa długość przedrostka dla to/dst"
 
-#: ../libnm-core/nm-setting-ip-config.c:2586
+#: ../libnm-core/nm-setting-ip-config.c:2573
 msgid "invalid iifname"
 msgstr "nieprawidłowe iifname"
 
-#: ../libnm-core/nm-setting-ip-config.c:2594
+#: ../libnm-core/nm-setting-ip-config.c:2581
 msgid "invalid oifname"
 msgstr "nieprawidłowe oifname"
 
-#: ../libnm-core/nm-setting-ip-config.c:2600
+#: ../libnm-core/nm-setting-ip-config.c:2587
 msgid "invalid source port range"
 msgstr "nieprawidłowy zakres portów źródłowych"
 
-#: ../libnm-core/nm-setting-ip-config.c:2606
+#: ../libnm-core/nm-setting-ip-config.c:2593
 msgid "invalid destination port range"
 msgstr "nieprawidłowy zakres portów docelowych"
 
-#: ../libnm-core/nm-setting-ip-config.c:2614
+#: ../libnm-core/nm-setting-ip-config.c:2601
 msgid "suppress_prefixlength out of range"
 msgstr "suppress_prefixlength jest poza zakresem"
 
-#: ../libnm-core/nm-setting-ip-config.c:2619
+#: ../libnm-core/nm-setting-ip-config.c:2606
 msgid "suppress_prefixlength is only allowed with the to-table action"
 msgstr "suppress_prefixlength jest dozwolone tylko z działaniem to-table"
 
-#: ../libnm-core/nm-setting-ip-config.c:2726
+#: ../libnm-core/nm-setting-ip-config.c:2713
 #, c-format
 msgid "duplicate key %s"
 msgstr "podwójny klucz %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2740
+#: ../libnm-core/nm-setting-ip-config.c:2727
 #, c-format
 msgid "invalid key \"%s\""
 msgstr "nieprawidłowy klucz „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:2753
+#: ../libnm-core/nm-setting-ip-config.c:2740
 #, c-format
 msgid "invalid variant type '%s' for \"%s\""
 msgstr "nieprawidłowy typ wariantu „%s” dla „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:2762
+#: ../libnm-core/nm-setting-ip-config.c:2749
 msgid "missing \""
 msgstr "brak \""
 
-#: ../libnm-core/nm-setting-ip-config.c:2768
+#: ../libnm-core/nm-setting-ip-config.c:2755
 msgid "invalid \""
 msgstr "nieprawidłowy \""
 
-#: ../libnm-core/nm-setting-ip-config.c:2965
+#: ../libnm-core/nm-setting-ip-config.c:2952
 msgid "Unsupported to-string-flags argument"
 msgstr "Nieobsługiwany parametr to-string-flags"
 
-#: ../libnm-core/nm-setting-ip-config.c:2972
+#: ../libnm-core/nm-setting-ip-config.c:2959
 msgid "Unsupported extra-argument"
 msgstr "Nieobsługiwany dodatkowy parametr"
 
-#: ../libnm-core/nm-setting-ip-config.c:3239
+#: ../libnm-core/nm-setting-ip-config.c:3226
 #, c-format
 msgid "unsupported key \"%s\""
 msgstr "nieobsługiwany klucz „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:3244
+#: ../libnm-core/nm-setting-ip-config.c:3231
 #, c-format
 msgid "duplicate key \"%s\""
 msgstr "podwójny klucz „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:3249
+#: ../libnm-core/nm-setting-ip-config.c:3236
 #, c-format
 msgid "invalid value for \"%s\""
 msgstr "nieprawidłowa wartość dla „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:3259
+#: ../libnm-core/nm-setting-ip-config.c:3246
 msgid "empty text does not describe a rule"
 msgstr "pusty tekst nie opisuje zasady"
 
-#: ../libnm-core/nm-setting-ip-config.c:3265
+#: ../libnm-core/nm-setting-ip-config.c:3252
 #, c-format
 msgid "missing argument for \"%s\""
 msgstr "brak parametru dla „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:3277
+#: ../libnm-core/nm-setting-ip-config.c:3264
 msgid "invalid \"from\" part"
 msgstr "nieprawidłowa część „from”"
 
-#: ../libnm-core/nm-setting-ip-config.c:3291
+#: ../libnm-core/nm-setting-ip-config.c:3278
 msgid "invalid \"to\" part"
 msgstr "nieprawidłowa część „to”"
 
-#: ../libnm-core/nm-setting-ip-config.c:3300
+#: ../libnm-core/nm-setting-ip-config.c:3287
 #, c-format
 msgid "cannot detect address family for rule"
 msgstr "nie można wykryć rodziny adresów dla zasady"
 
-#: ../libnm-core/nm-setting-ip-config.c:3360
-#: ../libnm-core/nm-setting-ip-config.c:3454
+#: ../libnm-core/nm-setting-ip-config.c:3347
+#: ../libnm-core/nm-setting-ip-config.c:3441
 #, c-format
 msgid "rule is invalid: %s"
 msgstr "nieprawidłowa zasada: %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:3437
+#: ../libnm-core/nm-setting-ip-config.c:3424
 msgid "invalid address family"
 msgstr "nieprawidłowa rodzina adresów"
 
-#: ../libnm-core/nm-setting-ip-config.c:4710
+#: ../libnm-core/nm-setting-ip-config.c:4697
 #, c-format
 msgid "rule #%u is invalid: %s"
 msgstr "%u. zasada jest nieprawidłowa: %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:4966
+#: ../libnm-core/nm-setting-ip-config.c:4953
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. adres serwera DNS jest nieprawidłowy"
 
-#: ../libnm-core/nm-setting-ip-config.c:4982
+#: ../libnm-core/nm-setting-ip-config.c:4969
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. adres IP jest nieprawidłowy"
 
-#: ../libnm-core/nm-setting-ip-config.c:4994
+#: ../libnm-core/nm-setting-ip-config.c:4981
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. adres IP ma właściwość „label” z nieprawidłowym typem"
 
-#: ../libnm-core/nm-setting-ip-config.c:5003
+#: ../libnm-core/nm-setting-ip-config.c:4990
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. adres IP ma nieprawidłową etykietę „%s”"
 
-#: ../libnm-core/nm-setting-ip-config.c:5017
+#: ../libnm-core/nm-setting-ip-config.c:5004
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "brama nie może być ustawiona, jeśli nie skonfigurowano żadnych adresów"
 
-#: ../libnm-core/nm-setting-ip-config.c:5026
+#: ../libnm-core/nm-setting-ip-config.c:5013
 msgid "gateway is invalid"
 msgstr "brama jest nieprawidłowa"
 
-#: ../libnm-core/nm-setting-ip-config.c:5040
+#: ../libnm-core/nm-setting-ip-config.c:5027
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. trasa jest nieprawidłowa"
 
-#: ../libnm-core/nm-setting-ip-config.c:5056
+#: ../libnm-core/nm-setting-ip-config.c:5043
 #, c-format
 msgid "%u. rule has wrong address-family"
 msgstr "%u. zasada ma błędną rodzinę adresów"
 
-#: ../libnm-core/nm-setting-ip-config.c:5065
+#: ../libnm-core/nm-setting-ip-config.c:5052
 #, c-format
 msgid "%u. rule is invalid: %s"
 msgstr "%u. zasada jest nieprawidłowa: %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:5079
+#: ../libnm-core/nm-setting-ip-config.c:5066
 #, c-format
 msgid "'%s' is not a valid IAID"
 msgstr "„%s” nie jest prawidłowym IAID"
 
-#: ../libnm-core/nm-setting-ip-config.c:5093
+#: ../libnm-core/nm-setting-ip-config.c:5080
 #, c-format
 msgid "the property cannot be set when '%s' is disabled"
 msgstr "nie można ustawić właściwości, kiedy „%s” jest wyłączone"
 
-#: ../libnm-core/nm-setting-ip-config.c:5115
+#: ../libnm-core/nm-setting-ip-config.c:5102
 #, c-format
 msgid "a gateway is incompatible with '%s'"
 msgstr "brama jest niezgodna z „%s”"
@@ -8386,7 +8224,7 @@ msgid "wired setting not allowed for mode %s"
 msgstr "ustawienie przewodowe nie jest dozwolone dla trybu %s"
 
 #: ../libnm-core/nm-setting-ip4-config.c:112
-#: ../libnm-core/nm-setting-ip6-config.c:159
+#: ../libnm-core/nm-setting-ip6-config.c:178
 #, c-format
 msgid "this property cannot be empty for '%s=%s'"
 msgstr "ta właściwość nie może być pusta dla „%s=%s”"
@@ -8394,9 +8232,9 @@ msgstr "ta właściwość nie może być pusta dla „%s=%s”"
 #: ../libnm-core/nm-setting-ip4-config.c:124
 #: ../libnm-core/nm-setting-ip4-config.c:134
 #: ../libnm-core/nm-setting-ip4-config.c:146
-#: ../libnm-core/nm-setting-ip6-config.c:174
-#: ../libnm-core/nm-setting-ip6-config.c:184
-#: ../libnm-core/nm-setting-ip6-config.c:194
+#: ../libnm-core/nm-setting-ip6-config.c:193
+#: ../libnm-core/nm-setting-ip6-config.c:203
+#: ../libnm-core/nm-setting-ip6-config.c:213
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
 msgstr "ta właściwość nie jest dozwolona dla „%s=%s”"
@@ -8426,23 +8264,23 @@ msgid "property should be TRUE when method is set to disabled"
 msgstr ""
 "właściwość musi wynosić „TRUE”, kiedy metoda jest ustawiona na wyłączenie"
 
-#: ../libnm-core/nm-setting-ip6-config.c:233
+#: ../libnm-core/nm-setting-ip6-config.c:252
 msgid "value is not a valid token"
 msgstr "wartość nie jest prawidłowym tokenem"
 
-#: ../libnm-core/nm-setting-ip6-config.c:244
+#: ../libnm-core/nm-setting-ip6-config.c:263
 msgid "only makes sense with EUI64 address generation mode"
 msgstr "ma sens tylko w trybie tworzenia adresów EUI64"
 
-#: ../libnm-core/nm-setting-ip6-config.c:255
+#: ../libnm-core/nm-setting-ip6-config.c:274
 msgid "invalid DUID"
 msgstr "nieprawidłowe DUID"
 
-#: ../libnm-core/nm-setting-ip6-config.c:267
+#: ../libnm-core/nm-setting-ip6-config.c:286
 msgid "token is not in canonical form"
 msgstr "token nie jest w formie kanonicznej"
 
-#: ../libnm-core/nm-setting-ip6-config.c:280
+#: ../libnm-core/nm-setting-ip6-config.c:299
 msgid "property should be TRUE when method is set to ignore or disabled"
 msgstr ""
 "właściwość musi wynosić „TRUE”, kiedy metoda jest ustawiona na ignorowanie "
@@ -8490,12 +8328,12 @@ msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr "nierozwiązłe działanie jest dozwolone tylko w trybie przejścia"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:94
-#: ../libnm-core/nm-setting-wireless.c:769
+#: ../libnm-core/nm-setting-wireless.c:774
 msgid "SSID length is out of range <1-32> bytes"
 msgstr "długość SSID jest poza zakresem <1-32> bajtów"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:103
-#: ../libnm-core/nm-setting-wireless.c:809
+#: ../libnm-core/nm-setting-wireless.c:814
 #, c-format
 msgid "'%d' is not a valid channel"
 msgstr "„%d” nie jest prawidłowym kanałem"
@@ -8510,32 +8348,32 @@ msgstr "Połączenie z ustawieniem „%s” nie może mieć połączenia nadrz
 msgid "'%s' is not allowed in fail_mode"
 msgstr "„%s” nie jest dozwolone w fail_mode"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:94
+#: ../libnm-core/nm-setting-ovs-interface.c:96
 #, c-format
 msgid "'%s' is not a valid interface type"
 msgstr "„%s” nie jest prawidłowym typem interfejsu"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:116
+#: ../libnm-core/nm-setting-ovs-interface.c:120
 #, c-format
 msgid "A connection with a '%s' setting needs connection.type explicitly set"
 msgstr "Połączenie z ustawieniem „%s” musi mieć ustawione connection.type"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:128
+#: ../libnm-core/nm-setting-ovs-interface.c:132
 #, c-format
 msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
 msgstr "Połączenie typu „%s” nie może mieć ovs-interface.type „system”"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:140
+#: ../libnm-core/nm-setting-ovs-interface.c:144
 #, c-format
 msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
 msgstr "Połączenie typu „%s” nie może mieć ovs-interface.type „%s”"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:159
+#: ../libnm-core/nm-setting-ovs-interface.c:163
 #, c-format
 msgid "A connection can not have both '%s' and '%s' settings at the same time"
 msgstr "Połączenie nie może mieć ustawień „%s” i „%s” jednocześnie"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:173
+#: ../libnm-core/nm-setting-ovs-interface.c:177
 #, c-format
 msgid ""
 "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
@@ -8544,30 +8382,30 @@ msgstr ""
 "Połączenie z ustawieniem „%s” musi mieć connection.type „ovs-interface”, ale "
 "ma „%s”"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:185
+#: ../libnm-core/nm-setting-ovs-interface.c:189
 #, c-format
 msgid ""
 "A connection with '%s' setting needs to be of '%s' interface type, not '%s'"
 msgstr "Połączenie z ustawieniem „%s” musi być typem interfejsu „%s”, nie „%s”"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:201
+#: ../libnm-core/nm-setting-ovs-interface.c:206
 #, c-format
 msgid "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
 msgstr ""
 "Połączenie z ustawieniem ovs-interface.type „%s” musi mieć ustawienie „ovs-"
 "patch”"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:221
+#: ../libnm-core/nm-setting-ovs-interface.c:231
 #, c-format
 msgid "Missing ovs interface setting"
 msgstr "Brak ustawienia interfejsu ovs"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:227
+#: ../libnm-core/nm-setting-ovs-interface.c:237
 #, c-format
 msgid "Missing ovs interface type"
 msgstr "Brak typu interfejsu ovs"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:268
+#: ../libnm-core/nm-setting-ovs-interface.c:278
 #: ../libnm-core/nm-setting-ovs-port.c:181
 #, c-format
 msgid "A connection with a '%s' setting must have a master."
@@ -8608,27 +8446,27 @@ msgstr "„%d” jest poza prawidłowym zakresem <128-16384>"
 msgid "setting this property requires non-zero '%s' property"
 msgstr "ustawienie tej właściwości wymaga niezerowej właściwości „%s”"
 
-#: ../libnm-core/nm-setting-proxy.c:132
+#: ../libnm-core/nm-setting-proxy.c:129
 #, c-format
 msgid "invalid proxy method"
 msgstr "nieprawidłowa metoda pośrednika"
 
-#: ../libnm-core/nm-setting-proxy.c:142 ../libnm-core/nm-setting-proxy.c:151
+#: ../libnm-core/nm-setting-proxy.c:139 ../libnm-core/nm-setting-proxy.c:148
 #, c-format
 msgid "this property is not allowed for method none"
 msgstr "ta właściwość nie jest dozwolona dla metody „none”"
 
-#: ../libnm-core/nm-setting-proxy.c:162
+#: ../libnm-core/nm-setting-proxy.c:159
 #, c-format
 msgid "the script is too large"
 msgstr "skrypt jest za duży"
 
-#: ../libnm-core/nm-setting-proxy.c:170
+#: ../libnm-core/nm-setting-proxy.c:167
 #, c-format
 msgid "the script is not valid utf8"
 msgstr "skrypt nie jest prawidłowym tekstem UTF-8"
 
-#: ../libnm-core/nm-setting-proxy.c:178
+#: ../libnm-core/nm-setting-proxy.c:175
 #, c-format
 msgid "the script lacks FindProxyForURL function"
 msgstr "skrypt nie ma funkcji FindProxyForURL"
@@ -8770,6 +8608,11 @@ msgstr "osiągnięto maksymalną liczbę wpisów danych użytkownika"
 msgid "invalid key \"%s\": %s"
 msgstr "nieprawidłowy klucz „%s”: %s"
 
+#: ../libnm-core/nm-setting-user.c:358 ../shared/nm-keyfile/nm-keyfile.c:856
+#, c-format
+msgid "invalid value for \"%s\": %s"
+msgstr "nieprawidłowa wartość dla „%s”: %s"
+
 #: ../libnm-core/nm-setting-user.c:373
 #, c-format
 msgid "maximum number of user data entries reached (%u instead of %u)"
@@ -8788,33 +8631,32 @@ msgstr "flagi są nieprawidłowe"
 msgid "vlan setting should have a ethernet setting as well"
 msgstr "ustawienie VLAN musi mieć także ustawienie Ethernet"
 
-#: ../libnm-core/nm-setting-vpn.c:546
+#: ../libnm-core/nm-setting-vrf.c:75
+msgid "table cannot be zero"
+msgstr "tabela nie może wynosić zero"
+
+#: ../libnm-core/nm-setting-vpn.c:581
 msgid "cannot set connection.multi-connect for VPN setting"
 msgstr "nie można ustawić connection.multi-connect dla ustawienia VPN"
 
-#: ../libnm-core/nm-setting-vpn.c:567
-#, c-format
-msgid "secret was empty"
-msgstr "hasło jest puste"
-
-#: ../libnm-core/nm-setting-vpn.c:597
+#: ../libnm-core/nm-setting-vpn.c:626
 msgid "setting contained a secret with an empty name"
 msgstr "ustawienie zawierało hasło o pustej nazwie"
 
-#: ../libnm-core/nm-setting-vpn.c:605
-#, c-format
-msgid "secret value was empty"
-msgstr "wartość hasła jest pusta"
-
-#: ../libnm-core/nm-setting-vpn.c:652 ../libnm-core/nm-setting.c:2124
+#: ../libnm-core/nm-setting-vpn.c:666 ../libnm-core/nm-setting.c:2127
 msgid "not a secret property"
 msgstr "nie jest właściwością hasła"
 
-#: ../libnm-core/nm-setting-vpn.c:658
+#: ../libnm-core/nm-setting-vpn.c:672
 msgid "secret is not of correct type"
 msgstr "hasło nie jest poprawnego typu"
 
-#: ../libnm-core/nm-setting-vpn.c:742
+#: ../libnm-core/nm-setting-vpn.c:749 ../libnm-core/nm-setting-vpn.c:798
+#, c-format
+msgid "secret name cannot be empty"
+msgstr "nazwa hasła nie może być pusta"
+
+#: ../libnm-core/nm-setting-vpn.c:765
 msgid "secret flags property not found"
 msgstr "nie odnaleziono właściwości flag hasła"
 
@@ -8937,32 +8779,32 @@ msgstr "%u. partner nie ma klucza publicznego"
 msgid "non-existing peer '%s'"
 msgstr "nieistniejący partner „%s”"
 
-#: ../libnm-core/nm-setting-wireless-security.c:913
+#: ../libnm-core/nm-setting-wireless-security.c:905
 #, c-format
 msgid "'%s' is not a valid value for '%s' mode connections"
 msgstr "„%s” nie jest prawidłową wartością dla połączeń trybu „%s”"
 
-#: ../libnm-core/nm-setting-wireless-security.c:936
+#: ../libnm-core/nm-setting-wireless-security.c:928
 #, c-format
 msgid "'%s' security requires '%s=%s'"
 msgstr "zabezpieczenie „%s” wymaga „%s=%s”"
 
-#: ../libnm-core/nm-setting-wireless-security.c:957
+#: ../libnm-core/nm-setting-wireless-security.c:949
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
 msgstr "zabezpieczenie „%s” wymaga obecności ustawienia „%s”"
 
-#: ../libnm-core/nm-setting-wireless-security.c:978
+#: ../libnm-core/nm-setting-wireless-security.c:970
 #, c-format
 msgid "'%d' value is out of range <0-3>"
 msgstr "wartość „%d” jest poza zakresem <0-3>"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1037
+#: ../libnm-core/nm-setting-wireless-security.c:1029
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
 msgstr "„%s” może być używane tylko z „%s=%s” (WEP)"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1061
+#: ../libnm-core/nm-setting-wireless-security.c:1053
 #, c-format
 msgid ""
 "'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
@@ -8970,42 +8812,42 @@ msgstr ""
 "„%s” może być używane tylko za pomocą zarządzania kluczami „wpa-eap”, „wpa-"
 "psk” lub „sae” "
 
-#: ../libnm-core/nm-setting-wireless.c:778
+#: ../libnm-core/nm-setting-wireless.c:783
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
 msgstr "„%s” nie jest prawidłowym trybem Wi-Fi"
 
-#: ../libnm-core/nm-setting-wireless.c:788
+#: ../libnm-core/nm-setting-wireless.c:793
 #, c-format
 msgid "'%s' is not a valid band"
 msgstr "„%s” nie jest prawidłowym pasmem"
 
-#: ../libnm-core/nm-setting-wireless.c:798
+#: ../libnm-core/nm-setting-wireless.c:803
 #, c-format
 msgid "'%s' requires setting '%s' property"
 msgstr "„%s” wymaga ustawienia właściwości „%s”"
 
-#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:825
 #, c-format
 msgid "'%s' requires '%s' and '%s' property"
 msgstr "„%s” wymaga właściwości „%s” i „%s”"
 
-#: ../libnm-core/nm-setting-wireless.c:907 ../libnm-core/nm-team-utils.c:1990
+#: ../libnm-core/nm-setting-wireless.c:912 ../libnm-core/nm-team-utils.c:1990
 #, c-format
 msgid "invalid value"
 msgstr "nieprawidłowa wartość"
 
-#: ../libnm-core/nm-setting-wireless.c:917
+#: ../libnm-core/nm-setting-wireless.c:922
 msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
 msgstr ""
 "Tryby Wake-on-WLAN „default” i „ignore” są wzajemnie się wykluczającymi "
 "flagami"
 
-#: ../libnm-core/nm-setting-wireless.c:926
+#: ../libnm-core/nm-setting-wireless.c:931
 msgid "Wake-on-WLAN trying to set unknown flag"
 msgstr "Wake-on-WLAN próbuje ustawić nieznaną flagę"
 
-#: ../libnm-core/nm-setting-wireless.c:948
+#: ../libnm-core/nm-setting-wireless.c:953
 #, c-format
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
 msgstr ""
@@ -9025,32 +8867,32 @@ msgstr "strona musi wynosić między %d a %d"
 msgid "channel must not be between %d and %d"
 msgstr "kanał musi wynosić między %d a %d"
 
-#: ../libnm-core/nm-setting.c:806
+#: ../libnm-core/nm-setting.c:809
 #, c-format
 msgid "duplicate property"
 msgstr "podwójna właściwość"
 
-#: ../libnm-core/nm-setting.c:829
+#: ../libnm-core/nm-setting.c:832
 #, c-format
 msgid "unknown property"
 msgstr "nieznana właściwość"
 
-#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:949
+#: ../libnm-core/nm-setting.c:903 ../libnm-core/nm-setting.c:952
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr "nie można ustawić właściwości typu „%s” z wartości typu „%s”"
 
-#: ../libnm-core/nm-setting.c:919 ../libnm-core/nm-setting.c:934
+#: ../libnm-core/nm-setting.c:922 ../libnm-core/nm-setting.c:937
 #, c-format
 msgid "failed to set property: %s"
 msgstr "ustawienie właściwości się nie powiodło: %s"
 
-#: ../libnm-core/nm-setting.c:964
+#: ../libnm-core/nm-setting.c:967
 #, c-format
 msgid "can not set property: %s"
 msgstr "nie można ustawić właściwości: %s"
 
-#: ../libnm-core/nm-setting.c:2015
+#: ../libnm-core/nm-setting.c:2018
 msgid "secret not found"
 msgstr "nie odnaleziono hasła"
 
@@ -9116,7 +8958,7 @@ msgid "team config is not valid UTF-8"
 msgstr "konfiguracja zespołu nie jest prawidłowym tekstem UTF-8"
 
 #: ../libnm-core/nm-team-utils.c:2104
-#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9025
+#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9068
 #, c-format
 msgid "invalid json"
 msgstr "nieprawidłowy kod JSON"
@@ -9131,238 +8973,218 @@ msgstr "nieprawidłowy typ D-Bus „%s”"
 msgid "invalid link-watchers: %s"
 msgstr "nieprawidłowi obserwatorzy łącza: %s"
 
-#: ../libnm-core/nm-utils.c:2330
+#: ../libnm-core/nm-utils.c:2284
 #, c-format
 msgid "'%s' is not a valid handle."
 msgstr "„%s” nie jest prawidłowym elementem obsługującym."
 
-#: ../libnm-core/nm-utils.c:2458
+#: ../libnm-core/nm-utils.c:2412
 #, c-format
 msgid "'%s' unexpected: parent already specified."
 msgstr "„%s” jest nieoczekiwane: element nadrzędny jest już podany."
 
-#: ../libnm-core/nm-utils.c:2474
+#: ../libnm-core/nm-utils.c:2428
 #, c-format
 msgid "invalid handle: '%s'"
 msgstr "nieprawidłowy element obsługujący: „%s”"
 
-#: ../libnm-core/nm-utils.c:2496
+#: ../libnm-core/nm-utils.c:2450
 msgid "parent not specified."
 msgstr "nie podano elementu nadrzędnego."
 
-#: ../libnm-core/nm-utils.c:2558
+#: ../libnm-core/nm-utils.c:2512
 #, c-format
 msgid "unsupported qdisc option: '%s'."
 msgstr "nieobsługiwana opcja qdisc: „%s” ."
 
-#: ../libnm-core/nm-utils.c:2680
+#: ../libnm-core/nm-utils.c:2634
 msgid "action name missing."
 msgstr "brak nazwy działania."
 
-#: ../libnm-core/nm-utils.c:2706
+#: ../libnm-core/nm-utils.c:2660
 #, c-format
 msgid "unsupported action option: '%s'."
 msgstr "nieobsługiwana opcja działania: „%s”."
 
-#: ../libnm-core/nm-utils.c:2844
+#: ../libnm-core/nm-utils.c:2798
 msgid "invalid action: "
 msgstr "nieprawidłowe działanie: "
 
-#: ../libnm-core/nm-utils.c:2848
+#: ../libnm-core/nm-utils.c:2802
 #, c-format
 msgid "unsupported tfilter option: '%s'."
 msgstr "nieobsługiwana opcja tfilter: „%s”."
 
-#: ../libnm-core/nm-utils.c:3449
+#: ../libnm-core/nm-utils.c:3403
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "wykonanie „stat” na pliku %s się nie powiodło: %s"
 
-#: ../libnm-core/nm-utils.c:3458
+#: ../libnm-core/nm-utils.c:3412
 #, c-format
 msgid "not a file (%s)"
 msgstr "nie jest plikiem (%s)"
 
-#: ../libnm-core/nm-utils.c:3469
+#: ../libnm-core/nm-utils.c:3423
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr "nieprawidłowy właściciel pliku %d dla %s"
 
-#: ../libnm-core/nm-utils.c:3480
+#: ../libnm-core/nm-utils.c:3434
 #, c-format
 msgid "file permissions for %s"
 msgstr "uprawnienia pliku dla %s"
 
-#: ../libnm-core/nm-utils.c:3490
+#: ../libnm-core/nm-utils.c:3444
 #, c-format
 msgid "reject %s"
 msgstr "odrzucenie %s"
 
-#: ../libnm-core/nm-utils.c:3509
+#: ../libnm-core/nm-utils.c:3463
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "ścieżka nie jest bezwzględna (%s)"
 
-#: ../libnm-core/nm-utils.c:3523
+#: ../libnm-core/nm-utils.c:3477
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "Plik wtyczki nie istnieje (%s)"
 
-#: ../libnm-core/nm-utils.c:3531
+#: ../libnm-core/nm-utils.c:3485
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "Wtyczka nie jest prawidłowym plikiem (%s)"
 
-#: ../libnm-core/nm-utils.c:3541
+#: ../libnm-core/nm-utils.c:3495
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "Archiwa biblioteki libtool nie są obsługiwane (%s)"
 
-#: ../libnm-core/nm-utils.c:3623
+#: ../libnm-core/nm-utils.c:3577
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "Nie można odnaleźć pliku binarnego „%s”"
 
-#: ../libnm-core/nm-utils.c:4517
+#: ../libnm-core/nm-utils.c:4506
 msgid "unknown secret flags"
 msgstr "nieznane flagi hasła"
 
-#: ../libnm-core/nm-utils.c:4527
+#: ../libnm-core/nm-utils.c:4516
 msgid "conflicting secret flags"
 msgstr "sprzeczne flagi hasła"
 
-#: ../libnm-core/nm-utils.c:4538
+#: ../libnm-core/nm-utils.c:4527
 msgid "secret flags must not be \"not-required\""
 msgstr "flagi hasła nie mogą być „not-required”"
 
-#: ../libnm-core/nm-utils.c:4546
+#: ../libnm-core/nm-utils.c:4535
 msgid "unsupported secret flags"
 msgstr "nieobsługiwane flagi hasła"
 
-#: ../libnm-core/nm-utils.c:4576
+#: ../libnm-core/nm-utils.c:4565
 msgid "can't be simultaneously disabled and enabled"
 msgstr "nie może być jednocześnie wyłączone i włączone"
 
-#: ../libnm-core/nm-utils.c:4584
+#: ../libnm-core/nm-utils.c:4573
 msgid "WPS is required"
 msgstr "Wymagane jest WPS"
 
-#: ../libnm-core/nm-utils.c:4650
+#: ../libnm-core/nm-utils.c:4639
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr "nieprawidłowy adres MAC Ethernetu dla maski w miejscu %lld"
 
-#: ../libnm-core/nm-utils.c:4665
+#: ../libnm-core/nm-utils.c:4654
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
 msgstr "nieprawidłowy adres MAC Ethernetu #%u w miejscu %lld"
 
-#: ../libnm-core/nm-utils.c:4725
-msgid "interface name is missing"
-msgstr "brak nazwy interfejsu"
-
-#: ../libnm-core/nm-utils.c:4731
-msgid "interface name is too short"
-msgstr "nazwa interfejsu jest za krótka"
-
-#: ../libnm-core/nm-utils.c:4740
-msgid "interface name is reserved"
-msgstr "nazwa interfejsu jest zastrzeżona"
-
-#: ../libnm-core/nm-utils.c:4752
-msgid "interface name contains an invalid character"
-msgstr "nazwa interfejsu zawiera nieprawidłowy znak"
-
-#: ../libnm-core/nm-utils.c:4758
-msgid "interface name is longer than 15 characters"
-msgstr "nazwa interfejsu jest dłuższa niż 15 znaków"
-
-#: ../libnm-core/nm-utils.c:5425
+#: ../libnm-core/nm-utils.c:5351
 msgid "not valid utf-8"
 msgstr "nieprawidłowy tekst UTF-8"
 
-#: ../libnm-core/nm-utils.c:5446 ../libnm-core/nm-utils.c:5499
+#: ../libnm-core/nm-utils.c:5372 ../libnm-core/nm-utils.c:5425
 msgid "is not a JSON object"
 msgstr "nie jest obiektem JSON"
 
-#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
+#: ../libnm-core/nm-utils.c:5401 ../libnm-core/nm-utils.c:5438
 msgid "value is NULL"
 msgstr "wartość wynosi NULL"
 
-#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
+#: ../libnm-core/nm-utils.c:5401 ../libnm-core/nm-utils.c:5438
 msgid "value is empty"
 msgstr "wartość jest pusta"
 
-#: ../libnm-core/nm-utils.c:5487
+#: ../libnm-core/nm-utils.c:5413
 #, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr "nieprawidłowy kod JSON w miejscu %d (%s)"
 
-#: ../libnm-core/nm-utils.c:5649 ../libnm-core/nm-utils.c:5669
+#: ../libnm-core/nm-utils.c:5575 ../libnm-core/nm-utils.c:5595
 msgid "unterminated escape sequence"
 msgstr "niezakończona sekwencja sterująca"
 
-#: ../libnm-core/nm-utils.c:5694
+#: ../libnm-core/nm-utils.c:5620
 #, c-format
 msgid "unknown attribute '%s'"
 msgstr "nieznany atrybut „%s”"
 
-#: ../libnm-core/nm-utils.c:5709
+#: ../libnm-core/nm-utils.c:5635
 #, c-format
 msgid "missing key-value separator '%c' after '%s'"
 msgstr "brak separatora klucz-wartość „%c” po „%s”"
 
-#: ../libnm-core/nm-utils.c:5725
+#: ../libnm-core/nm-utils.c:5651
 #, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
 msgstr "nieprawidłowa wartość uint32 „%s” dla atrybutu „%s”"
 
-#: ../libnm-core/nm-utils.c:5734
+#: ../libnm-core/nm-utils.c:5660
 #, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
 msgstr "nieprawidłowa wartość uint8 „%s” dla atrybutu „%s”"
 
-#: ../libnm-core/nm-utils.c:5744
+#: ../libnm-core/nm-utils.c:5670
 #, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
 msgstr "nieprawidłowa wartość logiczna „%s” dla atrybutu „%s”"
 
-#: ../libnm-core/nm-utils.c:5754
+#: ../libnm-core/nm-utils.c:5680
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
 msgstr "nieobsługiwany atrybut „%s” typu „%s”"
 
-#: ../libnm-core/nm-utils.c:6119
+#: ../libnm-core/nm-utils.c:6045
 #, c-format
 msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
 msgstr "VLAN mostka %d i %d nie są uporządkowane według rosnącego vid"
 
-#: ../libnm-core/nm-utils.c:6143
+#: ../libnm-core/nm-utils.c:6069
 #, c-format
 msgid "duplicate bridge VLAN vid %u"
 msgstr "podwójny vid VLAN mostka %u"
 
-#: ../libnm-core/nm-utils.c:6155
+#: ../libnm-core/nm-utils.c:6081
 msgid "only one VLAN can be the PVID"
 msgstr "tylko jedno VLAN może być PVID"
 
-#: ../libnm-core/nm-utils.c:6205
+#: ../libnm-core/nm-utils.c:6131
 #, c-format
 msgid "unknown flags 0x%x"
 msgstr "nieznane flagi 0x%x"
 
-#: ../libnm-core/nm-utils.c:6215
+#: ../libnm-core/nm-utils.c:6141
 msgid ""
 "'fqdn-no-update' and 'fqdn-serv-update' flags cannot be set at the same time"
 msgstr ""
 "flagi „fqdn-no-update” i „fqdn-serv-update” nie mogą być ustawione w tym "
 "samym czasie"
 
-#: ../libnm-core/nm-utils.c:6226
+#: ../libnm-core/nm-utils.c:6152
 msgid "'fqdn-clear-flags' flag is incompatible with other FQDN flags"
 msgstr "flaga „fqdn-clear-flags” jest niezgodna z pozostałymi flagami FQDN"
 
-#: ../libnm-core/nm-utils.c:6235
+#: ../libnm-core/nm-utils.c:6161
 msgid "DHCPv6 does not support the E (encoded) FQDN flag"
 msgstr "DHCPv6 nie obsługuje flagi E (zakodowanego) FQDN"
 
@@ -9401,60 +9223,60 @@ msgstr "wtyczka nie obsługuje importowania"
 msgid "the plugin does not support export capability"
 msgstr "wtyczka nie obsługuje eksportowania"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:93
+#: ../libnm-core/nm-vpn-plugin-info.c:111
 #, c-format
 msgid "missing filename"
 msgstr "brak nazwy pliku"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:101
+#: ../libnm-core/nm-vpn-plugin-info.c:119
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr "nazwa pliku musi być ścieżką bezwzględną (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
+#: ../libnm-core/nm-vpn-plugin-info.c:128
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr "nazwa pliku ma nieprawidłowy format (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:433
+#: ../libnm-core/nm-vpn-plugin-info.c:419
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr "istnieje wtyczka w konflikcie (%s) mająca tą samą wartość %s.%s"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:471
+#: ../libnm-core/nm-vpn-plugin-info.c:457
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr "istnieje wtyczka w konflikcie o tej samej nazwie (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1053
+#: ../libnm-core/nm-vpn-plugin-info.c:1045
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "brak ustawienia „plugin”"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1063
+#: ../libnm-core/nm-vpn-plugin-info.c:1055
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr ""
 "%s: bez ponownego wczytywania wtyczki, która się nie powiodła poprzednio"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1139
+#: ../libnm-core/nm-vpn-plugin-info.c:1131
 msgid "missing filename to load VPN plugin info"
 msgstr "brak nazwy pliku do wczytania informacji o wtyczce VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1151
+#: ../libnm-core/nm-vpn-plugin-info.c:1143
 msgid "missing name for VPN plugin info"
 msgstr "brak nazwy dla informacji o wtyczce VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1160
+#: ../libnm-core/nm-vpn-plugin-info.c:1152
 msgid "missing service for VPN plugin info"
 msgstr "brak usługi dla informacji o wtyczce VPN"
 
-#: ../libnm/nm-client.c:3584
+#: ../libnm/nm-client.c:3681
 #, c-format
 msgid "request succeeded with %s but object is in an unsuitable state"
 msgstr "żądanie się powiodło z %s, ale obiekt jest w niewłaściwym stanie"
 
-#: ../libnm/nm-client.c:3675
+#: ../libnm/nm-client.c:3772
 #, c-format
 msgid "operation succeeded but object %s does not exist"
 msgstr "działanie się powiodło, ale obiekt %s nie istnieje"
@@ -9463,7 +9285,7 @@ msgstr "działanie się powiodło, ale obiekt %s nie istnieje"
 msgid "The connection was not an ADSL connection."
 msgstr "Połączenie nie jest połączeniem ADSL."
 
-#: ../libnm/nm-device-bond.c:104
+#: ../libnm/nm-device-bond.c:105
 msgid "The connection was not a bond connection."
 msgstr "Połączenie nie jest połączeniem wiązanym."
 
@@ -9494,11 +9316,11 @@ msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
 msgstr "Urządzenie nie ma możliwości Bluetooth wymaganych przez połączenie."
 
-#: ../libnm/nm-device-dummy.c:68
+#: ../libnm/nm-device-dummy.c:61
 msgid "The connection was not a dummy connection."
 msgstr "Połączenie nie jest atrapą połączenia."
 
-#: ../libnm/nm-device-dummy.c:75 ../libnm/nm-device-generic.c:91
+#: ../libnm/nm-device-dummy.c:68 ../libnm/nm-device-generic.c:85
 #: ../libnm/nm-device-ovs-bridge.c:84 ../libnm/nm-device-ovs-interface.c:52
 #: ../libnm/nm-device-ovs-port.c:84
 msgid "The connection did not specify an interface name."
@@ -9531,7 +9353,7 @@ msgstr "Nieprawidłowy adres MAC na czarnej liście: %s."
 msgid "Device MAC (%s) is blacklisted by the connection."
 msgstr "Adres MAC urządzenia (%s) jest na czarnej liście połączenia."
 
-#: ../libnm/nm-device-generic.c:84
+#: ../libnm/nm-device-generic.c:78
 msgid "The connection was not a generic connection."
 msgstr "Połączenie nie jest ogólnym połączeniem."
 
@@ -9551,7 +9373,7 @@ msgstr "Adresy MAC urządzenia i połączenia się nie zgadzają."
 msgid "The connection was not an IP tunnel connection."
 msgstr "Połączenie nie jest połączeniem tunelu IP."
 
-#: ../libnm/nm-device-macvlan.c:151
+#: ../libnm/nm-device-macvlan.c:152
 msgid "The connection was not a MAC-VLAN connection."
 msgstr "Połączenie nie jest połączeniem MAC-VLAN."
 
@@ -9567,7 +9389,7 @@ msgstr "Połączenie nie jest prawidłowym połączeniem modemowym."
 msgid "The device is lacking capabilities required by the connection."
 msgstr "Urządzenie nie ma możliwości wymaganych przez połączenie."
 
-#: ../libnm/nm-device-olpc-mesh.c:107
+#: ../libnm/nm-device-olpc-mesh.c:101
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "Połączenie nie jest połączeniem kratowym OLPC."
 
@@ -9583,7 +9405,7 @@ msgstr "Połączenie nie jest połączeniem „ovs_interface”."
 msgid "The connection was not a ovs_port connection."
 msgstr "Połączenie nie jest połączeniem „ovs_port”."
 
-#: ../libnm/nm-device-team.c:131
+#: ../libnm/nm-device-team.c:125
 msgid "The connection was not a team connection."
 msgstr "Połączenie nie jest połączeniem zespołowym."
 
@@ -9603,10 +9425,18 @@ msgstr "Połączenie nie jest połączeniem VLAN."
 msgid "The VLAN identifiers of the device and the connection didn't match."
 msgstr "Identyfikatory VLAN urządzenia i połączenia się nie zgadzają."
 
-#: ../libnm/nm-device-vlan.c:143
+#: ../libnm/nm-device-vlan.c:144
 msgid "The hardware address of the device and the connection didn't match."
 msgstr "Adres sprzętowy urządzenia i połączenia się nie zgadza."
 
+#: ../libnm/nm-device-vrf.c:63
+msgid "The connection was not a VRF connection."
+msgstr "Połączenie nie jest połączeniem VRF."
+
+#: ../libnm/nm-device-vrf.c:70
+msgid "The VRF table of the device and the connection didn't match."
+msgstr "Tabele VRF urządzenia i połączenia się nie zgadzają."
+
 #: ../libnm/nm-device-vxlan.c:381
 msgid "The connection was not a VXLAN connection."
 msgstr "Połączenie nie jest połączeniem VXLAN."
@@ -9631,95 +9461,99 @@ msgstr "Urządzenie nie ma możliwości WPA wymaganych przez połączenie."
 msgid "The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr "Urządzenie nie ma możliwości WPA2/RSN wymaganych przez połączenie."
 
-#: ../libnm/nm-device-wpan.c:64
+#: ../libnm/nm-device-wpan.c:54
 msgid "The connection was not a wpan connection."
 msgstr "Połączenie nie jest połączeniem WPAN."
 
-#: ../libnm/nm-device.c:1459
+#: ../libnm/nm-device.c:1526
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm/nm-device.c:1461
+#: ../libnm/nm-device.c:1528
 msgid "OLPC Mesh"
 msgstr "Kratowe OLPC"
 
-#: ../libnm/nm-device.c:1463
+#: ../libnm/nm-device.c:1530
 msgid "Open vSwitch Interface"
 msgstr "Interfejs Open vSwitch"
 
-#: ../libnm/nm-device.c:1465
+#: ../libnm/nm-device.c:1532
 msgid "Open vSwitch Port"
 msgstr "Port Open vSwitch"
 
-#: ../libnm/nm-device.c:1467
+#: ../libnm/nm-device.c:1534
 msgid "Open vSwitch Bridge"
 msgstr "Mostek Open vSwitch"
 
-#: ../libnm/nm-device.c:1469
+#: ../libnm/nm-device.c:1536
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../libnm/nm-device.c:1483
+#: ../libnm/nm-device.c:1550
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../libnm/nm-device.c:1485
+#: ../libnm/nm-device.c:1552
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm/nm-device.c:1487
+#: ../libnm/nm-device.c:1554
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../libnm/nm-device.c:1489
+#: ../libnm/nm-device.c:1556
 msgid "IPTunnel"
 msgstr "Tunel IP"
 
-#: ../libnm/nm-device.c:1491
+#: ../libnm/nm-device.c:1558
 msgid "Tun"
 msgstr "TUN"
 
-#: ../libnm/nm-device.c:1493
+#: ../libnm/nm-device.c:1560
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm/nm-device.c:1495
+#: ../libnm/nm-device.c:1562
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../libnm/nm-device.c:1497
+#: ../libnm/nm-device.c:1564
 msgid "Dummy"
 msgstr "Atrapa"
 
-#: ../libnm/nm-device.c:1499
+#: ../libnm/nm-device.c:1566
 msgid "PPP"
 msgstr "PPP"
 
-#: ../libnm/nm-device.c:1501
+#: ../libnm/nm-device.c:1568
 msgid "IEEE 802.15.4"
 msgstr "IEEE 802.15.4"
 
-#: ../libnm/nm-device.c:1503
+#: ../libnm/nm-device.c:1570
 msgid "6LoWPAN"
 msgstr "6LoWPAN"
 
-#: ../libnm/nm-device.c:1505
+#: ../libnm/nm-device.c:1572
 msgid "WireGuard"
 msgstr "WireGuard"
 
-#: ../libnm/nm-device.c:1507
+#: ../libnm/nm-device.c:1574
 msgid "Wi-Fi P2P"
 msgstr "Wi-Fi P2P"
 
-#: ../libnm/nm-device.c:1539
+#: ../libnm/nm-device.c:1576
+msgid "VRF"
+msgstr "VRF"
+
+#: ../libnm/nm-device.c:1608
 msgid "Wired"
 msgstr "Przewodowe"
 
-#: ../libnm/nm-device.c:1571
+#: ../libnm/nm-device.c:1640
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm/nm-device.c:1573
+#: ../libnm/nm-device.c:1642
 msgid "USB"
 msgstr "USB"
 
@@ -9729,22 +9563,26 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../libnm/nm-device.c:1873 ../libnm/nm-device.c:1892
+#: ../libnm/nm-device.c:1942 ../libnm/nm-device.c:1961
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%2$s (%1$s)"
 
-#: ../libnm/nm-device.c:2569
+#: ../libnm/nm-device.c:2638
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "Połączenie jest nieprawidłowe: %s"
 
-#: ../libnm/nm-device.c:2578
+#: ../libnm/nm-device.c:2647
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr "Nazwy interfejsu urządzenia i połączenia się nie zgadzają."
 
+#: ../libnm/nm-secret-agent-old.c:1412
+msgid "registration failed"
+msgstr "rejestracja się nie powiodła"
+
 #: ../libnm/nm-vpn-plugin-old.c:828 ../libnm/nm-vpn-service-plugin.c:1027
 msgid "No service name specified"
 msgstr "Nie podano nazwy usługi"
@@ -9919,17 +9757,17 @@ msgstr ""
 "Ustawienia systemu uniemożliwiają włączanie lub wyłączanie sprawdzania "
 "łączności"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1669
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2184
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "klasa obiektów „%s” nie ma właściwości o nazwie „%s”"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1676
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2191
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "właściwość „%s” klasy obiektów „%s” nie jest zapisywalna"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1683
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2198
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -9937,19 +9775,19 @@ msgstr ""
 "właściwość konstruktu „%s” dla obiektu „%s” nie może zostać ustawiona po "
 "konstrukcji"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1691
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2206
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "„%s::%s” nie jest prawidłową nazwą właściwości; „%s” nie jest podtypem "
 "GObject"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1700
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2215
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "nie można ustawić właściwości „%s” typu „%s” z wartości typu „%s”"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1711
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2226
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -9958,6 +9796,264 @@ msgstr ""
 "wartość „%s” typu „%s” jest nieprawidłowa lub spoza zakresu dla właściwości "
 "„%s” typu „%s”"
 
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4549
+msgid "interface name is missing"
+msgstr "brak nazwy interfejsu"
+
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4555
+msgid "interface name is too short"
+msgstr "nazwa interfejsu jest za krótka"
+
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4564
+msgid "interface name is reserved"
+msgstr "nazwa interfejsu jest zastrzeżona"
+
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4576
+msgid "interface name contains an invalid character"
+msgstr "nazwa interfejsu zawiera nieprawidłowy znak"
+
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4582
+msgid "interface name is longer than 15 characters"
+msgstr "nazwa interfejsu jest dłuższa niż 15 znaków"
+
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4605
+#, c-format
+msgid "'%%' is not allowed in interface names"
+msgstr "„%%” nie jest dozwolone w nazwach interfejsów"
+
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4618
+#, c-format
+msgid "'%s' is not allowed as interface name"
+msgstr "„%s” nie jest dozwolone jako nazwa interfejsu"
+
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4639
+msgid ""
+"interface name must be alphanumerical with no forward or backward slashes"
+msgstr ""
+"nazwa interfejsu musi być alfanumeryczna bez ukośników prawych ani lewych"
+
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4656
+msgid "interface name must not be empty"
+msgstr "nazwa interfejsu nie może być pusta"
+
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4662
+msgid "interface name must be UTF-8 encoded"
+msgstr "nazwa interfejsu musi być zakodowana za pomocą UTF-8"
+
+#: ../shared/nm-keyfile/nm-keyfile-utils.c:242
+#, c-format
+msgid "value is not an integer in range [%lld, %lld]"
+msgstr "wartość nie jest liczbą całkowitą w zakresie [%lld, %lld]"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:196
+msgid "ignoring missing number"
+msgstr "ignorowanie brakującej liczby"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:204
+#, c-format
+msgid "ignoring invalid number '%s'"
+msgstr "ignorowanie nieprawidłowej liczby „%s”"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:225
+#, c-format
+msgid "ignoring invalid %s address: %s"
+msgstr "ignorowanie nieprawidłowego adresu %s: %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:268
+#, c-format
+msgid "ignoring invalid gateway '%s' for %s route"
+msgstr "ignorowanie nieprawidłowej bramy „%s” dla trasy %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:292
+#, c-format
+msgid "ignoring invalid %s route: %s"
+msgstr "ignorowanie nieprawidłowej trasy %s: %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:464
+#, c-format
+msgid "unexpected character '%c' for address %s: '%s' (position %td)"
+msgstr "nieoczekiwany znak „%c” dla adresu %s: „%s” (położenie %td)"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:474
+#, c-format
+msgid "unexpected character '%c' for %s: '%s' (position %td)"
+msgstr "nieoczekiwany znak „%c” dla %s: „%s” (położenie %td)"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:483
+#, c-format
+msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
+msgstr ""
+"nieoczekiwany znak „%c” w długości przedrostka dla %s: „%s” (położenie %td)"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:494
+#, c-format
+msgid "garbage at the end of value %s: '%s'"
+msgstr "śmiecie na końcu wartości %s: „%s”"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:500
+#, c-format
+msgid "deprecated semicolon at the end of value %s: '%s'"
+msgstr "przestarzały średnik na końcu wartości %s: „%s”"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:514
+#, c-format
+msgid "invalid prefix length for %s '%s', defaulting to %d"
+msgstr "nieprawidłowa długość przedrostka dla %s „%s”, domyślnie %d"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:521
+#, c-format
+msgid "missing prefix length for %s '%s', defaulting to %d"
+msgstr "brak długości przedrostka dla %s „%s”, domyślnie %d"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:894
+#, c-format
+msgid "ignoring invalid DNS server IPv%c address '%s'"
+msgstr "ignorowanie nieprawidłowego adresu IPv%c serwera DNS „%s”"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:990 ../shared/nm-keyfile/nm-keyfile.c:3143
+#, c-format
+msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
+msgstr ""
+"ignorowanie nieprawidłowego elementu bajtu „%d” (nie jest między 0 a 255, "
+"włącznie)"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1001
+msgid "ignoring invalid MAC address"
+msgstr "ignorowanie nieprawidłowego adresu MAC"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1260
+msgid "ignoring invalid SSID"
+msgstr "ignorowanie nieprawidłowego SSID"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1276
+msgid "ignoring invalid raw password"
+msgstr "ignorowanie nieprawidłowego surowego hasła"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1416
+msgid "invalid key/cert value"
+msgstr "nieprawidłowa wartość klucz/certyfikat"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1427
+#, c-format
+msgid "invalid key/cert value path \"%s\""
+msgstr "nieprawidłowa ścieżka wartości klucz/certyfikat „%s”"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1447
+#: ../shared/nm-keyfile/nm-keyfile.c:1530
+#, c-format
+msgid "certificate or key file '%s' does not exist"
+msgstr "certyfikat lub plik klucza „%s” nie istnieje"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1456
+#, c-format
+msgid "invalid PKCS#11 URI \"%s\""
+msgstr "nieprawidłowy adres URI PKCS#11 „%s”"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1500
+msgid "invalid key/cert value data:;base64, is not base64"
+msgstr "nieprawidłowe dane wartości klucz/certyfikat:;base64, nie jest base64"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1509
+msgid "invalid key/cert value data:;base64,file://"
+msgstr "nieprawidłowe dane wartości klucz/certyfikat:;base64,file://"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1542
+msgid "invalid key/cert value is not a valid blob"
+msgstr ""
+"nieprawidłowa wartość klucz/certyfikat nie jest prawidłowymi danymi typu blob"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1644
+#, c-format
+msgid "invalid parity value '%s'"
+msgstr "nieprawidłowa wartość parzystości „%s”"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1661
+#: ../shared/nm-keyfile/nm-keyfile.c:3198
+#, c-format
+msgid "invalid setting: %s"
+msgstr "nieprawidłowe ustawienie: %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1678
+#, c-format
+msgid "ignoring invalid team configuration: %s"
+msgstr "ignorowanie nieprawidłowej konfiguracji zespołu: %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1756
+#, c-format
+msgid "invalid qdisc: %s"
+msgstr "nieprawidłowe qdisc: %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1802
+#, c-format
+msgid "invalid tfilter: %s"
+msgstr "nieprawidłowe tfilter: %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3042
+#, c-format
+msgid "error loading setting value: %s"
+msgstr "błąd podczas wczytywania wartości ustawienia: %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3070
+#: ../shared/nm-keyfile/nm-keyfile.c:3081
+#: ../shared/nm-keyfile/nm-keyfile.c:3099
+#: ../shared/nm-keyfile/nm-keyfile.c:3110
+#: ../shared/nm-keyfile/nm-keyfile.c:3121
+#: ../shared/nm-keyfile/nm-keyfile.c:3173
+#: ../shared/nm-keyfile/nm-keyfile.c:3184
+msgid "value cannot be interpreted as integer"
+msgstr "wartość nie może zostać zinterpretowana jako liczba całkowita"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3219
+#, c-format
+msgid "invalid setting name '%s'"
+msgstr "nieprawidłowa nazwa ustawienia „%s”"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3264
+#, c-format
+msgid "invalid key '%s.%s'"
+msgstr "nieprawidłowy klucz „%s.%s”"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3279
+#, c-format
+msgid "key '%s.%s' is not boolean"
+msgstr "klucz „%s.%s” nie jest wartością logiczną"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3336
+#, c-format
+msgid "invalid peer public key in section '%s'"
+msgstr "nieprawidłowy klucz publiczny partnera w sekcji „%s”"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3348
+#, c-format
+msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
+msgstr ""
+"klucz „%s.%s” nie jest prawidłowym 256-bitowym kluczem w kodowaniu base64"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3361
+#, c-format
+msgid "key '%s.%s' is not a valid secret flag"
+msgstr "klucz „%s.%s” nie jest prawidłową flagą hasła"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3373
+#, c-format
+msgid "key '%s.%s' is not a integer in range 0 to 2^32"
+msgstr "klucz „%s.%s” nie jest liczbą całkowitą w zakresie 0 do 2^32"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3385
+#, c-format
+msgid "key '%s.%s' is not a valid endpoint"
+msgstr "klucz „%s.%s” nie jest prawidłowym punktem końcowym"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3407
+#, c-format
+msgid "key '%s.%s' has invalid allowed-ips"
+msgstr "klucz „%s.%s” ma nieprawidłowe dozwolone adresy IP"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3419
+#, c-format
+msgid "peer '%s' is invalid: %s"
+msgstr "partner „%s” jest nieprawidłowy: %s"
+
 #: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:221
 #, c-format
 msgid "'%s' is not valid: properties should be specified as 'key=value'"
@@ -10019,25 +10115,25 @@ msgid "Failed to read configuration: %s\n"
 msgstr "Odczytanie konfiguracji się nie powiodło: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:184 ../src/nm-iface-helper.c:295
+#: ../src/main.c:184 ../src/nm-iface-helper.c:296
 msgid "Print NetworkManager version and exit"
 msgstr "Wyświetla wersję usługi NetworkManager i kończy działanie"
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:296
+#: ../src/main.c:185 ../src/nm-iface-helper.c:297
 msgid "Don't become a daemon"
 msgstr "Bez zmiany w usługę"
 
-#: ../src/main.c:186 ../src/nm-iface-helper.c:298
+#: ../src/main.c:186 ../src/nm-iface-helper.c:299
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Poziom dziennika: jeden z [%s]"
 
-#: ../src/main.c:188 ../src/nm-iface-helper.c:300
+#: ../src/main.c:188 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "Domeny dziennika oddzielone przez „,”: dowolne połączenie [%s]"
 
-#: ../src/main.c:190 ../src/nm-iface-helper.c:302
+#: ../src/main.c:190 ../src/nm-iface-helper.c:303
 msgid "Make all warnings fatal"
 msgstr "Wszystkie ostrzeżenia jako krytyczne"
 
@@ -10061,12 +10157,12 @@ msgstr ""
 "wybranie bezprzewodowych punktów dostępowych, z którymi karty\n"
 "sieciowe w komputerze mają być powiązane."
 
-#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:443
+#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:444
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Parametr --help wyświetli listę prawidłowych opcji.\n"
 
-#: ../src/main.c:358 ../src/nm-iface-helper.c:456
+#: ../src/main.c:358 ../src/nm-iface-helper.c:457
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Nie można zmienić w usługę: %s [błąd %u]\n"
@@ -10173,11 +10269,11 @@ msgstr "Połączenie mostkowane"
 msgid "Dummy connection"
 msgstr "Atrapa połączenia"
 
-#: ../src/devices/nm-device-ethernet.c:1506
+#: ../src/devices/nm-device-ethernet.c:1562
 msgid "PPPoE connection"
 msgstr "Połączenie PPPoE"
 
-#: ../src/devices/nm-device-ethernet.c:1506
+#: ../src/devices/nm-device-ethernet.c:1562
 msgid "Wired connection"
 msgstr "Połączenie przewodowe"
 
@@ -10186,7 +10282,7 @@ msgstr "Połączenie przewodowe"
 msgid "Wired connection %d"
 msgstr "Połączenie przewodowe %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:407
+#: ../src/devices/nm-device-ip-tunnel.c:408
 msgid "IP tunnel connection"
 msgstr "Połączenie tunelu IP"
 
@@ -10355,7 +10451,7 @@ msgstr ""
 "Uwierzytelnianie WPA jest niezgodne z uwierzytelnianiem kluczem "
 "współdzielonym"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:776
+#: ../src/devices/wifi/nm-wifi-utils.c:782
 msgid "Failed to determine AP security information"
 msgstr ""
 "Ustalenie informacji o zabezpieczeniach punktu dostępowego się nie powiodło"
@@ -10397,7 +10493,7 @@ msgstr "Lista wtyczek oddzielonych „,”"
 msgid "Quit after initial configuration"
 msgstr "Kończy działanie po początkowej konfiguracji"
 
-#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:297
+#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:298
 msgid "Don't become a daemon, and log to stderr"
 msgstr ""
 "Bez zmiany w usługę i zapisywanie dziennika do standardowego wyjścia błędów"
@@ -10424,83 +10520,83 @@ msgid "Show NetworkManager options"
 msgstr "Wyświetl opcje usługi NetworkManager"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:277
+#: ../src/nm-iface-helper.c:278
 msgid "The interface to manage"
 msgstr "Interfejs do zarządzania"
 
-#: ../src/nm-iface-helper.c:278
+#: ../src/nm-iface-helper.c:279
 msgid "Connection UUID"
 msgstr "UUID połączenia"
 
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:280
 msgid "Connection Token for Stable IDs"
 msgstr "Token połączenia dla stabilnych identyfikatorów"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "Czy zarządzać SLAAC IPv6"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 msgid "Whether SLAAC must be successful"
 msgstr "Czy SLAAC musi się powieść"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:283
 msgid "Use an IPv6 temporary privacy address"
 msgstr "Użycie tymczasowego adresu prywatnego IPv6"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:284
 msgid "Current DHCPv4 address"
 msgstr "Bieżący adres DHCPv4"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:285
 msgid "Whether DHCPv4 must be successful"
 msgstr "Czy DHCPv4 musi się powieść"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:286
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "Identyfikator klienta DHCPv4 zakodowany szesnastkowo"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:287
 msgid "Hostname to send to DHCP server"
 msgstr "Nazwa komputera wysyłana do serwera DHCP"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:287
 msgid "barbar"
 msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:288
 msgid "FQDN to send to DHCP server"
 msgstr "FQDN wysyłane do serwera DHCP"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:288
 msgid "host.domain.org"
 msgstr "komputer.example.com"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "Route priority for IPv4"
 msgstr "Priorytet trasy dla IPv4"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "Route priority for IPv6"
 msgstr "Priorytet trasy dla IPv6"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "Hex-encoded Interface Identifier"
 msgstr "Identyfikator interfejsu zakodowany szesnastkowo"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:292
 msgid "IPv6 SLAAC address generation mode"
 msgstr "Tryb tworzenia adresów SLAAC IPv6"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:293
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
@@ -10508,7 +10604,7 @@ msgstr ""
 "Właściwość konfiguracji mechanizmu dziennika. Więcej informacji zawiera "
 "„logging.backend” w pliku NetworkManager.conf"
 
-#: ../src/nm-iface-helper.c:312
+#: ../src/nm-iface-helper.c:313
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
@@ -10516,28 +10612,28 @@ msgstr ""
 "nm-iface-helper to mały, samodzielny proces zarządzający pojedynczym "
 "interfejsem sieciowym."
 
-#: ../src/nm-iface-helper.c:423
+#: ../src/nm-iface-helper.c:424
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "Wymagana jest nazwa interfejsu i UUID\n"
 
-#: ../src/nm-iface-helper.c:430
+#: ../src/nm-iface-helper.c:431
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "Odnalezienie indeksu interfejsu dla %s (%s) się nie powiodło\n"
 
-#: ../src/nm-iface-helper.c:448
+#: ../src/nm-iface-helper.c:449
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr ""
 "Ignorowanie nieznanych domen dziennika „%s” przekazanych w wierszu poleceń.\n"
 
-#: ../src/nm-iface-helper.c:489
+#: ../src/nm-iface-helper.c:490
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): nieprawidłowy IID %s\n"
 
-#: ../src/nm-iface-helper.c:500
+#: ../src/nm-iface-helper.c:501
 #, c-format
 msgid "(%s): Invalid DHCP client-id %s\n"
 msgstr "(%s): nieprawidłowy client-id DHCP %s\n"

From 304fabf3812460b07aa7066435a20a9febd8bfb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sun, 12 Apr 2020 11:30:21 +0200
Subject: [PATCH 004/222] po: mark broken translations as fuzzy

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/468
---
 po/fr.po    | 2 +-
 po/ja.po    | 6 +++---
 po/sk.po    | 2 +-
 po/zh_CN.po | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index cf3e68b940..1b3cca7803 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3435,7 +3435,7 @@ msgid "Error: 'general permissions': %s"
 msgstr "Erreur : « general permissions » : %s"
 
 #: ../clients/cli/general.c:664
-#, c-format
+#, fuzzy, c-format
 msgid "Error: invalid reload flag '%s'. Allowed flags are: %s"
 msgstr "Erreur : drapeau de rechargement non valide «%s». Les drapeaux autorisés sont : "
 
diff --git a/po/ja.po b/po/ja.po
index 05693479ed..01c4ad822d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5774,12 +5774,12 @@ msgid "unrecognized line at %s:%zu"
 msgstr "%s:%zu に未認識の行があります"
 
 #: ../clients/common/nm-vpn-helpers.c:671
-#, c-format
+#, fuzzy, c-format
 msgid "invalid value for '%s' at %s:%zu"
 msgstr "%s:%zu における '%s' の値は無効です"
 
 #: ../clients/common/nm-vpn-helpers.c:676
-#, c-format
+#, fuzzy, c-format
 msgid "invalid secret '%s' at %s:%zu"
 msgstr "%s:%zu のシークレット '%s' は無効です"
 
@@ -11597,7 +11597,7 @@ msgid "unknown attribute '%s'"
 msgstr "不明な属性 '%s'"
 
 #: ../libnm-core/nm-utils.c:5709
-#, c-format
+#, fuzzy, c-format
 msgid "missing key-value separator '%c' after '%s'"
 msgstr "'%s' の後に、キー/値のセパレーター '%c' がありません"
 
diff --git a/po/sk.po b/po/sk.po
index 6eb373e8da..9330952793 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7985,7 +7985,7 @@ msgid "(No custom routes)"
 msgstr "(Žiadne vlastné smerovania)"
 
 #: ../clients/tui/nmt-page-ip4.c:85 ../clients/tui/nmt-page-ip6.c:85
-#, c-format
+#, fuzzy, c-format
 msgid "One custom route"
 msgid_plural "%d custom routes"
 msgstr[0] "Jedno vlastné smerovanie"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c931be3f66..72d7982be0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1283,7 +1283,7 @@ msgid "Error: Failed to add '%s' connection: %s"
 msgstr "错误：添加 \"%s\" 连接失败：%s"
 
 #: ../clients/cli/connections.c:4894
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
 "connection by its uuid '%2$s'\n"
@@ -8845,7 +8845,7 @@ msgid "(No custom routes)"
 msgstr "（没有自定义路由）"
 
 #: ../clients/tui/nmt-page-ip4.c:72 ../clients/tui/nmt-page-ip6.c:73
-#, c-format
+#, fuzzy, c-format
 msgid "One custom route"
 msgid_plural "%d custom routes"
 msgstr[0] "个自定义路由"

From 12c2aacea76817395fa10fc4e813339d3a8894f0 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 15 Apr 2020 09:52:54 +0200
Subject: [PATCH 005/222] keyfile: cleanup mac_address_parser()

---
 libnm-core/nm-utils.c          |  2 -
 shared/nm-keyfile/nm-keyfile.c | 83 ++++++++++++----------------------
 2 files changed, 30 insertions(+), 55 deletions(-)

diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 062ff39337..82033a085a 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -4033,8 +4033,6 @@ nm_utils_hwaddr_aton (const char *asc, gpointer buffer, gsize length)
 	return buffer;
 }
 
-
-
 /**
  * nm_utils_bin2hexstr:
  * @src: (type guint8) (array length=len): an array of bytes
diff --git a/shared/nm-keyfile/nm-keyfile.c b/shared/nm-keyfile/nm-keyfile.c
index 154857478f..9a317bfc13 100644
--- a/shared/nm-keyfile/nm-keyfile.c
+++ b/shared/nm-keyfile/nm-keyfile.c
@@ -934,13 +934,19 @@ ip6_addr_gen_mode_parser (KeyfileReaderInfo *info, NMSetting *setting, const cha
 }
 
 static void
-mac_address_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key, gsize enforce_length, gboolean cloned_mac_addr)
+mac_address_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key, gsize addr_len, gboolean cloned_mac_addr)
 {
 	const char *setting_name = nm_setting_get_name (setting);
+	char addr_str[NM_UTILS_HWADDR_LEN_MAX * 3];
+	guint8 addr_bin[NM_UTILS_HWADDR_LEN_MAX];
 	gs_free char *tmp_string = NULL;
-	const char *p, *mac_str;
-	gs_free guint8 *buf_arr = NULL;
-	guint buf_len = 0;
+	gs_free int *int_list = NULL;
+	const char *mac_str;
+	gsize int_list_len;
+	gsize i;
+
+	nm_assert (addr_len > 0);
+	nm_assert (addr_len <= NM_UTILS_HWADDR_LEN_MAX);
 
 	tmp_string = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key, NULL);
 
@@ -950,60 +956,31 @@ mac_address_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key
 		goto out;
 	}
 
-	if (tmp_string && tmp_string[0]) {
-		/* Look for enough ':' characters to signify a MAC address */
-		guint i = 0;
+	if (   tmp_string
+	    && nm_utils_hwaddr_aton (tmp_string, addr_bin, addr_len))
+		goto good_addr_bin;
 
-		p = tmp_string;
-		while (*p) {
-			if (*p == ':')
-				i++;
-			p++;
-		}
-
-		if (enforce_length == 0 || enforce_length == i+1) {
-			/* If we found enough it's probably a string-format MAC address */
-			buf_len = i + 1;
-			buf_arr = g_new (guint8, buf_len);
-			if (!nm_utils_hwaddr_aton (tmp_string, buf_arr, buf_len))
-				nm_clear_g_free (&buf_arr);
-		}
-	}
-	nm_clear_g_free (&tmp_string);
-
-	if (!buf_arr) {
-		gs_free int *tmp_list = NULL;
-		gsize length;
-
-		/* Old format; list of ints */
-		tmp_list = nm_keyfile_plugin_kf_get_integer_list (info->keyfile, setting_name, key, &length, NULL);
-		if (length > 0 && (enforce_length == 0 || enforce_length == length)) {
-			gsize i;
-
-			buf_len = length;
-			buf_arr = g_new (guint8, buf_len);
-			for (i = 0; i < length; i++) {
-				int val = tmp_list[i];
-
-				if (val < 0 || val > 255) {
-					handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-					             _("ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"),
-					             val);
-					return;
-				}
-				buf_arr[i] = (guint8) val;
-			}
+	/* Old format; list of ints */
+	int_list = nm_keyfile_plugin_kf_get_integer_list (info->keyfile, setting_name, key, &int_list_len, NULL);
+	if (int_list_len == addr_len) {
+		for (i = 0; i < addr_len; i++) {
+			const int val = int_list[i];
+
+			if (val < 0 || val > 255)
+				break;
+			addr_bin[i] = (guint8) val;
 		}
+		if (i == addr_len)
+			goto good_addr_bin;
 	}
 
-	if (!buf_arr) {
-		handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-		             _("ignoring invalid MAC address"));
-		return;
-	}
+	handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+	             _("ignoring invalid MAC address"));
+	return;
 
-	tmp_string = nm_utils_hwaddr_ntoa (buf_arr, buf_len);
-	mac_str = tmp_string;
+good_addr_bin:
+	nm_utils_bin2hexstr_full (addr_bin, addr_len, ':', TRUE, addr_str);
+	mac_str = addr_str;
 
 out:
 	g_object_set (setting, key, mac_str, NULL);

From 54500809322d89478c1f8abb7b18b34b563f0291 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 15 Apr 2020 18:47:12 +0200
Subject: [PATCH 006/222] dbus: don't use tabs in "nm-dispatcher.conf" D-Bus
 configuration file

---
 dispatcher/nm-dispatcher.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dispatcher/nm-dispatcher.conf b/dispatcher/nm-dispatcher.conf
index fd2f0e5a42..c28eb7bde9 100644
--- a/dispatcher/nm-dispatcher.conf
+++ b/dispatcher/nm-dispatcher.conf
@@ -2,13 +2,13 @@
  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
-	<policy user="root">
-		<allow own="org.freedesktop.nm_dispatcher"/>
-		<allow send_destination="org.freedesktop.nm_dispatcher"/>
+    <policy user="root">
+        <allow own="org.freedesktop.nm_dispatcher"/>
+        <allow send_destination="org.freedesktop.nm_dispatcher"/>
     </policy>
     <policy context="default">
-		<deny own="org.freedesktop.nm_dispatcher"/>
-		<deny send_destination="org.freedesktop.nm_dispatcher"/>
+        <deny own="org.freedesktop.nm_dispatcher"/>
+        <deny send_destination="org.freedesktop.nm_dispatcher"/>
     </policy>
 </busconfig>
 

From b681aec452748ae06f027f7b7f9f9b76479ca8fc Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 15 Apr 2020 18:47:12 +0200
Subject: [PATCH 007/222] dbus: indent by 4 space in "nm-ifcfg-rh.conf" D-Bus
 configuration file

---
 dispatcher/nm-dispatcher.conf                  |  1 -
 src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf | 13 ++++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dispatcher/nm-dispatcher.conf b/dispatcher/nm-dispatcher.conf
index c28eb7bde9..d6f31135e8 100644
--- a/dispatcher/nm-dispatcher.conf
+++ b/dispatcher/nm-dispatcher.conf
@@ -11,4 +11,3 @@
         <deny send_destination="org.freedesktop.nm_dispatcher"/>
     </policy>
 </busconfig>
-
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf b/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
index cc6ccb5cb4..c7a1730a5e 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
@@ -2,11 +2,10 @@
  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
-        <policy context="default">
-                <allow send_destination="com.redhat.ifcfgrh1"/>
-        </policy>
-        <policy user="root">
-                <allow own="com.redhat.ifcfgrh1"/>
-        </policy>
+    <policy context="default">
+        <allow send_destination="com.redhat.ifcfgrh1"/>
+    </policy>
+    <policy user="root">
+        <allow own="com.redhat.ifcfgrh1"/>
+    </policy>
 </busconfig>
-

From 216e97b7fa7b241c577bced7cd6b48dfa89595c1 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 15 Apr 2020 18:49:45 +0200
Subject: [PATCH 008/222] dbus: pretty format
 "org.freedesktop.NetworkManager.conf"

- indent by 4 spaces, not 8. We do that for the other 2 D-Bus
  configuration files. Also, since our lines here are rather long,
  save a bit in this regard.

- don't wrap lines for the XML elements. It makes it easier to visually
  parse.

- sort some lines asciibetically.

No changes otherwise.
---
 src/org.freedesktop.NetworkManager.conf | 222 ++++++++++--------------
 1 file changed, 91 insertions(+), 131 deletions(-)

diff --git a/src/org.freedesktop.NetworkManager.conf b/src/org.freedesktop.NetworkManager.conf
index 720c090ef1..5c2af2e0e5 100644
--- a/src/org.freedesktop.NetworkManager.conf
+++ b/src/org.freedesktop.NetworkManager.conf
@@ -2,150 +2,110 @@
  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
-        <policy user="root">
-                <allow own="org.freedesktop.NetworkManager"/>
-                <allow send_destination="org.freedesktop.NetworkManager"/>
+    <policy user="root">
+        <allow own="org.freedesktop.NetworkManager"/>
+        <allow send_destination="org.freedesktop.NetworkManager"/>
 
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.PPP"/>
+        <allow send_destination="org.freedesktop.NetworkManager"
+               send_interface="org.freedesktop.NetworkManager.PPP"/>
 
-                <allow send_interface="org.freedesktop.NetworkManager.SecretAgent"/>
-                <!-- These are there because some broken policies do
-                     <deny send_interface="..." /> (see dbus-daemon(8) for details).
-                     This seems to override that for the known VPN plugins.
-                  -->
-                <allow send_destination="org.freedesktop.NetworkManager.openconnect"/>
-                <allow send_destination="org.freedesktop.NetworkManager.openswan"/>
-                <allow send_destination="org.freedesktop.NetworkManager.openvpn"/>
-                <allow send_destination="org.freedesktop.NetworkManager.pptp"/>
-                <allow send_destination="org.freedesktop.NetworkManager.vpnc"/>
-                <allow send_destination="org.freedesktop.NetworkManager.ssh"/>
-                <allow send_destination="org.freedesktop.NetworkManager.iodine"/>
-                <allow send_destination="org.freedesktop.NetworkManager.l2tp"/>
-                <allow send_destination="org.freedesktop.NetworkManager.libreswan"/>
-                <allow send_destination="org.freedesktop.NetworkManager.fortisslvpn"/>
-                <allow send_destination="org.freedesktop.NetworkManager.strongswan"/>
-                <allow send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
+        <allow send_interface="org.freedesktop.NetworkManager.SecretAgent"/>
 
-                <allow send_destination="org.fedoraproject.FirewallD1"/>
+        <!-- These are there because some broken policies do
+             <deny send_interface="..." /> (see dbus-daemon(8) for details).
+             This seems to override that for the known VPN plugins.
+          -->
+        <allow send_destination="org.freedesktop.NetworkManager.openconnect"/>
+        <allow send_destination="org.freedesktop.NetworkManager.openswan"/>
+        <allow send_destination="org.freedesktop.NetworkManager.openvpn"/>
+        <allow send_destination="org.freedesktop.NetworkManager.pptp"/>
+        <allow send_destination="org.freedesktop.NetworkManager.vpnc"/>
+        <allow send_destination="org.freedesktop.NetworkManager.ssh"/>
+        <allow send_destination="org.freedesktop.NetworkManager.iodine"/>
+        <allow send_destination="org.freedesktop.NetworkManager.l2tp"/>
+        <allow send_destination="org.freedesktop.NetworkManager.libreswan"/>
+        <allow send_destination="org.freedesktop.NetworkManager.fortisslvpn"/>
+        <allow send_destination="org.freedesktop.NetworkManager.strongswan"/>
+        <allow send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
 
-                <!-- Allow the custom name for the dnsmasq instance spawned by NM
-                     from the dns dnsmasq plugin to own its dbus name, and for
-                     messages to be sent to it.
-                 -->
-                <allow own="org.freedesktop.NetworkManager.dnsmasq"/>
-                <allow send_destination="org.freedesktop.NetworkManager.dnsmasq"/>
-        </policy>
-        <policy context="default">
-                <deny own="org.freedesktop.NetworkManager"/>
+        <allow send_destination="org.fedoraproject.FirewallD1"/>
 
-                <deny send_destination="org.freedesktop.NetworkManager"/>
+        <!-- Allow the custom name for the dnsmasq instance spawned by NM
+             from the dns dnsmasq plugin to own its dbus name, and for
+             messages to be sent to it.
+         -->
+        <allow own="org.freedesktop.NetworkManager.dnsmasq"/>
+        <allow send_destination="org.freedesktop.NetworkManager.dnsmasq"/>
+    </policy>
+    <policy context="default">
+        <deny own="org.freedesktop.NetworkManager"/>
 
-                <!-- Basic D-Bus API stuff -->
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.DBus.Introspectable"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.DBus.Properties"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.DBus.ObjectManager"/>
+        <deny send_destination="org.freedesktop.NetworkManager"/>
 
-                <!-- Devices (read-only properties, no methods) -->
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Adsl"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Bond"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Bridge"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Bluetooth"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Wired"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Generic"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Gre"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Infiniband"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Macvlan"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Modem"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.OlpcMesh"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Team"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Tun"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Veth"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Vlan"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.WiMax.Nsp"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.AccessPoint"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.WifiP2PPeer"/>
+        <!-- Basic D-Bus API stuff -->
+        <allow send_destination="org.freedesktop.NetworkManager"
+               send_interface="org.freedesktop.DBus.Introspectable"/>
+        <allow send_destination="org.freedesktop.NetworkManager"
+               send_interface="org.freedesktop.DBus.Properties"/>
+        <allow send_destination="org.freedesktop.NetworkManager"
+               send_interface="org.freedesktop.DBus.ObjectManager"/>
 
-                <!-- Devices (read-only, no security required) -->
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.WiMax"/>
+        <!-- Devices (read-only properties, no methods) -->
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.AccessPoint"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Adsl"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Bluetooth"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Bond"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Bridge"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Generic"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Gre"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Infiniband"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Macvlan"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Modem"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.OlpcMesh"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Team"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Tun"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Veth"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Vlan"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Wired"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.WiMax.Nsp"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.WifiP2PPeer"/>
 
-                <!-- Devices (read/write, secured with PolicyKit) -->
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.Wireless"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device.WifiP2P"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Device"/>
+        <!-- Devices (read-only, no security required) -->
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.WiMax"/>
 
-                <!-- Core stuff (read-only properties, no methods) -->
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Connection.Active"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.DHCP4Config"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.DHCP6Config"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.IP4Config"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.IP6Config"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
+        <!-- Devices (read/write, secured with PolicyKit) -->
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.Wireless"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device.WifiP2P"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Device"/>
 
-                <!-- Core stuff (read/write, secured with PolicyKit) -->
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Settings"/>
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Settings.Connection"/>
+        <!-- Core stuff (read-only properties, no methods) -->
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Connection.Active"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.DHCP4Config"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.DHCP6Config"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.IP4Config"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.IP6Config"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
 
-                <!-- Agents; secured with PolicyKit.  Any process can talk to
-                     the AgentManager API, but only NetworkManager can talk
-                     to the agents themselves. -->
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.AgentManager"/>
+        <!-- Core stuff (read/write, secured with PolicyKit) -->
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Settings"/>
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Settings.Connection"/>
 
-                <!-- Root-only functions -->
-                <deny send_destination="org.freedesktop.NetworkManager"
-                      send_interface="org.freedesktop.NetworkManager"
-                      send_member="SetLogging"/>
-                <deny send_destination="org.freedesktop.NetworkManager"
-                      send_interface="org.freedesktop.NetworkManager"
-                      send_member="Sleep"/>
-                <deny send_destination="org.freedesktop.NetworkManager"
-                      send_interface="org.freedesktop.NetworkManager.Settings"
-                      send_member="LoadConnections"/>
-                <deny send_destination="org.freedesktop.NetworkManager"
-                      send_interface="org.freedesktop.NetworkManager.Settings"
-                      send_member="ReloadConnections"/>
+        <!-- Agents; secured with PolicyKit.  Any process can talk to
+             the AgentManager API, but only NetworkManager can talk
+             to the agents themselves. -->
+        <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.AgentManager"/>
 
-                <deny own="org.freedesktop.NetworkManager.dnsmasq"/>
-                <deny send_destination="org.freedesktop.NetworkManager.dnsmasq"/>
-        </policy>
+        <!-- Root-only functions -->
+        <deny send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager"          send_member="SetLogging"/>
+        <deny send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager"          send_member="Sleep"/>
+        <deny send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Settings" send_member="LoadConnections"/>
+        <deny send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.Settings" send_member="ReloadConnections"/>
 
-        <limit name="max_replies_per_connection">1024</limit>
-        <limit name="max_match_rules_per_connection">2048</limit>
+        <deny own="org.freedesktop.NetworkManager.dnsmasq"/>
+        <deny send_destination="org.freedesktop.NetworkManager.dnsmasq"/>
+    </policy>
+
+    <limit name="max_replies_per_connection">1024</limit>
+    <limit name="max_match_rules_per_connection">2048</limit>
 </busconfig>
-

From 8f46425b11188641a8ac6e53614405212465b464 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 15 Apr 2020 22:28:00 +0200
Subject: [PATCH 009/222] keyfile: avoid assertion failure in
 nm_keyfile_plugin_kf_get_{string,integer}_list()

g_key_file_get_integer_list() can return %NULL without setting an error.
That is the case if the key is set to an empty value.

For X sake, this API. Read the documentation and figure out whether
the function can return %NULL without reporting an error.

Anyway, avoid the assertion failure.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/412
---
 shared/nm-keyfile/nm-keyfile-utils.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shared/nm-keyfile/nm-keyfile-utils.c b/shared/nm-keyfile/nm-keyfile-utils.c
index e18db20d64..041b5eab11 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.c
+++ b/shared/nm-keyfile/nm-keyfile-utils.c
@@ -124,7 +124,6 @@ nm_keyfile_plugin_kf_get_##stype##_list (GKeyFile *kf, \
 			list = g_key_file_get_##stype##_list (kf, alias, key, &l, &local); \
 		} \
 	} \
-	nm_assert ((!local) != (!list)); \
 	if (local) \
 		g_propagate_error (error, local); \
 	if (!list) \

From 2cf31bfef0262014111b1a7ac53fbb145c6b79ad Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 15 Apr 2020 22:37:10 +0200
Subject: [PATCH 010/222] keyfile: minor cleanup  handling error in
 read_array_of_uint()

Why "if (length > G_MAXUINT)"? This is never going to hit. Also,
we probably should actual missing keys handle differently from
empty lists. If @error is set, return without setting the property.
---
 shared/nm-keyfile/nm-keyfile.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shared/nm-keyfile/nm-keyfile.c b/shared/nm-keyfile/nm-keyfile.c
index 9a317bfc13..879b1b004f 100644
--- a/shared/nm-keyfile/nm-keyfile.c
+++ b/shared/nm-keyfile/nm-keyfile.c
@@ -167,9 +167,10 @@ read_array_of_uint (GKeyFile *file,
 	gsize length;
 	gsize i;
 	gs_free int *tmp = NULL;
+	gs_free_error GError *error = NULL;
 
-	tmp = nm_keyfile_plugin_kf_get_integer_list (file, nm_setting_get_name (setting), key, &length, NULL);
-	if (length > G_MAXUINT)
+	tmp = nm_keyfile_plugin_kf_get_integer_list (file, nm_setting_get_name (setting), key, &length, &error);
+	if (error)
 		return;
 
 	array = g_array_sized_new (FALSE, FALSE, sizeof (guint), length);

From b94fcb2a9408134a1e0c26cecb196de2c3f21873 Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Wed, 15 Apr 2020 10:10:58 +0200
Subject: [PATCH 011/222] clients: allow properties to be hidden if they have
 the default value

---
 clients/common/nm-meta-setting-desc.c | 30 +++++++++++++++++++--------
 clients/common/nm-meta-setting-desc.h |  1 +
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 03f9b313ce..efad09ec57 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -8156,6 +8156,8 @@ _meta_type_property_info_get_fcn (const NMMetaAbstractInfo *abstract_info,
                                   gpointer *out_to_free)
 {
 	const NMMetaPropertyInfo *info = (const NMMetaPropertyInfo *) abstract_info;
+	gboolean is_default_local = FALSE;
+	gconstpointer r;
 
 	nm_assert (!out_to_free || !*out_to_free);
 	nm_assert (out_flags && !*out_flags);
@@ -8173,15 +8175,25 @@ _meta_type_property_info_get_fcn (const NMMetaAbstractInfo *abstract_info,
 		return _get_text_hidden (get_type);
 	}
 
-	return info->property_type->get_fcn (info,
-	                                     environment,
-	                                     environment_user_data,
-	                                     target,
-	                                     get_type,
-	                                     get_flags,
-	                                     out_flags,
-	                                     out_is_default,
-	                                     out_to_free);
+	if (   info->hide_if_default
+	    && !out_is_default)
+		out_is_default = &is_default_local;
+
+	r = info->property_type->get_fcn (info,
+	                                  environment,
+	                                  environment_user_data,
+	                                  target,
+	                                  get_type,
+	                                  get_flags,
+	                                  out_flags,
+	                                  out_is_default,
+	                                  out_to_free);
+
+	if (   info->hide_if_default
+	    && *out_is_default)
+		*out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_HIDE;
+
+	return r;
 
 }
 
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
index c728a1502c..2ba48f5de2 100644
--- a/clients/common/nm-meta-setting-desc.h
+++ b/clients/common/nm-meta-setting-desc.h
@@ -376,6 +376,7 @@ struct _NMMetaPropertyInfo {
 	bool is_secret:1;
 
 	bool is_cli_option:1;
+	bool hide_if_default:1;
 
 	const char *prompt;
 

From 69eca2539132557fe875e12361eaadaf15533fa7 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 15 Apr 2020 10:34:03 +0200
Subject: [PATCH 012/222] cli: let _print_fill() hide option if
 NM_META_ACCESSOR_GET_OUT_FLAGS_HIDE is set

Regardless, whether the option is also currently the default.
---
 clients/cli/utils.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index d0d553b9f2..5e54fdb1a6 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -1078,9 +1078,9 @@ _print_fill (const NmcConfig *nmc_config,
 
 			nm_assert (!to_free || value == to_free);
 
-			if (   is_default
-			    && (   nmc_config->overview
-			        || NM_FLAGS_HAS (text_out_flags, NM_META_ACCESSOR_GET_OUT_FLAGS_HIDE))) {
+			if (   (   is_default
+			        && nmc_config->overview)
+			    || NM_FLAGS_HAS (text_out_flags, NM_META_ACCESSOR_GET_OUT_FLAGS_HIDE)) {
 				/* don't mark the entry for display. This is to shorten the output in case
 				 * the property is the default value. But we only do that, if the user
 				 * opts in to this behavior (-overview), or of the property marks itself

From 3af07fd4157c02690b96d99fa8d2b27392e27b2e Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Wed, 15 Apr 2020 10:13:19 +0200
Subject: [PATCH 013/222] bridge: make some advanced options hidden if default

The options are:
  * group-address
  * multicast-querier
  * multicast-query-use-ifaddr
  * multicast-router
  * vlan-stats-enabled
  * vlan-protocol
---
 clients/common/nm-meta-setting-desc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index efad09ec57..c2f6b71769 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -4892,6 +4892,7 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_GROUP_ADDRESS,
 	    .property_type =                &_pt_gobject_mac,
+	    .hide_if_default =              TRUE,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,
 	    .is_cli_option =                TRUE,
@@ -4901,9 +4902,11 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERIER,
 	    .property_type =                &_pt_gobject_bool,
+	    .hide_if_default =              TRUE,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,
 	    .property_type =                &_pt_gobject_bool,
+	    .hide_if_default =              TRUE,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_SNOOPING,
 	    .is_cli_option =                TRUE,
@@ -4913,6 +4916,7 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_ROUTER,
 	    .property_type =                &_pt_gobject_string,
+	    .hide_if_default =              TRUE,
 	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
 	        .values_static =            NM_MAKE_STRV ("auto",
 	                                                  "disabled",
@@ -4927,9 +4931,11 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,
 	    .property_type =                &_pt_gobject_bool,
+	    .hide_if_default =              TRUE,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_VLAN_PROTOCOL,
 	    .property_type =                &_pt_gobject_string,
+	    .hide_if_default =              TRUE,
 	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
 	        .values_static =            NM_MAKE_STRV ("802.1Q",
 	                                                  "802.1ad"),

From a5916de5990f9ddd1e366fb74ba96702734f56b6 Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Wed, 15 Apr 2020 10:15:52 +0200
Subject: [PATCH 014/222] ethtool: refactor how options are hidden if default

Just use the new flag NMMetaPropertyInfo.
---
 clients/common/nm-meta-setting-desc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index c2f6b71769..c821c21342 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -4102,7 +4102,6 @@ _get_fcn_ethtool (ARGS_GET_FCN)
 	else {
 		s = NULL;
 		NM_SET_OUT (out_is_default, TRUE);
-		*out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_HIDE;
 	}
 
 	if (s && get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY)
@@ -5320,6 +5319,7 @@ static const NMMetaPropertyInfo *const property_infos_DCB[] = {
 #define PROPERTY_INFO_ETHTOOL(xname) \
 	PROPERTY_INFO (NM_ETHTOOL_OPTNAME_##xname, NULL, \
 	    .property_type = &_pt_ethtool, \
+	    .hide_if_default = TRUE, \
 	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (ethtool, \
 	        .ethtool_id = NM_ETHTOOL_ID_##xname, \
 	    ), \

From 70916a11838077b9e36a29794b95678c001aca95 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 16 Apr 2020 22:03:21 +0200
Subject: [PATCH 015/222] ifcfg-rh: add PKEY_ID to well-known keys

Fixes: 81e6fe963e42 ('ifcfg-rh: add functions to detect well-known ifcfg-rh keys')
---
 src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c | 1 +
 src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
index 28f57f50bd..d324361756 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
@@ -910,6 +910,7 @@ const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[] = {
 	_KEY_TYPE ("PEERROUTES",                                  NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("PHYSDEV",                                     NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("PKEY",                                        NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
+	_KEY_TYPE ("PKEY_ID",                                     NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("PMF",                                         NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("PORTNAME",                                    NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("POWERSAVE",                                   NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
index 8941fc19b2..056d03fabe 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
@@ -33,7 +33,7 @@ typedef struct {
 	NMSIfcfgKeyTypeFlags key_flags;
 } NMSIfcfgKeyTypeInfo;
 
-extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[231];
+extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[232];
 
 const NMSIfcfgKeyTypeInfo *nms_ifcfg_well_known_key_find_info (const char *key, gssize *out_idx);
 

From be78a1201290fdd49b206fc06d3a4127e762b571 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sat, 18 Apr 2020 18:33:54 +0200
Subject: [PATCH 016/222] contrib/rpm: fix spec file using bare words

  error: bare words are no longer supported, please use "...":  no != yes
  error: /builds/NetworkManager/NetworkManager/contrib/fedora/rpm/NetworkManager.20200418-163008.VM582H/SPECS/NetworkManager.spec:596: bad %if condition:  no != yes
---
 contrib/fedora/rpm/NetworkManager.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index e9a003e139..5520f821e1 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -593,7 +593,7 @@ This tool is still experimental.
 %else
 	-Dlibpsl=false \
 %endif
-%if %{ebpf_enabled} != yes
+%if %{ebpf_enabled} != "yes"
 	-Debpf=false \
 %else
 	-Debpf=true \

From ed94ab6e23284133f3360e7a0e0c778a318c5b9b Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sat, 18 Apr 2020 18:33:54 +0200
Subject: [PATCH 017/222] contrib/rpm: fix spec file using bare words

  error: bare words are no longer supported, please use "...":  no != "yes"
  error:                                                        ^
  error: /builds/NetworkManager/NetworkManager/contrib/fedora/rpm/NetworkManager.20200418-170120.dp5cp5/SPECS/NetworkManager.spec:596: bad %if condition:  no != "yes"
---
 contrib/fedora/rpm/NetworkManager.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 5520f821e1..5717d9d208 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -120,9 +120,9 @@
 # bpf(BPF_MAP_CREATE, ...) randomly fails with EPERM. That might
 # be related to `ulimit -l`. Anyway, this is not usable at the
 # moment.
-%global ebpf_enabled no
+%global ebpf_enabled "no"
 %else
-%global ebpf_enabled no
+%global ebpf_enabled "no"
 %endif
 
 ###############################################################################

From e073491b9ce0bfd77d3c7e818fdd442a696726a9 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Sun, 19 Apr 2020 00:59:33 +0200
Subject: [PATCH 018/222] build: remove subshells and fix invalid test syntax

Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/472
---
 Makefile.am         |  2 +-
 configure.ac        | 52 ++++++++++++++++++++++-----------------------
 m4/introspection.m4 |  4 ++--
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5cff6eb12f..2f15ddbd81 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4833,7 +4833,7 @@ check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-clie
 	"$(PYTHON)" \
 	$(srcdir)/clients/tests/test-client.py -v &> "$(builddir)/clients/tests/test-client.log" && r=ok; \
 	cat "$(builddir)/clients/tests/test-client.log"; \
-	test "$$r" == ok
+	test "$$r" = ok
 
 check_local += check-local-clients-tests-test-client
 
diff --git a/configure.ac b/configure.ac
index 5e8dca24a5..3594f8312e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,7 +289,7 @@ PKG_CHECK_MODULES(QT, [QtCore >= 4 QtDBus QtNetwork], [have_qt=yes],[have_qt=no]
 AC_ARG_ENABLE(qt,
               AS_HELP_STRING([--enable-qt], [enable Qt examples]),
               [enable_qt=${enableval}], [enable_qt=${have_qt}])
-if (test "${enable_qt}" = "yes"); then
+if test "${enable_qt}" = "yes"; then
 	if test x"$have_qt" = x"no"; then
 		AC_MSG_ERROR(Qt development headers are required)
 	fi
@@ -303,11 +303,11 @@ AC_ARG_WITH(udev-dir,
             AS_HELP_STRING([--with-udev-dir=DIR],
                            [Absolute path of the udev base directory. Set to 'no' not to install the udev rules]),
             [], [with_udev_dir="yes"])
-if (test "$with_udev_dir" != 'no'); then
-	if (test "$with_udev_dir" != 'yes' && printf '%s' "$with_udev_dir" | grep -v -q '^/'); then
+if test "$with_udev_dir" != 'no'; then
+	if test "$with_udev_dir" != 'yes' && printf '%s' "$with_udev_dir" | grep -v -q '^/'; then
 		AC_MSG_ERROR([--with-udev-dir must be an absolute path or 'yes' or 'no'. Instead it is '$with_udev_dir'])
 	fi
-	if (test "$with_udev_dir" = 'yes'); then
+	if test "$with_udev_dir" = 'yes'; then
 		with_udev_dir="\$(prefix)/lib/udev"
 	fi
 	UDEV_DIR="$with_udev_dir"
@@ -610,7 +610,7 @@ fi
 AC_ARG_ENABLE(teamdctl,
               AS_HELP_STRING([--enable-teamdctl], [enable Teamd control support]),
               [enable_teamdctl=${enableval}], [enable_teamdctl=${have_team_prereq}])
-if (test "${enable_teamdctl}" = "yes"); then
+if test "${enable_teamdctl}" = "yes"; then
 	if test "$have_teamdctl" = "no"; then
 		AC_MSG_ERROR(Libteamdctl is required for team support)
 	fi
@@ -627,7 +627,7 @@ AC_ARG_ENABLE(json-validation,
               AS_HELP_STRING([--enable-json-validation], [Enable JSON validation in libnm]),
               [enable_json_validation=${enableval}],
               [enable_json_validation=${have_jansson}])
-if (test "${enable_json_validation}" == "no"); then
+if test "${enable_json_validation}" = "no"; then
 	AC_DEFINE(WITH_JSON_VALIDATION, 0, [Define if JSON validation in libnm is enabled])
 else
 	if test "$have_jansson" = "no"; then
@@ -644,7 +644,7 @@ AC_ARG_ENABLE(polkit,
               AS_HELP_STRING([--enable-polkit=yes|no|root-only],
                              [set default value for auth-polkit configuration option. This value can be overwritten by NM configuration. 'disabled' is an alias for 'no']),
               [enable_polkit=${enableval}], [enable_polkit=yes])
-if test "${enable_polkit}" == "root-only" ; then
+if test "${enable_polkit}" = "root-only" ; then
 	enable_polkit='root-only'
 elif test "${enable_polkit}" != "no" -a "${enable_polkit}" != "disabled" ; then
 	enable_polkit=true
@@ -723,7 +723,7 @@ AC_SUBST(DBUS_SYS_DIR)
 AC_ARG_ENABLE(ppp,
               AS_HELP_STRING([--enable-ppp], [enable PPP/PPPoE support]),
               [enable_ppp=${enableval}], [enable_ppp=yes])
-if (test "${enable_ppp}" = "yes"); then
+if test "${enable_ppp}" = "yes"; then
 	AC_CHECK_HEADERS(pppd/pppd.h,,
 	                 AC_MSG_ERROR("couldn't find pppd.h. pppd development headers are required."))
 
@@ -757,14 +757,14 @@ AC_ARG_WITH(modem-manager-1,
             AS_HELP_STRING([--with-modem-manager-1],
                            [Enable new ModemManager1 interface support]),
             [], [with_modem_manager_1=auto])
-if (test "${with_modem_manager_1}" != "no"); then
+if test "${with_modem_manager_1}" != "no"; then
 	PKG_CHECK_MODULES(MM_GLIB,
 	                  [mm-glib >= 0.7.991],
 	                  [have_libmm_glib=yes],
 	                  [have_libmm_glib=no])
 
-	if (test "${have_libmm_glib}" = "no"); then
-		if (test "${with_modem_manager_1}" = "yes"); then
+	if test "${have_libmm_glib}" = "no"; then
+		if test "${with_modem_manager_1}" = "yes"; then
 			AC_MSG_ERROR([Couldn't find libmm-glib])
 		else
 			with_modem_manager_1="no"
@@ -790,7 +790,7 @@ PKG_CHECK_MODULES(BLUEZ5, [bluez >= 5], [have_bluez5=yes],[have_bluez5=no])
 AC_ARG_ENABLE(bluez5-dun,
               AS_HELP_STRING([--enable-bluez5-dun], [enable Bluez5 DUN support]),
               [enable_bluez5_dun=${enableval}], [enable_bluez5_dun=${have_bluez5}])
-if (test "${enable_bluez5_dun}" = "yes"); then
+if test "${enable_bluez5_dun}" = "yes"; then
 	if test x"$have_bluez5" = x"no"; then
 		AC_MSG_ERROR(Bluez 5.x development headers are required)
 	fi
@@ -804,7 +804,7 @@ AM_CONDITIONAL(WITH_BLUEZ5_DUN, test "${enable_bluez5_dun}" = "yes")
 AC_ARG_WITH(ofono,
             AS_HELP_STRING([--with-ofono], [Enable oFono support (experimental)]),
             [], [with_ofono=no])
-if (test "${with_ofono}" = "yes"); then
+if test "${with_ofono}" = "yes"; then
 	AC_DEFINE(WITH_OFONO, 1, [Define if you have oFono support (experimental)])
 else
 	AC_DEFINE(WITH_OFONO, 0, [Define if you have oFono support (experimental)])
@@ -817,8 +817,8 @@ AC_ARG_WITH([dhcpcanon],
 if test "$with_dhcpcanon" != "no"; then
     with_dhcpcanon_="$with_dhcpcanon"
     AC_PATH_PROGS(with_dhcpcanon, dhcpcanon, no, /sbin:/usr/sbin:/usr/local/sbin:/usr/bin:/usr/local/bin)
-    if test "$with_dhcpcanon" == "no"; then
-        if test "$with_dhcpcanon_" == yes; then
+    if test "$with_dhcpcanon" = "no"; then
+        if test "$with_dhcpcanon_" = yes; then
             AC_MSG_WARN([dhcpcanon not found, assume path /sbin/dhcpcanon])
             with_dhcpcanon=/sbin/dhcpcanon
         fi
@@ -847,8 +847,8 @@ AC_ARG_WITH([dhclient],
 if test "$with_dhclient" != "no"; then
 	with_dhclient_="$with_dhclient"
 	AC_PATH_PROGS(with_dhclient, dhclient, no, /sbin:/usr/sbin:/usr/local/sbin)
-	if test "$with_dhclient" == "no"; then
-		if test "$with_dhclient_" == yes; then
+	if test "$with_dhclient" = "no"; then
+		if test "$with_dhclient_" = yes; then
 			AC_MSG_WARN([dhclient not found, assume path /usr/sbin/dhclient])
 			with_dhclient=/usr/sbin/dhclient
 		fi
@@ -866,8 +866,8 @@ AC_ARG_WITH([dhcpcd],
 if test "$with_dhcpcd" != "no"; then
 	with_dhcpcd_="$with_dhcpcd"
 	AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin)
-	if test "$with_dhcpcd" == "no"; then
-		if test "$with_dhcpcd_" == yes; then
+	if test "$with_dhcpcd" = "no"; then
+		if test "$with_dhcpcd_" = yes; then
 			AC_MSG_WARN([dhcpcd not found, assume path /usr/sbin/dhcpcd])
 			with_dhcpcd=/usr/sbin/dhcpcd
 		fi
@@ -1047,7 +1047,7 @@ if test "$with_nm_cloud_setup" != no; then
 	fi
 	with_nm_cloud_setup=yes
 fi
-AM_CONDITIONAL(BUILD_NM_CLOUD_SETUP, test "$with_nm_cloud_setup" == yes)
+AM_CONDITIONAL(BUILD_NM_CLOUD_SETUP, test "$with_nm_cloud_setup" = yes)
 
 AC_ARG_WITH(nmtui,
             AS_HELP_STRING([--with-nmtui=yes|no], [Build nmtui]))
@@ -1142,7 +1142,7 @@ fi
 AC_ARG_ENABLE(undefined-sanitizer,
               AS_HELP_STRING([--enable-undefined-sanitizer],
                              [Compile with undefined behavior sanitizer [default=no]]))
-if (test "${enable_undefined_sanitizer}" = "yes"); then
+if test "${enable_undefined_sanitizer}" = "yes"; then
 	CC_CHECK_FLAGS_APPEND([ubsan_cflags], [CFLAGS], [-fsanitize=undefined])
 	AS_IF([test -z "$ubsan_cflags"],
 	      [AC_MSG_ERROR([*** -fsanitize=undefined is not supported])])
@@ -1200,17 +1200,17 @@ AS_IF([test -z "$with_valgrind"], with_valgrind="no")
 # Normalize values
 AS_IF([test "$enable_tests" != "yes" -a "$enable_tests" != "root"], enable_tests="no")
 # Search for tools
-AS_IF([test "$with_valgrind" == "yes"],
+AS_IF([test "$with_valgrind" = "yes"],
       [AC_PATH_PROGS(with_valgrind, valgrind, no)])
 # Add conditionals and substitutions
 AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" != "no")
-AM_CONDITIONAL(REQUIRE_ROOT_TESTS, test "$enable_tests" == "root")
+AM_CONDITIONAL(REQUIRE_ROOT_TESTS, test "$enable_tests" = "root")
 AC_ARG_WITH(valgrind-suppressions,
             AS_HELP_STRING([--with-valgrind-suppressions=path], [Use specific valgrind suppression file]))
-if test "$with_valgrind" == no; then
+if test "$with_valgrind" = no; then
 	with_valgrind_suppressions=
 else
-	if test  "$with_valgrind_suppressions" == ""; then
+	if test  "$with_valgrind_suppressions" = ""; then
 		with_valgrind_suppressions='$(top_srcdir)/valgrind.suppressions'
 	fi
 fi
@@ -1226,7 +1226,7 @@ GTK_DOC_CHECK(1.0)
 build_docs=no
 if test -n "$INTROSPECTION_MAKEFILE"; then
 	# If g-i is installed we know we have python, but we might not have pygobject
-	if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then
+	if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then
 		AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
 	fi
 
diff --git a/m4/introspection.m4 b/m4/introspection.m4
index 44d1925189..b3c2844e99 100644
--- a/m4/introspection.m4
+++ b/m4/introspection.m4
@@ -30,7 +30,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
     INTROSPECTION_GIRDIR=
     INTROSPECTION_TYPELIBDIR=
 
-    if test "x$enable_introspection" == "xno"; then
+    if test "x$enable_introspection" = "xno"; then
       found_introspection="no"
     else
        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], [
@@ -52,7 +52,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
            AC_MSG_RESULT([$found_introspection])
        ], [found_introspection="no (not installed)"])
 
-       if test "x$enable_introspection" == "xyes"; then
+       if test "x$enable_introspection" = "xyes"; then
           if test "x$found_introspection" != "xyes"; then
               AC_MSG_ERROR([introspection enabled but can't be used])
           fi

From 40b2cf7a0c652814638207b2951c6f7c80aa8033 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Mon, 20 Apr 2020 09:39:41 +0200
Subject: [PATCH 019/222] libnm-core: add 'no-reload' and 'trust-ad'
 resolv.conf options

https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/res_init.c;h=95dce098aa7ec80f2e36f5c25022641d65e1d5e5;hb=9ea3686266dca3f004ba874745a4087a89682617#l681

https://bugzilla.redhat.com/show_bug.cgi?id=1825285
---
 libnm-core/nm-setting-ip-config.c | 2 ++
 libnm-core/nm-setting-ip-config.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index 55cec35fbd..be84861037 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -47,6 +47,8 @@ const NMUtilsDNSOptionDesc _nm_utils_dns_option_descs[] = {
 	{ NM_SETTING_DNS_OPTION_SINGLE_REQUEST_REOPEN, FALSE,   FALSE },
 	{ NM_SETTING_DNS_OPTION_NO_TLD_QUERY,          FALSE,   FALSE },
 	{ NM_SETTING_DNS_OPTION_USE_VC,                FALSE,   FALSE },
+	{ NM_SETTING_DNS_OPTION_NO_RELOAD,             FALSE,   FALSE },
+	{ NM_SETTING_DNS_OPTION_TRUST_AD,              FALSE,   FALSE },
 	{ NULL,                                        FALSE,   FALSE }
 };
 
diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h
index ef3671c40b..ae77480c08 100644
--- a/libnm-core/nm-setting-ip-config.h
+++ b/libnm-core/nm-setting-ip-config.h
@@ -368,6 +368,8 @@ char *nm_ip_routing_rule_to_string (const NMIPRoutingRule *self,
 #define NM_SETTING_DNS_OPTION_SINGLE_REQUEST_REOPEN     "single-request-reopen"
 #define NM_SETTING_DNS_OPTION_NO_TLD_QUERY              "no-tld-query"
 #define NM_SETTING_DNS_OPTION_USE_VC                    "use-vc"
+#define NM_SETTING_DNS_OPTION_NO_RELOAD                 "no-reload"
+#define NM_SETTING_DNS_OPTION_TRUST_AD                  "trust-ad"
 
 /**
  * NMSettingIPConfig:

From 2ad8e6acae7b2c76d40e00a60a85aef0ea625de5 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 20 Apr 2020 11:49:31 +0200
Subject: [PATCH 020/222] tests: abort test runner if exec fails

---
 tools/run-nm-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh
index 21f0d7c154..16d9d8a7ab 100755
--- a/tools/run-nm-test.sh
+++ b/tools/run-nm-test.sh
@@ -232,6 +232,7 @@ if ! _is_true "$NMTST_USE_VALGRIND" 0; then
     export NM_TEST_UNDER_VALGRIND=0
     exec "${NMTST_DBUS_RUN_SESSION[@]}" \
     "$TEST" "$@"
+    die "exec \"$TEST\" failed"
 fi
 
 if [[ -z "${NMTST_VALGRIND}" ]]; then

From e261e941fdc062dfa825989763e19a471bec1d45 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 20 Apr 2020 15:26:30 +0200
Subject: [PATCH 021/222] libnm: document supported "ipv[46].dns-option" values

---
 clients/common/settings-docs.h.in | 4 ++--
 libnm-core/nm-setting-ip-config.c | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 5cbef4285f..77a3852108 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -220,7 +220,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\".")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
@@ -242,7 +242,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\".")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index be84861037..a2569fdcb7 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -5604,6 +5604,11 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * In this case NetworkManager will use default options. This is
 	 * distinct from an empty list of properties.
 	 *
+	 * The currently supported options are "attempts", "debug", "edns0",
+	 * "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names",
+	 * "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request",
+	 * "single-request-reopen", "timeout", "trust-ad", "use-vc".
+	 *
 	 * Since: 1.2
 	 **/
 	obj_properties[PROP_DNS_OPTIONS] =

From 5e47fb630ba92fa7a5b98bebc94f830935109e0c Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 20 Apr 2020 14:51:42 +0200
Subject: [PATCH 022/222] dns: add trust-ad DNS option only if all contributing
 settings agree

https://bugzilla.redhat.com/show_bug.cgi?id=1825285
---
 clients/common/settings-docs.h.in |  4 +--
 libnm-core/nm-setting-ip-config.c |  4 +++
 src/dns/nm-dns-manager.c          | 41 +++++++++++++++++++++++++------
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 77a3852108..9425ef370d 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -220,7 +220,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\".")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". The \"trust-ad\" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have \"trust-ad\" enabled.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
@@ -242,7 +242,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\".")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". The \"trust-ad\" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have \"trust-ad\" enabled.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index a2569fdcb7..30e7a97b99 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -5609,6 +5609,10 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request",
 	 * "single-request-reopen", "timeout", "trust-ad", "use-vc".
 	 *
+	 * The "trust-ad" setting is only honored if the profile contributes
+	 * name servers to resolv.conf, and if all contributing profiles have
+	 * "trust-ad" enabled.
+	 *
 	 * Since: 1.2
 	 **/
 	obj_properties[PROP_DNS_OPTIONS] =
diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
index b40dd6b656..7686bb4baa 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/dns/nm-dns-manager.c
@@ -62,6 +62,7 @@ typedef struct {
 	GPtrArray *options;
 	const char *nis_domain;
 	GPtrArray *nis_servers;
+	NMTernary has_trust_ad;
 } NMResolvConfData;
 
 /*****************************************************************************/
@@ -410,8 +411,11 @@ merge_one_ip_config (NMResolvConfData *rc,
                      const NMIPConfig *ip_config)
 {
 	int addr_family;
-	guint num, i;
 	char buf[NM_UTILS_INET_ADDRSTRLEN + 50];
+	gboolean has_trust_ad;
+	guint num_nameservers;
+	guint num;
+	guint i;
 
 	addr_family = nm_ip_config_get_addr_family (ip_config);
 
@@ -419,8 +423,8 @@ merge_one_ip_config (NMResolvConfData *rc,
 	nm_assert (ifindex > 0);
 	nm_assert (ifindex == nm_ip_config_get_ifindex (ip_config));
 
-	num = nm_ip_config_get_num_nameservers (ip_config);
-	for (i = 0; i < num; i++) {
+	num_nameservers = nm_ip_config_get_num_nameservers (ip_config);
+	for (i = 0; i < num_nameservers; i++) {
 		const NMIPAddr *addr;
 
 		addr = nm_ip_config_get_nameserver (ip_config, i);
@@ -446,11 +450,28 @@ merge_one_ip_config (NMResolvConfData *rc,
 
 	add_dns_domains (rc->searches, ip_config, FALSE, TRUE);
 
+	has_trust_ad = FALSE;
 	num = nm_ip_config_get_num_dns_options (ip_config);
 	for (i = 0; i < num; i++) {
+		const char *option = nm_ip_config_get_dns_option (ip_config, i);
+
+		if (nm_streq (option, NM_SETTING_DNS_OPTION_TRUST_AD)) {
+			has_trust_ad = TRUE;
+			continue;
+		}
 		add_dns_option_item (rc->options,
 		                     nm_ip_config_get_dns_option (ip_config, i));
 	}
+	if (num_nameservers == 0) {
+		/* If the @ip_config contributes no DNS servers, ignore whether trust-ad is set or unset
+		 * for this @ip_config. */
+	} else if (has_trust_ad) {
+		/* We only set has_trust_ad to TRUE, if all IP configs agree (or don't contribute).
+		 * Once set to FALSE, it doesn't get reset. */
+		if (rc->has_trust_ad == NM_TERNARY_DEFAULT)
+			rc->has_trust_ad = NM_TERNARY_TRUE;
+	} else
+		rc->has_trust_ad = NM_TERNARY_FALSE;
 
 	if (addr_family == AF_INET) {
 		const NMIP4Config *ip4_config = (const NMIP4Config *) ip_config;
@@ -1106,11 +1127,12 @@ _collect_resolv_conf_data (NMDnsManager *self,
 {
 	NMDnsManagerPrivate *priv;
 	NMResolvConfData rc = {
-		.nameservers = g_ptr_array_new (),
-		.searches = g_ptr_array_new (),
-		.options = g_ptr_array_new (),
-		.nis_domain = NULL,
-		.nis_servers = g_ptr_array_new (),
+		.nameservers  = g_ptr_array_new (),
+		.searches     = g_ptr_array_new (),
+		.options      = g_ptr_array_new (),
+		.nis_domain   = NULL,
+		.nis_servers  = g_ptr_array_new (),
+		.has_trust_ad = NM_TERNARY_DEFAULT,
 	};
 
 	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
@@ -1174,6 +1196,9 @@ _collect_resolv_conf_data (NMDnsManager *self,
 		}
 	}
 
+	if (rc.has_trust_ad == NM_TERNARY_TRUE)
+		g_ptr_array_add (rc.options, NM_SETTING_DNS_OPTION_TRUST_AD);
+
 	*out_searches = _ptrarray_to_strv (rc.searches);
 	*out_options = _ptrarray_to_strv (rc.options);
 	*out_nameservers = _ptrarray_to_strv (rc.nameservers);

From 61a97f8b0f51b8163184cbed3eac4abaf313153d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 20 Apr 2020 15:40:43 +0200
Subject: [PATCH 023/222] libnm: cleanup _nm_utils_dns_option_validate()

Avoid unnecessary string copies. Most option don't have a delimiter
and numerical argument, and there is no need to clone the string.
---
 libnm-core/nm-utils.c | 78 +++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 40 deletions(-)

diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 82033a085a..4e83b16700 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -5142,7 +5142,9 @@ _nm_utils_strstrdictkey_create (const char *v1, const char *v2)
 }
 
 static gboolean
-validate_dns_option (const char *name, gboolean numeric, gboolean ipv6,
+validate_dns_option (const char *name,
+                     gboolean numeric,
+                     gboolean ipv6,
                      const NMUtilsDNSOptionDesc *option_descs)
 {
 	const NMUtilsDNSOptionDesc *desc;
@@ -5178,58 +5180,54 @@ validate_dns_option (const char *name, gboolean numeric, gboolean ipv6,
  * %FALSE otherwise
  */
 gboolean
-_nm_utils_dns_option_validate (const char *option, char **out_name,
-                               long *out_value, gboolean ipv6,
+_nm_utils_dns_option_validate (const char *option,
+                               char **out_name,
+                               long *out_value,
+                               gboolean ipv6,
                                const NMUtilsDNSOptionDesc *option_descs)
 {
-	char **tokens, *ptr;
-	gboolean ret = FALSE;
+	gs_free char *option0_free = NULL;
+	const char *option0;
+	const char *option1;
+	const char *delim;
+	long option1_num;
 
 	g_return_val_if_fail (option != NULL, FALSE);
 
-	if (out_name)
-		*out_name = NULL;
-	if (out_value)
-		*out_value = -1;
+	NM_SET_OUT (out_name, NULL);
+	NM_SET_OUT (out_value, -1);
 
 	if (!option[0])
 		return FALSE;
 
-	tokens = g_strsplit (option, ":", 2);
-
-	if (g_strv_length (tokens) == 1) {
-		ret = validate_dns_option (tokens[0], FALSE, ipv6, option_descs);
-		if (ret && out_name)
-			*out_name = g_strdup (tokens[0]);
-		goto out;
+	delim = strchr (option, ':');
+	if (!delim) {
+		if (!validate_dns_option (option, FALSE, ipv6, option_descs))
+			return FALSE;
+		NM_SET_OUT (out_name, g_strdup (option));
+		return TRUE;
 	}
 
-	if (!tokens[1][0]) {
-		ret = FALSE;
-		goto out;
-	}
+	option1 = &delim[1];
 
-	for (ptr = tokens[1]; *ptr; ptr++) {
-		if (!g_ascii_isdigit (*ptr)) {
-			ret = FALSE;
-			goto out;
-		}
-	}
+	if (!option1[0])
+		return FALSE;
+	if (!NM_STRCHAR_ALL (option1, ch, g_ascii_isdigit (ch)))
+		return FALSE;
 
-	ret = FALSE;
-	if (validate_dns_option (tokens[0], TRUE, ipv6, option_descs)) {
-		int value = _nm_utils_ascii_str_to_int64 (tokens[1], 10, 0, G_MAXINT32, -1);
-		if (value >= 0) {
-			if (out_name)
-				*out_name = g_strdup (tokens[0]);
-			if (out_value)
-				*out_value = value;
-			ret = TRUE;
-		}
-	}
-out:
-	g_strfreev (tokens);
-	return ret;
+	option0 = nm_strndup_a (300, option, delim - option, &option0_free);
+
+	if (!validate_dns_option (option0, TRUE, ipv6, option_descs))
+		return FALSE;
+
+	option1_num = _nm_utils_ascii_str_to_int64 (option1, 10, 0, G_MAXINT32, -1);
+	if (option1_num == -1)
+		return FALSE;
+
+	NM_SET_OUT (out_name,    g_steal_pointer (&option0_free)
+	                      ?: g_strdup (option0));
+	NM_SET_OUT (out_value, option1_num);
+	return TRUE;
 }
 
 /**

From a5338affb5e64c48fcdb90f1b7bbf9a93cae4342 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Mon, 20 Apr 2020 17:01:56 +0200
Subject: [PATCH 024/222] wifi: change return type of p2p-connect D-Bus method
 call
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix the following error when invoking the Connect() p2p method:

 call-p2p-connect: failed with Method “fi.w1.wpa_supplicant1.Interface.P2PDevice.Connect” returned type “(s)”, but expected “()”

Fixes: b83f07916a54 ('supplicant: large rework of wpa_supplicant handling')
---
 src/supplicant/nm-supplicant-interface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index cc3d109e35..a02f540256 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -2504,7 +2504,7 @@ nm_supplicant_interface_p2p_connect (NMSupplicantInterface *self,
 	                              NM_WPAS_DBUS_IFACE_INTERFACE_P2P_DEVICE,
 	                              "Connect",
 	                              g_variant_new ("(a{sv})", &builder),
-	                              G_VARIANT_TYPE ("()"),
+	                              G_VARIANT_TYPE ("(s)"),
 	                              "p2p-connect");
 }
 

From eefe5dacaa90e8a4e63f34168fafb1a29c8a2c64 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 16 Apr 2020 22:37:27 +0200
Subject: [PATCH 025/222] dhcp-helper: retry in case of failure connecting to
 D-Bus unix socket

Connecting to the unix socket can fail with EAGAIN if there are too
many pending connections and the server can't accept them in time
before reaching backlog capacity. Ideally the server should increase
the backlog length, but GLib doesn't provide a way to change it for a
GDBus server. Retry for up to 5 seconds in case of failure.

https://bugzilla.redhat.com/show_bug.cgi?id=1821594
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/471
---
 src/dhcp/nm-dhcp-helper.c | 45 +++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/dhcp/nm-dhcp-helper.c b/src/dhcp/nm-dhcp-helper.c
index 17f9db7f3b..365e32e384 100644
--- a/src/dhcp/nm-dhcp-helper.c
+++ b/src/dhcp/nm-dhcp-helper.c
@@ -115,19 +115,42 @@ main (int argc, char *argv[])
 	gs_unref_variant GVariant *parameters = NULL;
 	gs_unref_variant GVariant *result = NULL;
 	gboolean success = FALSE;
-	guint try_count = 0;
+	guint try_count;
+	gint64 time_start;
 	gint64 time_end;
 
-	/* FIXME: g_dbus_connection_new_for_address_sync() tries to connect to the socket in
-	 * non-blocking mode, which can easily fail with EAGAIN, causing the creation of the
-	 * socket to fail with "Could not connect: Resource temporarily unavailable".
-	 *
-	 * We should instead create the GIOStream ourself and block on connecting to
-	 * the socket. */
+	/* Connecting to the unix socket can fail with EAGAIN if there are too
+	 * many pending connections and the server can't accept them in time
+	 * before reaching backlog capacity. Ideally the server should increase
+	 * the backlog length, but GLib doesn't provide a way to change it for a
+	 * GDBus server. Retry for up to 5 seconds in case of failure. */
+	time_start = g_get_monotonic_time ();
+	time_end = time_start + (5000 * 1000L);
+	try_count = 0;
+
+do_connect:
+	try_count++;
 	connection = g_dbus_connection_new_for_address_sync ("unix:path=" NMRUNDIR "/private-dhcp",
 	                                                     G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT,
 	                                                     NULL, NULL, &error);
 	if (!connection) {
+		if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) {
+			gint64 time_remaining = time_end - g_get_monotonic_time ();
+			gint64 interval;
+
+			if (time_remaining > 0) {
+				_LOGi ("failure to connect: %s (retry %u, waited %lld ms)",
+				       error->message, try_count,
+				       (long long) (time_end - time_remaining - time_start) / 1000);
+				interval = NM_CLAMP ((gint64) (100L * (1L << NM_MIN (try_count, 31))),
+				                     5000,
+				                     100000);
+				g_usleep (NM_MIN (interval, time_remaining));
+				g_clear_error (&error);
+				goto do_connect;
+			}
+		}
+
 		g_dbus_error_strip_remote_error (error);
 		_LOGE ("could not connect to NetworkManager D-Bus socket: %s",
 		       error->message);
@@ -135,8 +158,8 @@ main (int argc, char *argv[])
 	}
 
 	parameters = build_signal_parameters ();
-
 	time_end = g_get_monotonic_time () + (200 * 1000L); /* retry for at most 200 milliseconds */
+	try_count = 0;
 
 do_notify:
 	try_count++;
@@ -158,6 +181,7 @@ do_notify:
 		s_err = g_dbus_error_get_remote_error (error);
 		if (NM_IN_STRSET (s_err, "org.freedesktop.DBus.Error.UnknownMethod")) {
 			gint64 remaining_time = time_end - g_get_monotonic_time ();
+			gint64 interval;
 
 			/* I am not sure that a race can actually happen, as we register the object
 			 * on the server side during GDBusServer:new-connection signal.
@@ -166,7 +190,10 @@ do_notify:
 			 * do some retry. */
 			if (remaining_time > 0) {
 				_LOGi ("failure to call notify: %s (retry %u)", error->message, try_count);
-				g_usleep (NM_MIN (NM_CLAMP ((gint64) (100L * (1L << try_count)), 5000, 25000), remaining_time));
+				interval = NM_CLAMP ((gint64) (100L * (1L << NM_MIN (try_count, 31))),
+				                     5000,
+				                     25000);
+				g_usleep (NM_MIN (interval, remaining_time));
 				g_clear_error (&error);
 				goto do_notify;
 			}

From 938aca3fabe62b65a4b5474866768aeb8d356190 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 21 Apr 2020 08:35:52 +0200
Subject: [PATCH 026/222] NEWS: update

---
 NEWS | 50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/NEWS b/NEWS
index 1287edc271..0006ed1b30 100644
--- a/NEWS
+++ b/NEWS
@@ -1,34 +1,36 @@
+=============================================
+NetworkManager-1.26
+Overview of changes since NetworkManager-1.24
+=============================================
+
+This is a snapshot of NetworkManager 1.26 development series.
+The API is subject to change and not guaranteed to be compatible
+with the later release.
+USE AT YOUR OWN RISK.  NOT RECOMMENDED FOR PRODUCTION USE!
+
+* IPv6 SLAAC: improved the reaction of IPv6 SLAAC to renumbering events:
+  - honor PIO Valid Lifetimes < 2 hours.
+  - cap the Preferred Lifetime of PIOs to the "Router Lifetime" value
+    and the Valid Lifetime of PIOs to 48 * Router Lifetime.
+
 =============================================
 NetworkManager-1.24
 Overview of changes since NetworkManager-1.22
 =============================================
 
-This is a snapshot of NetworkManager 1.24 development series.
-The API is subject to change and not guaranteed to be compatible
-with the later release.
-USE AT YOUR OWN RISK.  NOT RECOMMENDED FOR PRODUCTION USE!
-
 * Add support for virtual routing and forwarding (VRF) interfaces.
-* Add support for Opportunistic Wireless Encryption mode (OWE) for WiFi networks.
+* Add support for Opportunistic Wireless Encryption mode (OWE) for Wi-Fi networks.
 * Add support for 31-bit prefixes on IPv4 point-to-point links according to
   RFC 3021.
-* Drop dependencies for libpolkit-agent-1 and libpolkit-gobject-1
+* Drop dependencies for libpolkit-agent-1 and libpolkit-gobject-1.
 * nmcli:
-  - support setting removal via new command 'nmcli connection modify
-    $con-name remove $setting'.
-  - support backslash escape sequences for vpn.data, vpn.secrets,
-    bond.options, and ethernet.s390-options.
-* bridge: new options available:
-   - bridge.multicast-querier
-   - bridge.multicast-query-use-ifaddr
-   - bridge.multicast-router
-   - bridge.vlan-stats-enabled
-   - bridge.vlan-protocol
-   - bridge.group-address
-* IPv6 SLAAC: improved the reaction of IPv6 SLAAC to renumbering events:
-  - honor PIO Valid Lifetimes < 2 hours.
-  - cap the Preferred Lifetime of PIOs to the "Router Lifetime" value
-    and the Valid Lifetime of PIOs to 48 * Router Lifetime.
+  - support setting removal via new command
+    `nmcli connection modify $CON_NAME remove $setting`.
+  - support backslash escape sequences for "vpn.data", "vpn.secrets",
+    "bond.options", and "ethernet.s390-options".
+* bridge: support new options "bridge.multicast-querier", "bridge.multicast-query-use-ifaddr",
+  "bridge.multicast-router", "bridge.vlan-stats-enabled", "bridge.vlan-protocol",
+  "bridge.group-address".
 * IPv6 SLAAC: add support for "ipv6.ra-timeout" setting
 * IPv6 DHCP: add support for "ipv6.dhcp-timeout" setting
 * WWAN: NetworkManager now detects if a PIN-protected SIM card has been
@@ -39,9 +41,9 @@ USE AT YOUR OWN RISK.  NOT RECOMMENDED FOR PRODUCTION USE!
   - remove length limitation for OVS Bridge, Patches and Interfaces
     (only Patch types) names.
 * VPN: accept empty values for VPN data items and secrets.
-* All nm-devices now expose the 'hw-address' property via D-Bus.
+* All nm-devices now expose the 'HwAddress' property via D-Bus.
 * Slave devices now do not get created/activated if master is missing.
-* Fixed multiple issues in the internal DHCP client
+* Fixed multiple issues in the internal "nettools" DHCP client.
 * Export NM_CAPABILITY_OVS capability on D-Bus and in libnm to
   indicate that the OVS plugin is loaded.
 * Various bug fixes and improvements.

From cb9a6f3b9207169a9ce742562874a6d75fb93d60 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Tue, 21 Apr 2020 10:47:18 +0200
Subject: [PATCH 027/222] dns: fix handling of trust-ad option

Fixes: 5e47fb630ba9 ('dns: add trust-ad DNS option only if all contributing settings agree')
---
 src/dns/nm-dns-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
index 7686bb4baa..666bad60ca 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/dns/nm-dns-manager.c
@@ -1197,7 +1197,7 @@ _collect_resolv_conf_data (NMDnsManager *self,
 	}
 
 	if (rc.has_trust_ad == NM_TERNARY_TRUE)
-		g_ptr_array_add (rc.options, NM_SETTING_DNS_OPTION_TRUST_AD);
+		g_ptr_array_add (rc.options, g_strdup (NM_SETTING_DNS_OPTION_TRUST_AD));
 
 	*out_searches = _ptrarray_to_strv (rc.searches);
 	*out_options = _ptrarray_to_strv (rc.options);

From f4cf907a4296a7ee5f97069c7dbd8723ede7165a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sat, 11 Apr 2020 08:17:56 +0200
Subject: [PATCH 028/222] auth-manager: watch PolicyKit name owner to emit
 changed signal when name owner appears

We shall emit a changed signal when PolicyKit changes. That implies also
emitting the signal when PolicyKit starts. Watch the name owner for
that.

Note that I don't manage to actually receive the "Changed" signal from
PolicyKit. That seems to be due to wrong D-Bus configuration which
prevents the "Changed" signal from PolicyKit to reach NetworkManager.
That is independent from this patch.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/469
---
 src/nm-auth-manager.c | 169 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 143 insertions(+), 26 deletions(-)

diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c
index 88e6cb9433..5b3702ecb6 100644
--- a/src/nm-auth-manager.c
+++ b/src/nm-auth-manager.c
@@ -37,11 +37,14 @@ static guint signals[LAST_SIGNAL] = {0};
 typedef struct {
 	CList calls_lst_head;
 	GDBusConnection *dbus_connection;
-	GCancellable *shutdown_cancellable;
+	GCancellable *main_cancellable;
+	char *name_owner;
 	guint64 call_numid_counter;
-	guint changed_signal_id;
+	guint changed_id;
+	guint name_owner_changed_id;
 	bool disposing:1;
 	bool shutting_down:1;
+	bool got_name_owner:1;
 	NMAuthPolkitMode auth_polkit_mode:3;
 } NMAuthManagerPrivate;
 
@@ -105,6 +108,12 @@ nm_auth_manager_get_polkit_enabled (NMAuthManager *self)
 
 /*****************************************************************************/
 
+static void
+_emit_changed_signal (NMAuthManager *self)
+{
+	g_signal_emit (self, signals[CHANGED_SIGNAL], 0);
+}
+
 typedef enum {
 	POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE                   = 0,
 	POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION = (1<<0),
@@ -204,17 +213,18 @@ _call_check_authorize_cb (GObject *proxy,
 	priv = NM_AUTH_MANAGER_GET_PRIVATE (self);
 
 	value = g_dbus_connection_call_finish (G_DBUS_CONNECTION (proxy), res, &error);
-	if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+
+	if (nm_utils_error_is_cancelled (error)) {
 		/* call_id was cancelled externally, but _call_id_free() kept call_id
 		 * alive (and it has still the reference on @self. */
 
-		if (!priv->shutdown_cancellable) {
+		if (!priv->main_cancellable) {
 			/* we do a forced shutdown. There is no more time for cancelling... */
 			_call_id_free (call_id);
 
 			/* this shouldn't really happen, because:
-			 * _call_check_authorize() only scheduled the D-Bus request at a time when
-			 * shutdown_cancellable was still set. It means, somebody called force-shutdown
+			 * nm_auth_manager_check_authorization() only scheduled the D-Bus request at a time when
+			 * main_cancellable was still set. It means, somebody called force-shutdown
 			 * after call-id was schedule.
 			 * force-shutdown should only be called after:
 			 *   - cancel all pending requests
@@ -233,7 +243,7 @@ _call_check_authorize_cb (GObject *proxy,
 		                        G_VARIANT_TYPE ("()"),
 		                        G_DBUS_CALL_FLAGS_NONE,
 		                        CANCELLATION_TIMEOUT_MS,
-		                        priv->shutdown_cancellable,
+		                        priv->main_cancellable,
 		                        cancel_check_authorization_cb,
 		                        call_id);
 		return;
@@ -357,7 +367,7 @@ nm_auth_manager_check_authorization (NMAuthManager *self,
 
 		call_id->dbus_cancellable = g_cancellable_new ();
 
-		nm_assert (priv->shutdown_cancellable);
+		nm_assert (priv->main_cancellable);
 
 		g_dbus_connection_call (priv->dbus_connection,
 		                        POLKIT_SERVICE,
@@ -411,9 +421,95 @@ changed_signal_cb (GDBusConnection *connection,
                    gpointer user_data)
 {
 	NMAuthManager *self = user_data;
+	NMAuthManagerPrivate *priv = NM_AUTH_MANAGER_GET_PRIVATE (self);
+	gboolean valid_sender;
 
-	_LOGD ("dbus signal: \"Changed\"");
-	g_signal_emit (self, signals[CHANGED_SIGNAL], 0);
+	nm_assert (nm_streq0 (signal_name, "Changed"));
+
+	valid_sender = nm_streq0 (priv->name_owner, sender_name);
+
+	_LOGD ("dbus-signal: \"Changed\" notification%s", valid_sender ? "" : " (ignore)");
+
+	if (valid_sender)
+		_emit_changed_signal (self);
+}
+
+static void
+_name_owner_changed (NMAuthManager *self,
+                     const char *name_owner,
+                     gboolean is_initial)
+{
+	NMAuthManagerPrivate *priv = NM_AUTH_MANAGER_GET_PRIVATE (self);
+	gboolean is_changed;
+	gs_free char *old_name_owner = NULL;
+
+	if (is_initial)
+		priv->got_name_owner = TRUE;
+	else {
+		if (!priv->got_name_owner)
+			return;
+	}
+
+	name_owner = nm_str_not_empty (name_owner);
+
+	is_changed = !nm_streq0 (priv->name_owner, name_owner);
+	if (is_changed) {
+		old_name_owner = g_steal_pointer (&priv->name_owner);
+		priv->name_owner = g_strdup (name_owner);
+	} else {
+		if (!is_initial)
+			return;
+	}
+
+	if (!priv->name_owner) {
+		if (is_initial)
+			_LOGT ("name-owner: polkit not running");
+		else
+			_LOGT ("name-owner: polkit stopped (was %s)", old_name_owner);
+	} else {
+		if (is_initial)
+			_LOGT ("name-owner: polkit is running (now %s)", priv->name_owner);
+		else if (old_name_owner)
+			_LOGT ("name-owner: polkit restarted (now %s, was %s)", priv->name_owner, old_name_owner);
+		else
+			_LOGT ("name-owner: polkit started (now %s)", priv->name_owner);
+	}
+
+	if (priv->name_owner)
+		_emit_changed_signal (self);
+}
+
+static void
+_name_owner_changed_cb (GDBusConnection *connection,
+                        const char *sender_name,
+                        const char *object_path,
+                        const char *interface_name,
+                        const char *signal_name,
+                        GVariant *parameters,
+                        gpointer user_data)
+{
+	NMAuthManager *self = user_data;
+	const char *new_owner;
+
+	if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(sss)")))
+		return;
+
+	g_variant_get (parameters,
+	               "(&s&s&s)",
+	               NULL,
+	               NULL,
+	               &new_owner);
+
+	_name_owner_changed (self, new_owner, FALSE);
+}
+
+static void
+_name_owner_get_cb (const char *name_owner,
+                    GError *error,
+                    gpointer user_data)
+{
+	if (!nm_utils_error_is_cancelled (error))
+		_name_owner_changed (user_data, name_owner, TRUE);
 }
 
 /*****************************************************************************/
@@ -435,14 +531,17 @@ nm_auth_manager_force_shutdown (NMAuthManager *self)
 
 	priv = NM_AUTH_MANAGER_GET_PRIVATE (self);
 
+	/* FIXME(shutdown): ensure we properly call this API during shutdown as
+	 * described next. */
+
 	/* while we have pending requests (NMAuthManagerCallId), the instance
 	 * is kept alive.
 	 *
-	 * Even if the caller cancells all pending call-ids, we still need to keep
+	 * Even if the caller cancels all pending call-ids, we still need to keep
 	 * a reference to self, in order to handle pending CancelCheckAuthorization
 	 * requests.
 	 *
-	 * To do a corrdinated shutdown, do the following:
+	 * To do a coordinated shutdown, do the following:
 	 * - cancel all pending NMAuthManagerCallId requests.
 	 * - ensure everybody unrefs the NMAuthManager instance. If by that, the instance
 	 *   gets destroyed, the shutdown already completed successfully.
@@ -457,7 +556,7 @@ nm_auth_manager_force_shutdown (NMAuthManager *self)
 	 */
 
 	priv->shutting_down = TRUE;
-	nm_clear_g_cancellable (&priv->shutdown_cancellable);
+	nm_clear_g_cancellable (&priv->main_cancellable);
 }
 
 /*****************************************************************************/
@@ -523,18 +622,31 @@ constructed (GObject *object)
 		goto out;
 	}
 
-	priv->shutdown_cancellable = g_cancellable_new ();
+	priv->main_cancellable = g_cancellable_new ();
 
-	priv->changed_signal_id = g_dbus_connection_signal_subscribe (priv->dbus_connection,
-	                                                              POLKIT_SERVICE,
-	                                                              POLKIT_INTERFACE,
-	                                                              "Changed",
-	                                                              POLKIT_OBJECT_PATH,
-	                                                              NULL,
-	                                                              G_DBUS_SIGNAL_FLAGS_NONE,
-	                                                              changed_signal_cb,
-	                                                              self,
-	                                                              NULL);
+	priv->name_owner_changed_id = nm_dbus_connection_signal_subscribe_name_owner_changed (priv->dbus_connection,
+	                                                                                      POLKIT_SERVICE,
+	                                                                                      _name_owner_changed_cb,
+	                                                                                      self,
+	                                                                                      NULL);
+
+	priv->changed_id = g_dbus_connection_signal_subscribe (priv->dbus_connection,
+	                                                       POLKIT_SERVICE,
+	                                                       POLKIT_INTERFACE,
+	                                                       "Changed",
+	                                                       POLKIT_OBJECT_PATH,
+	                                                       NULL,
+	                                                       G_DBUS_SIGNAL_FLAGS_NONE,
+	                                                       changed_signal_cb,
+	                                                       self,
+	                                                       NULL);
+
+	nm_dbus_connection_call_get_name_owner (priv->dbus_connection,
+	                                        POLKIT_SERVICE,
+	                                        -1,
+	                                        priv->main_cancellable,
+	                                        _name_owner_get_cb,
+	                                        self);
 
 	create_message = "polkit enabled";
 
@@ -578,14 +690,19 @@ dispose (GObject *object)
 
 	priv->disposing = TRUE;
 
-	nm_clear_g_cancellable (&priv->shutdown_cancellable);
+	nm_clear_g_cancellable (&priv->main_cancellable);
 
 	nm_clear_g_dbus_connection_signal (priv->dbus_connection,
-	                                   &priv->changed_signal_id);
+	                                   &priv->name_owner_changed_id);
+
+	nm_clear_g_dbus_connection_signal (priv->dbus_connection,
+	                                   &priv->changed_id);
 
 	G_OBJECT_CLASS (nm_auth_manager_parent_class)->dispose (object);
 
 	g_clear_object (&priv->dbus_connection);
+
+	nm_clear_g_free (&priv->name_owner);
 }
 
 static void

From fb023cc6e8d40f6746d6fa1a4d161946039df1cf Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Tue, 21 Apr 2020 11:21:41 +0200
Subject: [PATCH 029/222] supplicant: set error when interface creation fails
 and was cancelled

https://bugzilla.redhat.com/show_bug.cgi?id=1823164

Fixes: b83f07916a54 ('supplicant: large rework of wpa_supplicant handling')
---
 src/supplicant/nm-supplicant-manager.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/supplicant/nm-supplicant-manager.c b/src/supplicant/nm-supplicant-manager.c
index cf5cf11163..b1a2dea898 100644
--- a/src/supplicant/nm-supplicant-manager.c
+++ b/src/supplicant/nm-supplicant-manager.c
@@ -562,6 +562,9 @@ _create_iface_dbus_call_create_interface_cb (GObject *source,
 			       NM_HASH_OBFUSCATE_PTR (handle),
 			       iface_path_str,
 			       handle->name_owner->str);
+			nm_utils_error_set (&error,
+			                    NM_UTILS_ERROR_UNKNOWN,
+			                    "Request already cancelled");
 		} else {
 			_LOGT ("create-iface["NM_HASH_OBFUSCATE_PTR_FMT"]: name owner changed, still remove interface %s in %s",
 			       NM_HASH_OBFUSCATE_PTR (handle),

From 5c547fdab38c7410e8755412b2940e5aa9b853d8 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 22 Apr 2020 09:14:40 +0200
Subject: [PATCH 030/222] bluetooth: disconnect signal on dispose

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/417

Fixes: 4154d9618c90 ('bluetooth: refactor BlueZ handling and let NMBluezManager cache ObjectManager data')
---
 src/devices/bluetooth/nm-device-bt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c
index ab18897f4e..a02ce34fec 100644
--- a/src/devices/bluetooth/nm-device-bt.c
+++ b/src/devices/bluetooth/nm-device-bt.c
@@ -1282,6 +1282,7 @@ dispose (GObject *object)
 
 	if (priv->modem_manager) {
 		g_signal_handlers_disconnect_by_func (priv->modem_manager, G_CALLBACK (mm_name_owner_changed_cb), self);
+		g_signal_handlers_disconnect_by_func (priv->modem_manager, G_CALLBACK (mm_modem_added_cb), self);
 		nm_modem_manager_name_owner_unref (priv->modem_manager);
 		g_clear_object (&priv->modem_manager);
 	}

From 95ccfdb69adbd20b022c9aa34175b3b56728cda2 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 22 Apr 2020 09:37:28 +0200
Subject: [PATCH 031/222] shared: add NM_CMP_DIRECT_PTR() macro

---
 shared/nm-glib-aux/nm-shared-utils.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index 537b402b1c..38b100416d 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -280,6 +280,14 @@ gboolean nm_utils_ipaddr_is_normalized (int addr_family,
             return (_a < _b) ? -1 : 1; \
     } G_STMT_END
 
+/* In the general case, direct pointer comparison is undefined behavior in C.
+ * Avoid that by casting pointers to void* and then to uintptr_t. This comparison
+ * is not really meaningful, except that it provides some kind of stable sort order
+ * between pointers (that can otherwise not be compared). */
+#define NM_CMP_DIRECT_PTR(a, b) \
+	NM_CMP_DIRECT ((uintptr_t) ((void *) (a)), \
+	               (uintptr_t) ((void *) (b)))
+
 #define NM_CMP_DIRECT_MEMCMP(a, b, size) \
     NM_CMP_RETURN (memcmp ((a), (b), (size)))
 

From b2a5b179fd131161925a7f2bea1c6b0a973b1a8e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 22 Apr 2020 09:32:06 +0200
Subject: [PATCH 032/222] platform: avoid undefined behavior comparing
 unrelated pointers in nmp_object_id_cmp()

Pointers cannot in general be compared directly. Cast to an int first
to avoid the undefined behavior.
---
 src/platform/nmp-object.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c
index 541211cdc1..a6aa5e2239 100644
--- a/src/platform/nmp-object.c
+++ b/src/platform/nmp-object.c
@@ -1405,15 +1405,15 @@ nmp_object_id_cmp (const NMPObject *obj1, const NMPObject *obj2)
 		nm_assert (klass2);
 		NM_CMP_DIRECT (klass->obj_type, klass2->obj_type);
 		/* resort to pointer comparison */
-		if (klass < klass2)
-			return -1;
-		return 1;
+		NM_CMP_DIRECT_PTR (klass, klass2);
+		return 0;
 	}
 
 	if (!klass->cmd_plobj_id_cmp) {
 		/* the klass doesn't implement ID cmp(). That means, different objects
 		 * never compare equal, but the cmp() according to their pointer value. */
-		return (obj1 < obj2) ? -1 : 1;
+		NM_CMP_DIRECT_PTR (obj1, obj2);
+		return 0;
 	}
 
 	return klass->cmd_plobj_id_cmp (&obj1->object, &obj2->object);

From e8b86f8445cd621c21ccf87833f4c49c74c325d9 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 22 Apr 2020 10:35:16 +0200
Subject: [PATCH 033/222] core: add NMIPConfigFlags for NMIPConfig flags

This will be useful to set future options on the NMIPConfig.

Yes, the code duplication of NMIP[46]Config is horrible. Needs
to be unified in the future.
---
 src/nm-ip4-config.c | 23 +++++++++++++++++++++++
 src/nm-ip4-config.h | 19 +++++++++++++++++++
 src/nm-ip6-config.c | 23 +++++++++++++++++++++++
 src/nm-ip6-config.h |  5 +++++
 4 files changed, 70 insertions(+)

diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index ae637aeedc..8c16d0bfae 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -303,6 +303,7 @@ typedef struct {
 		NMIPConfigDedupMultiIdxType idx_ip4_routes_;
 		NMDedupMultiIdxType idx_ip4_routes;
 	};
+	NMIPConfigFlags config_flags;
 } NMIP4ConfigPrivate;
 
 struct _NMIP4Config {
@@ -2659,6 +2660,28 @@ nm_ip4_config_llmnr_set (NMIP4Config *self,
 
 /*****************************************************************************/
 
+NMIPConfigFlags
+nm_ip4_config_get_config_flags (const NMIP4Config *self)
+{
+	return NM_IP4_CONFIG_GET_PRIVATE (self)->config_flags;
+}
+
+void
+nm_ip4_config_set_config_flags (NMIP4Config *self, NMIPConfigFlags flags, NMIPConfigFlags mask)
+{
+	NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (self);
+
+	if (mask == 0) {
+		/* for convenience, accept 0 mask to set any flags. */
+		mask = flags;
+	}
+
+	nm_assert (!NM_FLAGS_ANY (flags, ~mask));
+	priv->config_flags = (flags & mask) | (priv->config_flags & ~mask);
+}
+
+/*****************************************************************************/
+
 void
 nm_ip4_config_set_dns_priority (NMIP4Config *self, int priority)
 {
diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h
index 01a42e5464..b2845da3bb 100644
--- a/src/nm-ip4-config.h
+++ b/src/nm-ip4-config.h
@@ -15,6 +15,10 @@
 
 /*****************************************************************************/
 
+typedef enum _NMIPConfigFlags {
+	NM_IP_CONFIG_FLAG_NONE = 0,
+} NMIPConfigFlags;
+
 typedef struct {
 	NMDedupMultiIdxType parent;
 	NMPObjectType obj_type;
@@ -196,6 +200,9 @@ NMSettingConnectionLlmnr nm_ip4_config_llmnr_get (const NMIP4Config *self);
 void                     nm_ip4_config_llmnr_set (NMIP4Config *self,
                                                   NMSettingConnectionLlmnr llmnr);
 
+void nm_ip4_config_set_config_flags (NMIP4Config *self, NMIPConfigFlags flags, NMIPConfigFlags mask);
+NMIPConfigFlags nm_ip4_config_get_config_flags (const NMIP4Config *self);
+
 const NMDedupMultiHeadEntry *nm_ip4_config_lookup_addresses (const NMIP4Config *self);
 void nm_ip4_config_reset_addresses (NMIP4Config *self);
 void nm_ip4_config_add_address (NMIP4Config *self, const NMPlatformIP4Address *address);
@@ -513,6 +520,18 @@ nm_ip_config_best_default_route_get (const NMIPConfig *self)
 	_NM_IP_CONFIG_DISPATCH (self, nm_ip4_config_best_default_route_get, nm_ip6_config_best_default_route_get);
 }
 
+static inline NMIPConfigFlags
+nm_ip_config_get_config_flags (const NMIPConfig *self)
+{
+	_NM_IP_CONFIG_DISPATCH (self, nm_ip4_config_get_config_flags, nm_ip6_config_get_config_flags);
+}
+
+static inline void
+nm_ip_config_set_config_flags (NMIPConfig *self, NMIPConfigFlags flags, NMIPConfigFlags mask)
+{
+	_NM_IP_CONFIG_DISPATCH_VOID (self, nm_ip4_config_set_config_flags, nm_ip6_config_set_config_flags, flags, mask);
+}
+
 #define _NM_IP_CONFIG_DISPATCH_SET_OP(_return, dst, src, v4_func, v6_func, ...) \
 	G_STMT_START { \
 		gpointer _dst = (dst); \
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 5acb3932d0..3f2c465bda 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -63,6 +63,7 @@ typedef struct {
 		NMIPConfigDedupMultiIdxType idx_ip6_routes_;
 		NMDedupMultiIdxType idx_ip6_routes;
 	};
+	NMIPConfigFlags config_flags;
 	bool ipv6_disabled;
 } NMIP6ConfigPrivate;
 
@@ -2296,6 +2297,28 @@ nm_ip6_config_get_dns_option (const NMIP6Config *self, guint i)
 
 /*****************************************************************************/
 
+NMIPConfigFlags
+nm_ip6_config_get_config_flags (const NMIP6Config *self)
+{
+	return NM_IP6_CONFIG_GET_PRIVATE (self)->config_flags;
+}
+
+void
+nm_ip6_config_set_config_flags (NMIP6Config *self, NMIPConfigFlags flags, NMIPConfigFlags mask)
+{
+	NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (self);
+
+	if (mask == 0) {
+		/* for convenience, accept 0 mask to set any flags. */
+		mask = flags;
+	}
+
+	nm_assert (!NM_FLAGS_ANY (flags, ~mask));
+	priv->config_flags = (flags & mask) | (priv->config_flags & ~mask);
+}
+
+/*****************************************************************************/
+
 void
 nm_ip6_config_set_dns_priority (NMIP6Config *self, int priority)
 {
diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h
index a9fa8f14a0..36e8518a86 100644
--- a/src/nm-ip6-config.h
+++ b/src/nm-ip6-config.h
@@ -128,6 +128,11 @@ gboolean nm_ip6_config_replace (NMIP6Config *dst, const NMIP6Config *src, gboole
 const NMPObject *nm_ip6_config_best_default_route_get (const NMIP6Config *self);
 const NMPObject *_nm_ip6_config_best_default_route_find (const NMIP6Config *self);
 
+enum _NMIPConfigFlags;
+
+void nm_ip6_config_set_config_flags (NMIP6Config *self, enum _NMIPConfigFlags flags, enum _NMIPConfigFlags mask);
+enum _NMIPConfigFlags nm_ip6_config_get_config_flags (const NMIP6Config *self);
+
 const NMDedupMultiHeadEntry *nm_ip6_config_lookup_addresses (const NMIP6Config *self);
 void nm_ip6_config_reset_addresses (NMIP6Config *self);
 void nm_ip6_config_add_address (NMIP6Config *self, const NMPlatformIP6Address *address);

From 5da82ee3eab29fc716b4fcf616c2ae89da748c4c Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 22 Apr 2020 10:57:27 +0200
Subject: [PATCH 034/222] wireguard: suppress automatic "wireguard.peer-routes"
 for default routes if "ipv[46].never-default" is enabled

Enabling both peer-routes and never-default conflicts with having
AllowedIPs set to a default route. Let never-default win.
---
 clients/common/settings-docs.h.in | 2 +-
 libnm-core/nm-setting-wireguard.c | 6 +++++-
 src/devices/nm-device-wireguard.c | 8 ++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 9425ef370d..3b8e235963 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -390,7 +390,7 @@
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_IP6_AUTO_DEFAULT_ROUTE N_("Like ip4-auto-default-route, but for the IPv6 default route.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_LISTEN_PORT N_("The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments. If zero a default MTU is used. Note that contrary to wg-quick's MTU setting, this does not take into account the current routes at the time of activation.")
-#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PEER_ROUTES N_("Whether to automatically add routes for the AllowedIPs ranges of the peers. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, no such routes are added automatically. In this case, the user may want to configure static routes in ipv4.routes and ipv6.routes, respectively.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PEER_ROUTES N_("Whether to automatically add routes for the AllowedIPs ranges of the peers. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4.route-table and ipv6.route-table. Usually you want this automatism enabled. If FALSE, no such routes are added automatically. In this case, the user may want to configure static routes in ipv4.routes and ipv6.routes, respectively. Note that if the peer's AllowedIPs is \"0.0.0.0/0\" or \"::/0\" and the profile's ipv4.never-default or ipv6.never-default setting is enabled, the peer route for this peer won't be added automatically.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PRIVATE_KEY N_("The 256 bit private-key in base64 encoding.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS N_("Flags indicating how to handle the \"private-key\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_CHANNEL N_("IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use whatever the device is already set to\".")
diff --git a/libnm-core/nm-setting-wireguard.c b/libnm-core/nm-setting-wireguard.c
index ecfc5bb360..1f6940a898 100644
--- a/libnm-core/nm-setting-wireguard.c
+++ b/libnm-core/nm-setting-wireguard.c
@@ -2493,11 +2493,15 @@ nm_setting_wireguard_class_init (NMSettingWireGuardClass *klass)
 	 * Whether to automatically add routes for the AllowedIPs ranges
 	 * of the peers. If %TRUE (the default), NetworkManager will automatically
 	 * add routes in the routing tables according to ipv4.route-table and
-	 * ipv6.route-table.
+	 * ipv6.route-table. Usually you want this automatism enabled.
 	 * If %FALSE, no such routes are added automatically. In this case, the
 	 * user may want to configure static routes in ipv4.routes and ipv6.routes,
 	 * respectively.
 	 *
+	 * Note that if the peer's AllowedIPs is "0.0.0.0/0" or "::/0" and the profile's
+	 * ipv4.never-default or ipv6.never-default setting is enabled, the peer route for
+	 * this peer won't be added automatically.
+	 *
 	 * Since: 1.16
 	 **/
 	obj_properties[PROP_PEER_ROUTES] =
diff --git a/src/devices/nm-device-wireguard.c b/src/devices/nm-device-wireguard.c
index bb7a595060..8dffb7f957 100644
--- a/src/devices/nm-device-wireguard.c
+++ b/src/devices/nm-device-wireguard.c
@@ -1631,6 +1631,14 @@ _get_dev2_ip_config (NMDeviceWireGuard *self,
 			if (prefix < 0)
 				prefix = (addr_family == AF_INET) ? 32 : 128;
 
+			if (prefix == 0) {
+				NMSettingIPConfig *s_ip;
+
+				s_ip = nm_connection_get_setting_ip_config (connection, addr_family);
+				if (nm_setting_ip_config_get_never_default (s_ip))
+					continue;
+			}
+
 			if (!ip_config)
 				ip_config = nm_device_ip_config_new (NM_DEVICE (self), addr_family);
 

From 115291a46f52ee4adfe85264b9566d216bcb25e8 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 22 Apr 2020 10:46:17 +0200
Subject: [PATCH 035/222] wireguard: don't let explicit gateway override
 WireGuard's peer route

The profile's "ipv4.gateway" and "ipv6.gateway" has only one real
purpose: to define the next hop of a static default route.

Usually, when specifying a gateway in this way, the default route from
other addressing methods (like DHCPv4 or IPv6 autoconf) gets ignored.

If you have a WireGuard peer with "AllowedIPs=0.0.0.0/0" and
"wireguard.peer-routes" enabled, NetworkManager would automatically add
a route to the peer. Previously, if the user also set a gateway, that
route was suppressed.

That doesn't feel right. Note that configuring a gateway on a WireGuard
profile is likely to be wrong to begin with. At least, unless you take
otherwise care to avoid routing loops. If you take care, setting a
gateway may work, but it would feel clearer to instead just add an
explicit /0 manual route instead.

Also, note that usually you don't need a gateway anyway. WireGuard is a
Layer 3 (IP) tunnel, where the next hop is alway just the other side of
the tunnel. The next hop has little effect on the routes that you
configure on a WireGuard interface. What however matters is whether a
default route is present or not.

Also, an explicit gateway probably works badly with "ipv[46].ip4-auto-default-route",
because in that case the automatism should add a /0 peer-route route in a
separate routing table. The explicit gateway interferes with that too.

Nonetheless, without this patch it's not obvious why the /0 peer
route gets suppressed when a gateway is set. Don't allow for that, and
always add the peer-route.

Probably the profile's gateway setting is still wrong and causes the
profile not to work. But at least, you see all routes configured, and
it's clearer where the (wrong) default route to the gateway comes from.
---
 clients/common/settings-docs.h.in |  2 +-
 libnm-core/nm-setting-wireguard.c | 14 +++++++++-----
 src/devices/nm-device-wireguard.c |  6 +++++-
 src/nm-ip4-config.c               |  3 ++-
 src/nm-ip4-config.h               |  6 +++++-
 src/nm-ip6-config.c               |  3 ++-
 src/nm-types.h                    |  4 +++-
 7 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 3b8e235963..def9d284c5 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -386,7 +386,7 @@
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_MAC_ADDRESS N_("If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_NETWORK_NAME N_("Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_FWMARK N_("The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that \"ip4-auto-default-route\" or \"ip6-auto-default-route\" enabled, implies to automatically choose a fwmark.")
-#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_IP4_AUTO_DEFAULT_ROUTE N_("Whether to enable special handling of the IPv4 default route. If enabled, the IPv4 default route will be placed to a dedicated routing-table and two policy routing rules will be added. The fwmark number is also used as routing-table for the default-route, and if fwmark is zero, a unused fwmark/table is chosen automatically. This corresponds to what wg-quick does with Table=auto. Leaving this at the default will enable this option automatically if ipv4.never-default is not set and there are any peers that use a default-route as allowed-ips.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_IP4_AUTO_DEFAULT_ROUTE N_("Whether to enable special handling of the IPv4 default route. If enabled, the IPv4 default route from wireguard.peer-routes will be placed to a dedicated routing-table and two policy routing rules will be added. The fwmark number is also used as routing-table for the default-route, and if fwmark is zero, an unused fwmark/table is chosen automatically. This corresponds to what wg-quick does with Table=auto and what WireGuard calls \"Improved Rule-based Routing\". Note that for this automatism to work, you usually don't want to set ipv4.gateway, because that will result in a conflicting default route. Leaving this at the default will enable this option automatically if ipv4.never-default is not set and there are any peers that use a default-route as allowed-ips.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_IP6_AUTO_DEFAULT_ROUTE N_("Like ip4-auto-default-route, but for the IPv6 default route.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_LISTEN_PORT N_("The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments. If zero a default MTU is used. Note that contrary to wg-quick's MTU setting, this does not take into account the current routes at the time of activation.")
diff --git a/libnm-core/nm-setting-wireguard.c b/libnm-core/nm-setting-wireguard.c
index 1f6940a898..2bd633cecb 100644
--- a/libnm-core/nm-setting-wireguard.c
+++ b/libnm-core/nm-setting-wireguard.c
@@ -2534,11 +2534,15 @@ nm_setting_wireguard_class_init (NMSettingWireGuardClass *klass)
 	 * NMSettingWireGuard:ip4-auto-default-route:
 	 *
 	 * Whether to enable special handling of the IPv4 default route.
-	 * If enabled, the IPv4 default route will be placed to a dedicated
-	 * routing-table and two policy routing rules will be added.
-	 * The fwmark number is also used as routing-table for the default-route,
-	 * and if fwmark is zero, a unused fwmark/table is chosen automatically.
-	 * This corresponds to what wg-quick does with Table=auto.
+	 * If enabled, the IPv4 default route from wireguard.peer-routes
+	 * will be placed to a dedicated routing-table and two policy routing rules
+	 * will be added. The fwmark number is also used as routing-table for the default-route,
+	 * and if fwmark is zero, an unused fwmark/table is chosen automatically.
+	 * This corresponds to what wg-quick does with Table=auto and what WireGuard
+	 * calls "Improved Rule-based Routing".
+	 *
+	 * Note that for this automatism to work, you usually don't want to set
+	 * ipv4.gateway, because that will result in a conflicting default route.
 	 *
 	 * Leaving this at the default will enable this option automatically
 	 * if ipv4.never-default is not set and there are any peers that use
diff --git a/src/devices/nm-device-wireguard.c b/src/devices/nm-device-wireguard.c
index 8dffb7f957..9f01a76323 100644
--- a/src/devices/nm-device-wireguard.c
+++ b/src/devices/nm-device-wireguard.c
@@ -1639,8 +1639,12 @@ _get_dev2_ip_config (NMDeviceWireGuard *self,
 					continue;
 			}
 
-			if (!ip_config)
+			if (!ip_config) {
 				ip_config = nm_device_ip_config_new (NM_DEVICE (self), addr_family);
+				nm_ip_config_set_config_flags (ip_config,
+				                               NM_IP_CONFIG_FLAGS_IGNORE_MERGE_NO_DEFAULT_ROUTES,
+				                               0);
+			}
 
 			nm_utils_ipx_address_clear_host_address (addr_family, &addrbin, NULL, prefix);
 
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index 8c16d0bfae..0feb7b2c3c 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -1203,7 +1203,8 @@ nm_ip4_config_merge (NMIP4Config *dst,
 
 		nm_ip_config_iter_ip4_route_for_each (&ipconf_iter, src, &r_src) {
 			if (NM_PLATFORM_IP_ROUTE_IS_DEFAULT (r_src)) {
-				if (NM_FLAGS_HAS (merge_flags, NM_IP_CONFIG_MERGE_NO_DEFAULT_ROUTES))
+				if (   NM_FLAGS_HAS (merge_flags, NM_IP_CONFIG_MERGE_NO_DEFAULT_ROUTES)
+				    && !NM_FLAGS_HAS (src_priv->config_flags, NM_IP_CONFIG_FLAGS_IGNORE_MERGE_NO_DEFAULT_ROUTES))
 					continue;
 				if (default_route_metric_penalty) {
 					NMPlatformIP4Route r = *r_src;
diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h
index b2845da3bb..d4694d9360 100644
--- a/src/nm-ip4-config.h
+++ b/src/nm-ip4-config.h
@@ -16,7 +16,11 @@
 /*****************************************************************************/
 
 typedef enum _NMIPConfigFlags {
-	NM_IP_CONFIG_FLAG_NONE = 0,
+	NM_IP_CONFIG_FLAG_NONE                            = 0,
+
+	/* if set, then the merge flag NM_IP_CONFIG_MERGE_NO_DEFAULT_ROUTES gets
+	 * ignored during merge. */
+	NM_IP_CONFIG_FLAGS_IGNORE_MERGE_NO_DEFAULT_ROUTES = (1ull << 0),
 } NMIPConfigFlags;
 
 typedef struct {
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 3f2c465bda..b60e8057cb 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -876,7 +876,8 @@ nm_ip6_config_merge (NMIP6Config *dst,
 
 		nm_ip_config_iter_ip6_route_for_each (&ipconf_iter, src, &r_src) {
 			if (NM_PLATFORM_IP_ROUTE_IS_DEFAULT (r_src)) {
-				if (NM_FLAGS_HAS (merge_flags, NM_IP_CONFIG_MERGE_NO_DEFAULT_ROUTES))
+				if (   NM_FLAGS_HAS (merge_flags, NM_IP_CONFIG_MERGE_NO_DEFAULT_ROUTES)
+				    && !NM_FLAGS_HAS (src_priv->config_flags, NM_IP_CONFIG_FLAGS_IGNORE_MERGE_NO_DEFAULT_ROUTES))
 					continue;
 				if (default_route_metric_penalty) {
 					NMPlatformIP6Route r = *r_src;
diff --git a/src/nm-types.h b/src/nm-types.h
index 4db9a19b13..d2f6fb4093 100644
--- a/src/nm-types.h
+++ b/src/nm-types.h
@@ -233,7 +233,9 @@ typedef enum {
  * NMIPConfigMergeFlags:
  * @NM_IP_CONFIG_MERGE_DEFAULT: no flags set
  * @NM_IP_CONFIG_MERGE_NO_ROUTES: don't merge routes
- * @NM_IP_CONFIG_MERGE_NO_DEFAULT_ROUTES: don't merge default routes
+ * @NM_IP_CONFIG_MERGE_NO_DEFAULT_ROUTES: don't merge default routes.
+ *   Note that if the source IP config has NM_IP_CONFIG_FLAGS_IGNORE_MERGE_NO_DEFAULT_ROUTES
+ *   set, this flag gets ignored during merge.
  * @NM_IP_CONFIG_MERGE_NO_DNS: don't merge DNS information
  * @NM_IP_CONFIG_MERGE_EXTERNAL: mark new addresses as external
  */

From a873c438a8de799e01b710fd5f2179764494d0e7 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 22 Apr 2020 11:32:48 +0200
Subject: [PATCH 036/222] NEWS: update

---
 NEWS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index 0006ed1b30..d83eeb74c4 100644
--- a/NEWS
+++ b/NEWS
@@ -46,6 +46,9 @@ Overview of changes since NetworkManager-1.22
 * Fixed multiple issues in the internal "nettools" DHCP client.
 * Export NM_CAPABILITY_OVS capability on D-Bus and in libnm to
   indicate that the OVS plugin is loaded.
+* Fixes for importing WireGuard profiles in nmcli and better handle
+  configurations that enable ip4-auto-default-route with an explicit
+  gateway.
 * Various bug fixes and improvements.
 
 =============================================

From 411255d51fab0f47b4f72a9ff6c9b11b46e93e9a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 22 Apr 2020 13:58:07 +0200
Subject: [PATCH 037/222] cli: unset "ipv[46].never-default" when setting
 "ipv[46].gateway"

Since commit c1907a218a6b ('libnm-core: remove gateway when
never-default=yes in NMSettingIPConfig'), the gateway gets normalized
away when the profile has never-default set.

That means,

  $ nmcli connection modify "$PROFILE" ipv4.never-default yes ipv4.gateway 192.168.77.1

does not set the gateway. Likewise, if your profile has already never-default
enabled,

  $ nmcli connection modify "$PROFILE" ipv4.gateway 192.168.77.1

will have no effect. That is confusing and undesirable.

Note that we don't adjust the GObject property setter for "gateway" to clear
never-default. I feel, setting one property in libnm should preferably
not unset another (there are exceptions to the rule, like for team
properties). However, for nmcli it's clear in which order properties
are set, so this change is right for the client tool.

https://bugzilla.redhat.com/show_bug.cgi?id=1785039

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/475
---
 clients/common/nm-meta-setting-desc.c | 8 +++++++-
 clients/common/settings-docs.h.in     | 4 ++--
 libnm-core/nm-setting-ip-config.c     | 3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index c821c21342..920a5af949 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -3302,7 +3302,13 @@ _set_fcn_ip_config_gateway (ARGS_SET_FCN)
 		return FALSE;
 	}
 
-	g_object_set (setting, property_info->property_name, value, NULL);
+	/* Since commit c1907a218a6b6bfe8175eb6ed87a523aaabc69ae, having a gateway and never-default=yes
+	 * will be normalized away. That means, when we set a gateway, we also want to unset never-default,
+	 * otherwise the operation gets silently reverted. */
+	g_object_set (setting,
+	              property_info->property_name, value,
+	              NM_SETTING_IP_CONFIG_NEVER_DEFAULT, FALSE,
+	              NULL);
 	return TRUE;
 }
 
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index def9d284c5..ca70e80d08 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -223,7 +223,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". The \"trust-ad\" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have \"trust-ad\" enabled.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set. This also requires \"never-default\" to be unset. Otherwise, the gateway will be cleared during normalization.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured routes are ignored and only routes specified in the \"routes\" property, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_MAY_FAIL N_("If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.")
@@ -245,7 +245,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". The \"trust-ad\" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have \"trust-ad\" enabled.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set. This also requires \"never-default\" to be unset. Otherwise, the gateway will be cleared during normalization.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured routes are ignored and only routes specified in the \"routes\" property, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IP6_PRIVACY N_("Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If 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: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to \"-1\" (unknown) means fallback to global configuration \"ipv6.ip6-privacy\". If also global configuration is 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\" setting as another way of avoiding host tracking with IPv6 addresses.")
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index 30e7a97b99..a004e8f30f 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -5685,6 +5685,9 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 *
 	 * The gateway associated with this configuration. This is only meaningful
 	 * if #NMSettingIPConfig:addresses is also set.
+	 *
+	 * This also requires #NMSettingIPConfig:never-default to be unset. Otherwise,
+	 * the gateway will be cleared during normalization.
 	 **/
 	obj_properties[PROP_GATEWAY] =
 	    g_param_spec_string (NM_SETTING_IP_CONFIG_GATEWAY, "", "",

From 25583de20ba0df49d9364c580011d4c75c3be8f8 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 23 Apr 2020 17:24:22 +0200
Subject: [PATCH 038/222] man: mention the meaning of may-fail in the nm-online
 man page

Commit b2a0738765d3 ('man: improve manual page for nm-online') removed
the explanation of how may-fail can be used to wait for a specific
address family during boot. I found that part useful. Add it again,
adapting it to the new behavior introduced by 1e5206414af8 ('device:
don't delay startup complete for pending-actions "autoconf", "dhcp4"
and "dhcp6"').

https://bugzilla.redhat.com/show_bug.cgi?id=1825666
---
 man/nm-online.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/man/nm-online.xml b/man/nm-online.xml
index 87072ec3b8..c36dda8dd8 100644
--- a/man/nm-online.xml
+++ b/man/nm-online.xml
@@ -68,6 +68,14 @@
     and don't order them with respect to <literal>network-online.target</literal>
     at all.
     </para>
+
+    <para>By default, connections have the <literal>ipv4.may-fail</literal> and
+    <literal>ipv6.may-fail</literal> properties set to <literal>yes</literal>;
+    this means that NetworkManager waits for one of the two address families to
+    complete configuration before considering the connection activated. If you
+    need a specific address family configured before
+    <literal>network-online.target</literal> is reached, set the corresponding
+    <literal>may-fail</literal> property to <literal>no</literal>.</para>
   </refsect1>
 
   <refsect1 id='options'><title>Options</title>

From 295e6678ddb02b2d183f2b3f70d91eb6e65625ad Mon Sep 17 00:00:00 2001
From: Eliot Lear <github@ofcourseimright.com>
Date: Wed, 8 Apr 2020 07:30:08 +0000
Subject: [PATCH 039/222] dhcp: add support for MUD URL (RFC 8520)

[thaller@redhat.com: rewritten commit message]

https://tools.ietf.org/html/rfc8520
https://blog.apnic.net/2019/05/14/protecting-the-internet-of-things-with-mud/

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/402

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/463
---
 clients/common/nm-meta-setting-desc.c         |   3 +
 clients/common/settings-docs.h.in             |   1 +
 .../test_002.expected                         |  10 +-
 .../test_003.expected                         | 482 +++++++------
 .../test_004.expected                         | 678 ++++++++++--------
 libnm-core/nm-setting-connection.c            |  57 ++
 libnm-core/nm-setting-connection.h            |   3 +
 libnm-core/tests/test-general.c               |   1 +
 libnm/libnm.ver                               |   1 +
 src/devices/nm-device.c                       |  10 +-
 src/dhcp/nm-dhcp-client.c                     |  23 +
 src/dhcp/nm-dhcp-client.h                     |   2 +
 src/dhcp/nm-dhcp-dhclient-utils.c             |  26 +-
 src/dhcp/nm-dhcp-dhclient-utils.h             |   1 +
 src/dhcp/nm-dhcp-dhclient.c                   |   6 +
 src/dhcp/nm-dhcp-manager.c                    |   6 +
 src/dhcp/nm-dhcp-manager.h                    |   2 +
 src/dhcp/nm-dhcp-nettools.c                   |  10 +
 src/dhcp/nm-dhcp-options.c                    |   3 +-
 src/dhcp/nm-dhcp-options.h                    |   2 +
 src/dhcp/nm-dhcp-systemd.c                    |  11 +
 src/dhcp/tests/test-dhcp-dhclient.c           |  59 +-
 src/nm-iface-helper.c                         |   2 +
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |   6 +
 .../plugins/ifcfg-rh/nms-ifcfg-rh-utils.c     |   1 +
 .../plugins/ifcfg-rh/nms-ifcfg-rh-utils.h     |   3 +-
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    |   5 +-
 27 files changed, 890 insertions(+), 524 deletions(-)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 920a5af949..b7aacd7907 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -5227,6 +5227,9 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 	        ),
 	    ),
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_MUD_URL,
+	    .property_type =                &_pt_gobject_string,
+	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT,
 	    .property_type =                &_pt_gobject_int,
 	),
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index ca70e80d08..8415b82c5a 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -152,6 +152,7 @@
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MASTER N_("Interface name of the master device or UUID of the master connection.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("Whether mDNS is enabled for the connection. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable mDNS for the interface, \"resolve\" (1) do not register hostname but allow resolving of mDNS host names and \"default\" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"no\"). This feature requires a plugin which supports mDNS. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_METERED N_("Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.")
+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MUD_URL N_("If configured, set to a Manufacturer Usage Description (MUD) URL that points to manufacturer-recommended network policies for IoT devices. It is transmitted as a DHCPv4 or DHCPv6 option.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MULTI_CONNECT N_("Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_PERMISSIONS N_("An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection; otherwise users are allowed if and only if they are in this list.  When this is not empty, the connection can be active only when one of the specified users is logged into an active session.  Each entry is of the form \"[type]:[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this time only the \"user\" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the \":\" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_READ_ONLY N_("FALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.")
diff --git a/clients/tests/test-client.check-on-disk/test_002.expected b/clients/tests/test-client.check-on-disk/test_002.expected
index 1c6eecc59b..1b40086ec8 100644
--- a/clients/tests/test-client.check-on-disk/test_002.expected
+++ b/clients/tests/test-client.check-on-disk/test_002.expected
@@ -502,12 +502,12 @@ NAME   UUID                                  TYPE      DEVICE
 con-1  5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
 
 <<<
-size: 1263
+size: 1306
 location: clients/tests/test-client.py:test_002()/23
 cmd: $NMCLI c s con-1
 lang: C
 returncode: 0
-stdout: 1138 bytes
+stdout: 1181 bytes
 >>>
 connection.id:                          con-1
 connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -532,15 +532,16 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 
 <<<
-size: 1275
+size: 1318
 location: clients/tests/test-client.py:test_002()/24
 cmd: $NMCLI c s con-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1140 bytes
+stdout: 1183 bytes
 >>>
 connection.id:                          con-1
 connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -565,6 +566,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 
 <<<
diff --git a/clients/tests/test-client.check-on-disk/test_003.expected b/clients/tests/test-client.check-on-disk/test_003.expected
index 9517e81fe1..2b8f720f56 100644
--- a/clients/tests/test-client.check-on-disk/test_003.expected
+++ b/clients/tests/test-client.check-on-disk/test_003.expected
@@ -150,12 +150,12 @@ id
 path
 uuid
 <<<
-size: 4447
+size: 4490
 location: clients/tests/test-client.py:test_003()/12
 cmd: $NMCLI con s con-gsm1
 lang: C
 returncode: 0
-stdout: 4317 bytes
+stdout: 4360 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -180,6 +180,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -254,12 +255,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4477
+size: 4520
 location: clients/tests/test-client.py:test_003()/13
 cmd: $NMCLI con s con-gsm1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4337 bytes
+stdout: 4380 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -284,6 +285,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -490,12 +492,12 @@ UUID                                  NAME
 UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
 
 <<<
-size: 4222
+size: 4265
 location: clients/tests/test-client.py:test_003()/25
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
-stdout: 4085 bytes
+stdout: 4128 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -520,6 +522,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -589,12 +592,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4250
+size: 4293
 location: clients/tests/test-client.py:test_003()/26
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4103 bytes
+stdout: 4146 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -619,6 +622,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -708,12 +712,12 @@ stdout: 51 bytes
 GENERAL.STATE:                          aktywowano
 
 <<<
-size: 4922
+size: 4965
 location: clients/tests/test-client.py:test_003()/29
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 4792 bytes
+stdout: 4835 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -738,6 +742,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -820,12 +825,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4954
+size: 4997
 location: clients/tests/test-client.py:test_003()/30
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4814 bytes
+stdout: 4857 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -850,6 +855,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -1402,12 +1408,12 @@ UUID                                  NAME
 UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
 
 <<<
-size: 4222
+size: 4265
 location: clients/tests/test-client.py:test_003()/50
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
-stdout: 4085 bytes
+stdout: 4128 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1432,6 +1438,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -1501,12 +1508,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4250
+size: 4293
 location: clients/tests/test-client.py:test_003()/51
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4103 bytes
+stdout: 4146 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1531,6 +1538,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -1624,12 +1632,12 @@ GENERAL.STATE:                          aktywowano
 GENERAL.STATE:                          aktywowano
 
 <<<
-size: 5630
+size: 5673
 location: clients/tests/test-client.py:test_003()/54
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 5500 bytes
+stdout: 5543 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1654,6 +1662,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -1750,12 +1759,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5666
+size: 5709
 location: clients/tests/test-client.py:test_003()/55
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5526 bytes
+stdout: 5569 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1780,6 +1789,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -2264,12 +2274,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5633
+size: 5676
 location: clients/tests/test-client.py:test_003()/68
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 5503 bytes
+stdout: 5546 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2294,6 +2304,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -2390,12 +2401,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5670
+size: 5713
 location: clients/tests/test-client.py:test_003()/69
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5530 bytes
+stdout: 5573 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2420,6 +2431,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -2516,12 +2528,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4965
+size: 5008
 location: clients/tests/test-client.py:test_003()/70
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4795 bytes
+stdout: 4838 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2546,6 +2558,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -2628,12 +2641,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4998
+size: 5041
 location: clients/tests/test-client.py:test_003()/71
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4818 bytes
+stdout: 4861 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2658,6 +2671,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -2938,12 +2952,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5645
+size: 5688
 location: clients/tests/test-client.py:test_003()/78
 cmd: $NMCLI --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5503 bytes
+stdout: 5546 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2968,6 +2982,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -3064,12 +3079,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5682
+size: 5725
 location: clients/tests/test-client.py:test_003()/79
 cmd: $NMCLI --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5530 bytes
+stdout: 5573 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3094,6 +3109,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -3190,12 +3206,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4977
+size: 5020
 location: clients/tests/test-client.py:test_003()/80
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4795 bytes
+stdout: 4838 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3220,6 +3236,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -3302,12 +3319,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5010
+size: 5053
 location: clients/tests/test-client.py:test_003()/81
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4818 bytes
+stdout: 4861 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3332,6 +3349,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -3628,12 +3646,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6887
+size: 6930
 location: clients/tests/test-client.py:test_003()/88
 cmd: $NMCLI --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 6748 bytes
+stdout: 6791 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -3661,6 +3679,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -3770,12 +3789,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6943
+size: 6986
 location: clients/tests/test-client.py:test_003()/89
 cmd: $NMCLI --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6794 bytes
+stdout: 6837 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -3803,6 +3822,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -3912,12 +3932,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5906
+size: 5949
 location: clients/tests/test-client.py:test_003()/90
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5727 bytes
+stdout: 5770 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -3945,6 +3965,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -4036,12 +4057,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5951
+size: 5994
 location: clients/tests/test-client.py:test_003()/91
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5762 bytes
+stdout: 5805 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4069,6 +4090,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -4398,12 +4420,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6899
+size: 6942
 location: clients/tests/test-client.py:test_003()/98
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 6748 bytes
+stdout: 6791 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -4431,6 +4453,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -4540,12 +4563,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6955
+size: 6998
 location: clients/tests/test-client.py:test_003()/99
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6794 bytes
+stdout: 6837 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4573,6 +4596,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -4682,12 +4706,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5919
+size: 5962
 location: clients/tests/test-client.py:test_003()/100
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5727 bytes
+stdout: 5770 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -4715,6 +4739,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -4806,12 +4831,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5964
+size: 6007
 location: clients/tests/test-client.py:test_003()/101
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5762 bytes
+stdout: 5805 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4839,6 +4864,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -5148,12 +5174,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 3001
+size: 3021
 location: clients/tests/test-client.py:test_003()/108
 cmd: $NMCLI --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 2862 bytes
+stdout: 2882 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5178,6 +5204,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -5274,12 +5301,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3011
+size: 3031
 location: clients/tests/test-client.py:test_003()/109
 cmd: $NMCLI --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2862 bytes
+stdout: 2882 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5304,6 +5331,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -5400,12 +5428,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2655
+size: 2675
 location: clients/tests/test-client.py:test_003()/110
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2476 bytes
+stdout: 2496 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5430,6 +5458,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -5512,12 +5541,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2665
+size: 2685
 location: clients/tests/test-client.py:test_003()/111
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2476 bytes
+stdout: 2496 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5542,6 +5571,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -5818,12 +5848,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 3013
+size: 3033
 location: clients/tests/test-client.py:test_003()/118
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 2862 bytes
+stdout: 2882 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5848,6 +5878,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -5944,12 +5975,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3023
+size: 3043
 location: clients/tests/test-client.py:test_003()/119
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2862 bytes
+stdout: 2882 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5974,6 +6005,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -6070,12 +6102,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2667
+size: 2687
 location: clients/tests/test-client.py:test_003()/120
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2476 bytes
+stdout: 2496 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -6100,6 +6132,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -6182,12 +6215,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2677
+size: 2697
 location: clients/tests/test-client.py:test_003()/121
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2476 bytes
+stdout: 2496 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -6212,6 +6245,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -6492,15 +6526,15 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 3736
+size: 3754
 location: clients/tests/test-client.py:test_003()/128
 cmd: $NMCLI --mode tabular con s ethernet
 lang: C
 returncode: 0
-stdout: 3590 bytes
+stdout: 3608 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
@@ -6523,15 +6557,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 3770
+size: 3788
 location: clients/tests/test-client.py:test_003()/129
 cmd: $NMCLI --mode tabular con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3614 bytes
+stdout: 3632 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
@@ -6554,15 +6588,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deza
 
 
 <<<
-size: 3274
+size: 3292
 location: clients/tests/test-client.py:test_003()/130
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 3088 bytes
+stdout: 3106 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
@@ -6581,15 +6615,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 3306
+size: 3324
 location: clients/tests/test-client.py:test_003()/131
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3110 bytes
+stdout: 3128 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
@@ -6736,15 +6770,15 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 3748
+size: 3766
 location: clients/tests/test-client.py:test_003()/138
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 3590 bytes
+stdout: 3608 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
@@ -6767,15 +6801,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 3782
+size: 3800
 location: clients/tests/test-client.py:test_003()/139
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3614 bytes
+stdout: 3632 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
@@ -6798,15 +6832,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deza
 
 
 <<<
-size: 3286
+size: 3304
 location: clients/tests/test-client.py:test_003()/140
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 3088 bytes
+stdout: 3106 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
@@ -6825,15 +6859,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 3318
+size: 3336
 location: clients/tests/test-client.py:test_003()/141
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3110 bytes
+stdout: 3128 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
@@ -6996,19 +7030,19 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6089
+size: 6116
 location: clients/tests/test-client.py:test_003()/148
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 5934 bytes
+stdout: 5961 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
 =========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7043,19 +7077,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 6183
+size: 6210
 location: clients/tests/test-client.py:test_003()/149
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6018 bytes
+stdout: 6045 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
 ===========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7090,19 +7124,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deza
 
 
 <<<
-size: 5165
+size: 5192
 location: clients/tests/test-client.py:test_003()/150
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4970 bytes
+stdout: 4997 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
 =========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7129,19 +7163,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 5237
+size: 5264
 location: clients/tests/test-client.py:test_003()/151
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5032 bytes
+stdout: 5059 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
 ===========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7336,19 +7370,19 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6101
+size: 6128
 location: clients/tests/test-client.py:test_003()/158
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5934 bytes
+stdout: 5961 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
 =========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7383,19 +7417,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 6195
+size: 6222
 location: clients/tests/test-client.py:test_003()/159
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6018 bytes
+stdout: 6045 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
 ===========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7430,19 +7464,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deza
 
 
 <<<
-size: 5177
+size: 5204
 location: clients/tests/test-client.py:test_003()/160
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4970 bytes
+stdout: 4997 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
 =========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7469,19 +7503,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 5249
+size: 5276
 location: clients/tests/test-client.py:test_003()/161
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5032 bytes
+stdout: 5059 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
 ===========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7656,14 +7690,14 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 843
+size: 844
 location: clients/tests/test-client.py:test_003()/168
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 690 bytes
+stdout: 691 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7673,14 +7707,14 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 853
+size: 854
 location: clients/tests/test-client.py:test_003()/169
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 690 bytes
+stdout: 691 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7690,14 +7724,14 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 695
+size: 696
 location: clients/tests/test-client.py:test_003()/170
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 502 bytes
+stdout: 503 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7705,14 +7739,14 @@ proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 705
+size: 706
 location: clients/tests/test-client.py:test_003()/171
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 502 bytes
+stdout: 503 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7810,14 +7844,14 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 855
+size: 856
 location: clients/tests/test-client.py:test_003()/178
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 690 bytes
+stdout: 691 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7827,14 +7861,14 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 865
+size: 866
 location: clients/tests/test-client.py:test_003()/179
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 690 bytes
+stdout: 691 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7844,14 +7878,14 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 707
+size: 708
 location: clients/tests/test-client.py:test_003()/180
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 502 bytes
+stdout: 503 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7859,14 +7893,14 @@ proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 717
+size: 718
 location: clients/tests/test-client.py:test_003()/181
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 502 bytes
+stdout: 503 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -8112,12 +8146,12 @@ UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:                                   ethernet
 
 <<<
-size: 5651
+size: 5694
 location: clients/tests/test-client.py:test_003()/188
 cmd: $NMCLI --mode multiline con s ethernet
 lang: C
 returncode: 0
-stdout: 5503 bytes
+stdout: 5546 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8142,6 +8176,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -8238,12 +8273,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5688
+size: 5731
 location: clients/tests/test-client.py:test_003()/189
 cmd: $NMCLI --mode multiline con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5530 bytes
+stdout: 5573 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8268,6 +8303,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -8364,12 +8400,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4983
+size: 5026
 location: clients/tests/test-client.py:test_003()/190
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4795 bytes
+stdout: 4838 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8394,6 +8430,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -8476,12 +8513,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5016
+size: 5059
 location: clients/tests/test-client.py:test_003()/191
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4818 bytes
+stdout: 4861 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8506,6 +8543,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -8930,12 +8968,12 @@ UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:                                   ethernet
 
 <<<
-size: 5663
+size: 5706
 location: clients/tests/test-client.py:test_003()/198
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5503 bytes
+stdout: 5546 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8960,6 +8998,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -9056,12 +9095,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5700
+size: 5743
 location: clients/tests/test-client.py:test_003()/199
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5530 bytes
+stdout: 5573 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -9086,6 +9125,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -9182,12 +9222,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4995
+size: 5038
 location: clients/tests/test-client.py:test_003()/200
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4795 bytes
+stdout: 4838 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -9212,6 +9252,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -9294,12 +9335,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5028
+size: 5071
 location: clients/tests/test-client.py:test_003()/201
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4818 bytes
+stdout: 4861 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -9324,6 +9365,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -9778,12 +9820,12 @@ TYPE:                                   ethernet
 -------------------------------------------------------------------------------
 
 <<<
-size: 6905
+size: 6948
 location: clients/tests/test-client.py:test_003()/208
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 6748 bytes
+stdout: 6791 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -9811,6 +9853,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -9920,12 +9963,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6961
+size: 7004
 location: clients/tests/test-client.py:test_003()/209
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6794 bytes
+stdout: 6837 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -9953,6 +9996,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -10062,12 +10106,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5924
+size: 5967
 location: clients/tests/test-client.py:test_003()/210
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5727 bytes
+stdout: 5770 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -10095,6 +10139,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -10186,12 +10231,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5969
+size: 6012
 location: clients/tests/test-client.py:test_003()/211
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5762 bytes
+stdout: 5805 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -10219,6 +10264,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -10706,12 +10752,12 @@ TYPE:                                   ethernet
 -------------------------------------------------------------------------------
 
 <<<
-size: 6917
+size: 6960
 location: clients/tests/test-client.py:test_003()/218
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 6748 bytes
+stdout: 6791 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -10739,6 +10785,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -10848,12 +10895,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6973
+size: 7016
 location: clients/tests/test-client.py:test_003()/219
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6794 bytes
+stdout: 6837 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -10881,6 +10928,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -10990,12 +11038,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5936
+size: 5979
 location: clients/tests/test-client.py:test_003()/220
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5727 bytes
+stdout: 5770 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -11023,6 +11071,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -11114,12 +11163,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5981
+size: 6024
 location: clients/tests/test-client.py:test_003()/221
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5762 bytes
+stdout: 5805 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -11147,6 +11196,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -11604,12 +11654,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:802-3-ethernet
 
 <<<
-size: 3018
+size: 3038
 location: clients/tests/test-client.py:test_003()/228
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 2862 bytes
+stdout: 2882 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11634,6 +11684,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -11730,12 +11781,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3028
+size: 3048
 location: clients/tests/test-client.py:test_003()/229
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2862 bytes
+stdout: 2882 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11760,6 +11811,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -11856,12 +11908,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2672
+size: 2692
 location: clients/tests/test-client.py:test_003()/230
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2476 bytes
+stdout: 2496 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11886,6 +11938,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -11968,12 +12021,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2682
+size: 2702
 location: clients/tests/test-client.py:test_003()/231
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2476 bytes
+stdout: 2496 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11998,6 +12051,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -12422,12 +12476,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:802-3-ethernet
 
 <<<
-size: 3030
+size: 3050
 location: clients/tests/test-client.py:test_003()/238
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 2862 bytes
+stdout: 2882 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12452,6 +12506,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -12548,12 +12603,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3040
+size: 3060
 location: clients/tests/test-client.py:test_003()/239
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2862 bytes
+stdout: 2882 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12578,6 +12633,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -12674,12 +12730,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2684
+size: 2704
 location: clients/tests/test-client.py:test_003()/240
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2476 bytes
+stdout: 2496 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12704,6 +12760,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -12786,12 +12843,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2694
+size: 2714
 location: clients/tests/test-client.py:test_003()/241
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2476 bytes
+stdout: 2496 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12816,6 +12873,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
diff --git a/clients/tests/test-client.check-on-disk/test_004.expected b/clients/tests/test-client.check-on-disk/test_004.expected
index 08be36d466..2c7418bfcf 100644
--- a/clients/tests/test-client.check-on-disk/test_004.expected
+++ b/clients/tests/test-client.check-on-disk/test_004.expected
@@ -58,12 +58,12 @@ location: clients/tests/test-client.py:test_004()/7
 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128
 lang: C
 returncode: 0
-size: 4464
+size: 4507
 location: clients/tests/test-client.py:test_004()/8
 cmd: $NMCLI con s con-xx1
 lang: C
 returncode: 0
-stdout: 4336 bytes
+stdout: 4379 bytes
 >>>
 connection.id:                          con-xx1
 connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -88,6 +88,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-11-wireless.ssid:                   foobar
 802-11-wireless.mode:                   infrastructure
@@ -160,12 +161,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4492
+size: 4535
 location: clients/tests/test-client.py:test_004()/9
 cmd: $NMCLI con s con-xx1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4354 bytes
+stdout: 4397 bytes
 >>>
 connection.id:                          con-xx1
 connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -190,6 +191,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-11-wireless.ssid:                   foobar
 802-11-wireless.mode:                   infrastructure
@@ -298,12 +300,12 @@ con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       --
 con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      --     
 
 <<<
-size: 3931
+size: 3974
 location: clients/tests/test-client.py:test_004()/13
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3800 bytes
+stdout: 3843 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -328,6 +330,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -389,12 +392,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3951
+size: 3994
 location: clients/tests/test-client.py:test_004()/14
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3810 bytes
+stdout: 3853 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -419,6 +422,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -552,12 +556,12 @@ con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      wlan0
 con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
 
 <<<
-size: 5056
+size: 5099
 location: clients/tests/test-client.py:test_004()/21
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4925 bytes
+stdout: 4968 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -582,6 +586,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -664,12 +669,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5082
+size: 5125
 location: clients/tests/test-client.py:test_004()/22
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4941 bytes
+stdout: 4984 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -694,6 +699,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -776,12 +782,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5062
+size: 5105
 location: clients/tests/test-client.py:test_004()/23
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4974 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -806,6 +812,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -888,12 +895,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5092
+size: 5135
 location: clients/tests/test-client.py:test_004()/24
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4951 bytes
+stdout: 4994 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -918,6 +925,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -1000,12 +1008,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5062
+size: 5105
 location: clients/tests/test-client.py:test_004()/25
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4974 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1030,6 +1038,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -1112,12 +1121,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5092
+size: 5135
 location: clients/tests/test-client.py:test_004()/26
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4951 bytes
+stdout: 4994 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1142,6 +1151,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -1224,12 +1234,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3938
+size: 3981
 location: clients/tests/test-client.py:test_004()/27
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3800 bytes
+stdout: 3843 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1254,6 +1264,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -1315,12 +1326,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3958
+size: 4001
 location: clients/tests/test-client.py:test_004()/28
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3810 bytes
+stdout: 3853 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1345,6 +1356,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -3966,12 +3978,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 5074
+size: 5117
 location: clients/tests/test-client.py:test_004()/73
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4974 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -3996,6 +4008,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -4078,12 +4091,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5104
+size: 5147
 location: clients/tests/test-client.py:test_004()/74
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4951 bytes
+stdout: 4994 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4108,6 +4121,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -4190,12 +4204,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5074
+size: 5117
 location: clients/tests/test-client.py:test_004()/75
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4974 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4220,6 +4234,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -4302,12 +4317,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5104
+size: 5147
 location: clients/tests/test-client.py:test_004()/76
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4951 bytes
+stdout: 4994 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4332,6 +4347,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -4414,12 +4430,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3950
+size: 3993
 location: clients/tests/test-client.py:test_004()/77
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3800 bytes
+stdout: 3843 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4444,6 +4460,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -4505,12 +4522,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3970
+size: 4013
 location: clients/tests/test-client.py:test_004()/78
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3810 bytes
+stdout: 3853 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4535,6 +4552,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -7156,12 +7174,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 6084
+size: 6127
 location: clients/tests/test-client.py:test_004()/123
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5943 bytes
+stdout: 5986 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -7189,6 +7207,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -7281,12 +7300,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6126
+size: 6169
 location: clients/tests/test-client.py:test_004()/124
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5975 bytes
+stdout: 6018 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7314,6 +7333,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -7406,12 +7426,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6084
+size: 6127
 location: clients/tests/test-client.py:test_004()/125
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5943 bytes
+stdout: 5986 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -7439,6 +7459,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -7531,12 +7552,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6126
+size: 6169
 location: clients/tests/test-client.py:test_004()/126
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5975 bytes
+stdout: 6018 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7564,6 +7585,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -7656,12 +7678,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4567
+size: 4610
 location: clients/tests/test-client.py:test_004()/127
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4419 bytes
+stdout: 4462 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -7689,6 +7711,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -7755,12 +7778,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4592
+size: 4635
 location: clients/tests/test-client.py:test_004()/128
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4434 bytes
+stdout: 4477 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7788,6 +7811,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -11018,12 +11042,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6096
+size: 6139
 location: clients/tests/test-client.py:test_004()/173
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5943 bytes
+stdout: 5986 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -11051,6 +11075,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -11143,12 +11168,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6138
+size: 6181
 location: clients/tests/test-client.py:test_004()/174
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5975 bytes
+stdout: 6018 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -11176,6 +11201,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -11268,12 +11294,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6096
+size: 6139
 location: clients/tests/test-client.py:test_004()/175
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5943 bytes
+stdout: 5986 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -11301,6 +11327,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -11393,12 +11420,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6138
+size: 6181
 location: clients/tests/test-client.py:test_004()/176
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5975 bytes
+stdout: 6018 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -11426,6 +11453,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -11518,12 +11546,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4579
+size: 4622
 location: clients/tests/test-client.py:test_004()/177
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4419 bytes
+stdout: 4462 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -11551,6 +11579,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -11617,12 +11646,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4604
+size: 4647
 location: clients/tests/test-client.py:test_004()/178
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4434 bytes
+stdout: 4477 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -11650,6 +11679,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -14880,12 +14910,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 2536
+size: 2556
 location: clients/tests/test-client.py:test_004()/223
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -14910,6 +14940,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -14992,12 +15023,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2546
+size: 2566
 location: clients/tests/test-client.py:test_004()/224
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15022,6 +15053,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -15104,12 +15136,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2536
+size: 2556
 location: clients/tests/test-client.py:test_004()/225
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15134,6 +15166,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -15216,12 +15249,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2546
+size: 2566
 location: clients/tests/test-client.py:test_004()/226
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15246,6 +15279,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -15328,12 +15362,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1966
+size: 1986
 location: clients/tests/test-client.py:test_004()/227
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1819 bytes
+stdout: 1839 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15358,6 +15392,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -15419,12 +15454,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1976
+size: 1996
 location: clients/tests/test-client.py:test_004()/228
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1819 bytes
+stdout: 1839 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15449,6 +15484,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -18040,12 +18076,12 @@ connection.type:802-11-wireless
 connection.interface-name:
 
 <<<
-size: 2548
+size: 2568
 location: clients/tests/test-client.py:test_004()/273
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18070,6 +18106,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -18152,12 +18189,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2558
+size: 2578
 location: clients/tests/test-client.py:test_004()/274
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18182,6 +18219,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -18264,12 +18302,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2548
+size: 2568
 location: clients/tests/test-client.py:test_004()/275
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18294,6 +18332,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -18376,12 +18415,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2558
+size: 2578
 location: clients/tests/test-client.py:test_004()/276
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18406,6 +18445,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -18488,12 +18528,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1978
+size: 1998
 location: clients/tests/test-client.py:test_004()/277
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1819 bytes
+stdout: 1839 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18518,6 +18558,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -18579,12 +18620,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1988
+size: 2008
 location: clients/tests/test-client.py:test_004()/278
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1819 bytes
+stdout: 1839 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18609,6 +18650,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -21200,15 +21242,15 @@ connection.type:802-11-wireless
 connection.interface-name:
 
 <<<
-size: 3277
+size: 3295
 location: clients/tests/test-client.py:test_004()/323
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3130 bytes
+stdout: 3148 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
@@ -21229,15 +21271,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3300
+size: 3318
 location: clients/tests/test-client.py:test_004()/324
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3143 bytes
+stdout: 3161 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
@@ -21258,15 +21300,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3277
+size: 3295
 location: clients/tests/test-client.py:test_004()/325
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3130 bytes
+stdout: 3148 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
@@ -21287,15 +21329,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3300
+size: 3318
 location: clients/tests/test-client.py:test_004()/326
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3143 bytes
+stdout: 3161 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
@@ -21316,15 +21358,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2525
+size: 2543
 location: clients/tests/test-client.py:test_004()/327
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2371 bytes
+stdout: 2389 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
@@ -21340,15 +21382,15 @@ proxy  none    no            --       --
 
 
 <<<
-size: 2537
+size: 2555
 location: clients/tests/test-client.py:test_004()/328
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2373 bytes
+stdout: 2391 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
@@ -22854,15 +22896,15 @@ interface-name
 
 
 <<<
-size: 3289
+size: 3307
 location: clients/tests/test-client.py:test_004()/373
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3130 bytes
+stdout: 3148 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
@@ -22883,15 +22925,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3312
+size: 3330
 location: clients/tests/test-client.py:test_004()/374
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3143 bytes
+stdout: 3161 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
@@ -22912,15 +22954,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3289
+size: 3307
 location: clients/tests/test-client.py:test_004()/375
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3130 bytes
+stdout: 3148 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
@@ -22941,15 +22983,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3312
+size: 3330
 location: clients/tests/test-client.py:test_004()/376
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3143 bytes
+stdout: 3161 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
@@ -22970,15 +23012,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2537
+size: 2555
 location: clients/tests/test-client.py:test_004()/377
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2371 bytes
+stdout: 2389 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
@@ -22994,15 +23036,15 @@ proxy  none    no            --       --
 
 
 <<<
-size: 2549
+size: 2567
 location: clients/tests/test-client.py:test_004()/378
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2373 bytes
+stdout: 2391 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
@@ -24508,19 +24550,19 @@ interface-name
 
 
 <<<
-size: 5193
+size: 5220
 location: clients/tests/test-client.py:test_004()/423
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5037 bytes
+stdout: 5064 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24550,19 +24592,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5249
+size: 5276
 location: clients/tests/test-client.py:test_004()/424
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5083 bytes
+stdout: 5110 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24592,19 +24634,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5193
+size: 5220
 location: clients/tests/test-client.py:test_004()/425
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5037 bytes
+stdout: 5064 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24634,19 +24676,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5249
+size: 5276
 location: clients/tests/test-client.py:test_004()/426
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5083 bytes
+stdout: 5110 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24676,19 +24718,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3849
+size: 3876
 location: clients/tests/test-client.py:test_004()/427
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3686 bytes
+stdout: 3713 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24708,19 +24750,19 @@ proxy  none    no            --       --
 
 
 <<<
-size: 3872
+size: 3899
 location: clients/tests/test-client.py:test_004()/428
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3699 bytes
+stdout: 3726 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26816,19 +26858,19 @@ interface-name
 
 
 <<<
-size: 5205
+size: 5232
 location: clients/tests/test-client.py:test_004()/473
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5037 bytes
+stdout: 5064 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26858,19 +26900,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5261
+size: 5288
 location: clients/tests/test-client.py:test_004()/474
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5083 bytes
+stdout: 5110 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26900,19 +26942,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5205
+size: 5232
 location: clients/tests/test-client.py:test_004()/475
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5037 bytes
+stdout: 5064 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26942,19 +26984,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5261
+size: 5288
 location: clients/tests/test-client.py:test_004()/476
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5083 bytes
+stdout: 5110 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26984,19 +27026,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3861
+size: 3888
 location: clients/tests/test-client.py:test_004()/477
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3686 bytes
+stdout: 3713 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27016,19 +27058,19 @@ proxy  none    no            --       --
 
 
 <<<
-size: 3884
+size: 3911
 location: clients/tests/test-client.py:test_004()/478
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3699 bytes
+stdout: 3726 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -29124,14 +29166,14 @@ interface-name
 
 
 <<<
-size: 804
+size: 805
 location: clients/tests/test-client.py:test_004()/523
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 650 bytes
+stdout: 651 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -29140,14 +29182,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 814
+size: 815
 location: clients/tests/test-client.py:test_004()/524
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 650 bytes
+stdout: 651 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -29156,14 +29198,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 804
+size: 805
 location: clients/tests/test-client.py:test_004()/525
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 650 bytes
+stdout: 651 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -29172,14 +29214,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 814
+size: 815
 location: clients/tests/test-client.py:test_004()/526
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 650 bytes
+stdout: 651 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -29188,28 +29230,28 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 516
+size: 517
 location: clients/tests/test-client.py:test_004()/527
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 355 bytes
+stdout: 356 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
-size: 526
+size: 527
 location: clients/tests/test-client.py:test_004()/528
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 355 bytes
+stdout: 356 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -30062,14 +30104,14 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA
 
 
 <<<
-size: 816
+size: 817
 location: clients/tests/test-client.py:test_004()/573
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 650 bytes
+stdout: 651 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -30078,14 +30120,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 826
+size: 827
 location: clients/tests/test-client.py:test_004()/574
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 650 bytes
+stdout: 651 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -30094,14 +30136,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 816
+size: 817
 location: clients/tests/test-client.py:test_004()/575
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 650 bytes
+stdout: 651 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -30110,14 +30152,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 826
+size: 827
 location: clients/tests/test-client.py:test_004()/576
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 650 bytes
+stdout: 651 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -30126,28 +30168,28 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 528
+size: 529
 location: clients/tests/test-client.py:test_004()/577
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 355 bytes
+stdout: 356 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
-size: 538
+size: 539
 location: clients/tests/test-client.py:test_004()/578
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 355 bytes
+stdout: 356 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -31000,12 +31042,12 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA
 
 
 <<<
-size: 5080
+size: 5123
 location: clients/tests/test-client.py:test_004()/623
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4974 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31030,6 +31072,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -31112,12 +31155,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5110
+size: 5153
 location: clients/tests/test-client.py:test_004()/624
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4951 bytes
+stdout: 4994 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31142,6 +31185,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -31224,12 +31268,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5080
+size: 5123
 location: clients/tests/test-client.py:test_004()/625
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4974 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31254,6 +31298,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -31336,12 +31381,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5110
+size: 5153
 location: clients/tests/test-client.py:test_004()/626
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4951 bytes
+stdout: 4994 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31366,6 +31411,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -31448,12 +31494,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3956
+size: 3999
 location: clients/tests/test-client.py:test_004()/627
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3800 bytes
+stdout: 3843 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31478,6 +31524,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -31539,12 +31586,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3976
+size: 4019
 location: clients/tests/test-client.py:test_004()/628
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3810 bytes
+stdout: 3853 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31569,6 +31616,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -34690,12 +34738,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 5092
+size: 5135
 location: clients/tests/test-client.py:test_004()/673
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4974 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -34720,6 +34768,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -34802,12 +34851,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5122
+size: 5165
 location: clients/tests/test-client.py:test_004()/674
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4951 bytes
+stdout: 4994 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -34832,6 +34881,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -34914,12 +34964,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5092
+size: 5135
 location: clients/tests/test-client.py:test_004()/675
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4931 bytes
+stdout: 4974 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -34944,6 +34994,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -35026,12 +35077,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5122
+size: 5165
 location: clients/tests/test-client.py:test_004()/676
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4951 bytes
+stdout: 4994 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -35056,6 +35107,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -35138,12 +35190,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3968
+size: 4011
 location: clients/tests/test-client.py:test_004()/677
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3800 bytes
+stdout: 3843 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -35168,6 +35220,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -35229,12 +35282,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3988
+size: 4031
 location: clients/tests/test-client.py:test_004()/678
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3810 bytes
+stdout: 3853 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -35259,6 +35312,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -38380,12 +38434,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 6101
+size: 6144
 location: clients/tests/test-client.py:test_004()/723
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5943 bytes
+stdout: 5986 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -38413,6 +38467,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -38505,12 +38560,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6143
+size: 6186
 location: clients/tests/test-client.py:test_004()/724
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5975 bytes
+stdout: 6018 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -38538,6 +38593,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -38630,12 +38686,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6101
+size: 6144
 location: clients/tests/test-client.py:test_004()/725
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5943 bytes
+stdout: 5986 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -38663,6 +38719,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -38755,12 +38812,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6143
+size: 6186
 location: clients/tests/test-client.py:test_004()/726
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5975 bytes
+stdout: 6018 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -38788,6 +38845,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -38880,12 +38938,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4584
+size: 4627
 location: clients/tests/test-client.py:test_004()/727
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4419 bytes
+stdout: 4462 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -38913,6 +38971,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -38979,12 +39038,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4609
+size: 4652
 location: clients/tests/test-client.py:test_004()/728
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4434 bytes
+stdout: 4477 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -39012,6 +39071,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -42772,12 +42832,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6113
+size: 6156
 location: clients/tests/test-client.py:test_004()/773
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5943 bytes
+stdout: 5986 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -42805,6 +42865,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -42897,12 +42958,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6155
+size: 6198
 location: clients/tests/test-client.py:test_004()/774
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5975 bytes
+stdout: 6018 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -42930,6 +42991,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -43022,12 +43084,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6113
+size: 6156
 location: clients/tests/test-client.py:test_004()/775
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5943 bytes
+stdout: 5986 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -43055,6 +43117,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -43147,12 +43210,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6155
+size: 6198
 location: clients/tests/test-client.py:test_004()/776
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5975 bytes
+stdout: 6018 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -43180,6 +43243,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -43272,12 +43336,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4596
+size: 4639
 location: clients/tests/test-client.py:test_004()/777
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4419 bytes
+stdout: 4462 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -43305,6 +43369,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -43371,12 +43436,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4621
+size: 4664
 location: clients/tests/test-client.py:test_004()/778
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4434 bytes
+stdout: 4477 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -43404,6 +43469,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -47164,12 +47230,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 2553
+size: 2573
 location: clients/tests/test-client.py:test_004()/823
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47194,6 +47260,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -47276,12 +47343,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2563
+size: 2583
 location: clients/tests/test-client.py:test_004()/824
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47306,6 +47373,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -47388,12 +47456,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2553
+size: 2573
 location: clients/tests/test-client.py:test_004()/825
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47418,6 +47486,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -47500,12 +47569,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2563
+size: 2583
 location: clients/tests/test-client.py:test_004()/826
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47530,6 +47599,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -47612,12 +47682,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1983
+size: 2003
 location: clients/tests/test-client.py:test_004()/827
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1819 bytes
+stdout: 1839 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47642,6 +47712,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -47703,12 +47774,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1993
+size: 2013
 location: clients/tests/test-client.py:test_004()/828
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1819 bytes
+stdout: 1839 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47733,6 +47804,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -50854,12 +50926,12 @@ connection.type:802-11-wireless
 connection.interface-name:
 
 <<<
-size: 2565
+size: 2585
 location: clients/tests/test-client.py:test_004()/873
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50884,6 +50956,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -50966,12 +51039,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2575
+size: 2595
 location: clients/tests/test-client.py:test_004()/874
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50996,6 +51069,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -51078,12 +51152,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2565
+size: 2585
 location: clients/tests/test-client.py:test_004()/875
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51108,6 +51182,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -51190,12 +51265,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2575
+size: 2595
 location: clients/tests/test-client.py:test_004()/876
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2396 bytes
+stdout: 2416 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51220,6 +51295,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -51302,12 +51378,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1995
+size: 2015
 location: clients/tests/test-client.py:test_004()/877
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1819 bytes
+stdout: 1839 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51332,6 +51408,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -51393,12 +51470,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 2005
+size: 2025
 location: clients/tests/test-client.py:test_004()/878
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1819 bytes
+stdout: 1839 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51423,6 +51500,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index 2e8fa37a2c..7fa768623c 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -63,6 +63,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingConnection,
 	PROP_STABLE_ID,
 	PROP_AUTH_RETRIES,
 	PROP_WAIT_DEVICE_TIMEOUT,
+	PROP_MUD_URL,
 );
 
 typedef struct {
@@ -76,6 +77,7 @@ typedef struct {
 	char *master;
 	char *slave_type;
 	char *zone;
+	char *mud_url;
 	guint64 timestamp;
 	int autoconnect_priority;
 	int autoconnect_retries;
@@ -750,6 +752,23 @@ nm_setting_connection_get_secondary (NMSettingConnection *setting, guint32 idx)
 	return (const char *) g_slist_nth_data (priv->secondaries, idx);
 }
 
+/**
+ * nm_setting_connection_get_mud_url:
+ * @setting: the #NMSettingConnection
+ *
+ * Returns the value contained in the #NMSettingConnection:mud-url
+ * property.
+ **/
+
+const char *
+nm_setting_connection_get_mud_url (NMSettingConnection *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_CONNECTION (setting), NULL);
+
+	return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->mud_url;
+}
+
+
 /**
  * nm_setting_connection_add_secondary:
  * @setting: the #NMSettingConnection
@@ -1222,6 +1241,13 @@ after_interface_name:
 		return NM_SETTING_VERIFY_NORMALIZABLE_ERROR;
 	}
 
+	if (priv->mud_url && !*priv->mud_url) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("property is empty"));
+		g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL);
+		return NM_SETTING_VERIFY_NORMALIZABLE_ERROR;
+	}
+
 	if (normerr_base_type) {
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
@@ -1467,6 +1493,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_WAIT_DEVICE_TIMEOUT:
 		g_value_set_int (value, priv->wait_device_timeout);
 		break;
+        case PROP_MUD_URL:
+		g_value_set_string (value, nm_setting_connection_get_mud_url(setting));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -1562,6 +1591,10 @@ set_property (GObject *object, guint prop_id,
 	case PROP_WAIT_DEVICE_TIMEOUT:
 		priv->wait_device_timeout = g_value_get_int (value);
 		break;
+	case PROP_MUD_URL:
+		g_free (priv->mud_url);
+		priv->mud_url = g_value_dup_string (value);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -2286,6 +2319,30 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	                      G_PARAM_READWRITE |
 	                      G_PARAM_STATIC_STRINGS);
 
+
+	/**
+	 * NMSettingConnection:mud-url:
+	 *
+	 * If configured, set to a Manufacturer Usage Description (MUD) URL that points
+	 * to manufacturer-recommended network policies for IoT devices. It is transmitted
+	 * as a DHCPv4 or DHCPv6 option.
+	 *
+	 **/
+	/* ---ifcfg-rh---
+	 * property: mud-url
+	 * variable: MUD_URL
+	 * values: a valid URL that points to recommended policy for this device
+	 * description: MUD_URL to be sent by device (See RFC 8520).
+	 * example: https://yourdevice.example.com/model.json
+	 * ---end---
+	 */
+
+	obj_properties[PROP_MUD_URL] =
+	    g_param_spec_string (NM_SETTING_CONNECTION_MUD_URL, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_CONNECTION,
diff --git a/libnm-core/nm-setting-connection.h b/libnm-core/nm-setting-connection.h
index b93e9b4d7a..36df389671 100644
--- a/libnm-core/nm-setting-connection.h
+++ b/libnm-core/nm-setting-connection.h
@@ -52,6 +52,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_CONNECTION_MDNS           "mdns"
 #define NM_SETTING_CONNECTION_LLMNR          "llmnr"
 #define NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT "wait-device-timeout"
+#define NM_SETTING_CONNECTION_MUD_URL        "mud-url"
 
 /* Types for property values */
 /**
@@ -204,6 +205,8 @@ NMSettingConnectionLlmnr  nm_setting_connection_get_llmnr (NMSettingConnection *
 NM_AVAILABLE_IN_1_20
 gint32 nm_setting_connection_get_wait_device_timeout (NMSettingConnection *setting);
 
+const char *nm_setting_connection_get_mud_url (NMSettingConnection *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_CONNECTION_H__ */
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index 138702e4ca..7da2479647 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -3334,6 +3334,7 @@ test_connection_diff_a_only (void)
 			{ NM_SETTING_CONNECTION_AUTH_RETRIES,         NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_CONNECTION_MDNS,                 NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_CONNECTION_LLMNR,                NM_SETTING_DIFF_RESULT_IN_A },
+			{ NM_SETTING_CONNECTION_MUD_URL,              NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT,  NM_SETTING_DIFF_RESULT_IN_A },
 			{ NULL, NM_SETTING_DIFF_RESULT_UNKNOWN }
 		} },
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index b5ce8c34a3..e572ccb3b2 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -473,6 +473,7 @@ global:
 	nm_setting_connection_get_id;
 	nm_setting_connection_get_interface_name;
 	nm_setting_connection_get_master;
+	nm_setting_connection_get_mud_url;
 	nm_setting_connection_get_num_permissions;
 	nm_setting_connection_get_num_secondaries;
 	nm_setting_connection_get_permission;
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index c3483e4db7..542b6371f6 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -8427,6 +8427,7 @@ dhcp4_start (NMDevice *self)
 	gs_unref_bytes GBytes *bcast_hwaddr = NULL;
 	gs_unref_bytes GBytes *client_id = NULL;
 	NMConnection *connection;
+	NMSettingConnection *s_connection;
 	GError *error = NULL;
 	const NMPlatformLink *pllink;
 
@@ -8435,6 +8436,9 @@ dhcp4_start (NMDevice *self)
 
 	s_ip4 = nm_connection_get_setting_ip4_config (connection);
 
+	s_connection = nm_connection_get_setting_connection (connection);
+	nm_assert (s_connection);
+
 	/* Clear old exported DHCP options */
 	nm_dbus_object_clear_and_unexport (&priv->dhcp_data_4.config);
 	priv->dhcp_data_4.config = nm_dhcp_config_new (AF_INET);
@@ -8461,6 +8465,7 @@ dhcp4_start (NMDevice *self)
 	                                                      nm_setting_ip_config_get_dhcp_hostname (s_ip4),
 	                                                      nm_setting_ip4_config_get_dhcp_fqdn (NM_SETTING_IP4_CONFIG (s_ip4)),
 	                                                      get_dhcp_hostname_flags (self, AF_INET),
+	                                                      nm_setting_connection_get_mud_url (s_connection),
 	                                                      client_id,
 	                                                      get_dhcp_timeout (self, AF_INET),
 	                                                      priv->dhcp_anycast_address,
@@ -9211,12 +9216,14 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection)
 	GError *error = NULL;
 	guint32 iaid;
 	gboolean iaid_explicit;
-
+	NMSettingConnection *s_connection;
 	const NMPlatformIP6Address *ll_addr = NULL;
 
 	g_assert (connection);
 	s_ip6 = nm_connection_get_setting_ip6_config (connection);
 	g_assert (s_ip6);
+	s_connection = nm_connection_get_setting_connection (connection);
+	nm_assert (s_connection);
 
 	if (priv->ext_ip6_config_captured) {
 		ll_addr = nm_ip6_config_find_first_address (priv->ext_ip6_config_captured,
@@ -9251,6 +9258,7 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection)
 	                                                      nm_setting_ip_config_get_dhcp_send_hostname (s_ip6),
 	                                                      nm_setting_ip_config_get_dhcp_hostname (s_ip6),
 	                                                      get_dhcp_hostname_flags (self, AF_INET6),
+	                                                      nm_setting_connection_get_mud_url (s_connection),
 	                                                      duid,
 	                                                      enforce_duid,
 	                                                      iaid,
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
index 90a64acac5..b3c9fa88f5 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/dhcp/nm-dhcp-client.c
@@ -50,6 +50,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDhcpClient,
 	PROP_IAID_EXPLICIT,
 	PROP_HOSTNAME,
 	PROP_HOSTNAME_FLAGS,
+	PROP_MUDURL,
 );
 
 typedef struct _NMDhcpClientPrivate {
@@ -60,6 +61,7 @@ typedef struct _NMDhcpClientPrivate {
 	char *       uuid;
 	GBytes *     client_id;
 	char *       hostname;
+	char *       mudurl;
 	pid_t        pid;
 	guint        timeout_id;
 	guint        watch_id;
@@ -312,6 +314,14 @@ nm_dhcp_client_get_use_fqdn (NMDhcpClient *self)
 	return NM_DHCP_CLIENT_GET_PRIVATE (self)->use_fqdn;
 }
 
+const char *
+nm_dhcp_client_get_mudurl (NMDhcpClient *self)
+{
+	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL);
+
+	return NM_DHCP_CLIENT_GET_PRIVATE (self)->mudurl;
+}
+
 /*****************************************************************************/
 
 static const char *state_table[NM_DHCP_STATE_MAX + 1] = {
@@ -970,6 +980,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_HOSTNAME:
 		g_value_set_string (value, priv->hostname);
 		break;
+	case PROP_MUDURL:
+		g_value_set_string (value, priv->mudurl);
+		break;
 	case PROP_ROUTE_METRIC:
 		g_value_set_uint (value, priv->route_metric);
 		break;
@@ -1052,6 +1065,10 @@ set_property (GObject *object, guint prop_id,
 		/* construct-only */
 		priv->hostname_flags = g_value_get_uint (value);
 		break;
+	case PROP_MUDURL:
+		/* construct-only */
+		priv->mudurl = g_value_dup_string (value);
+		break;
 	case PROP_ROUTE_TABLE:
 		priv->route_table = g_value_get_uint (value);
 		break;
@@ -1191,6 +1208,12 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class)
 	                       G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
 	                       G_PARAM_STATIC_STRINGS);
 
+	obj_properties[PROP_MUDURL] =
+	    g_param_spec_string (NM_DHCP_CLIENT_MUDURL, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+	                         G_PARAM_STATIC_STRINGS);
+
 	obj_properties[PROP_ROUTE_TABLE] =
 	    g_param_spec_uint (NM_DHCP_CLIENT_ROUTE_TABLE, "", "",
 	                       0, G_MAXUINT32, RT_TABLE_MAIN,
diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h
index 1ff09067e8..eb49488ede 100644
--- a/src/dhcp/nm-dhcp-client.h
+++ b/src/dhcp/nm-dhcp-client.h
@@ -30,6 +30,7 @@
 #define NM_DHCP_CLIENT_INTERFACE        "iface"
 #define NM_DHCP_CLIENT_MULTI_IDX        "multi-idx"
 #define NM_DHCP_CLIENT_HOSTNAME         "hostname"
+#define NM_DHCP_CLIENT_MUDURL           "mudurl"
 #define NM_DHCP_CLIENT_ROUTE_METRIC     "route-metric"
 #define NM_DHCP_CLIENT_ROUTE_TABLE      "route-table"
 #define NM_DHCP_CLIENT_TIMEOUT          "timeout"
@@ -141,6 +142,7 @@ gboolean nm_dhcp_client_get_iaid_explicit (NMDhcpClient *self);
 GBytes *nm_dhcp_client_get_client_id (NMDhcpClient *self);
 
 const char *nm_dhcp_client_get_hostname (NMDhcpClient *self);
+const char *nm_dhcp_client_get_mudurl (NMDhcpClient *self);
 
 NMDhcpHostnameFlags nm_dhcp_client_get_hostname_flags (NMDhcpClient *self);
 
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c
index da28abad0d..bc80b54e77 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp/nm-dhcp-dhclient-utils.c
@@ -33,6 +33,13 @@
 #define ALSOREQ_TAG "also request "
 #define REQ_TAG "request "
 
+#define MUDURLv4_DEF    "option mudurl code 161 = text;\n"
+#define MUDURLv4_FMT    "send mudurl \"%s\";\n"
+
+#define MUDURLv6_DEF    "option dhcp6.mudurl code 112 = text;\n"
+#define MUDURLv6_FMT    "send dhcp6.mudurl \"%s\";\n"
+
+
 static void
 add_request (GPtrArray *array, const char *item)
 {
@@ -183,6 +190,19 @@ add_hostname6 (GString *str,
 	}
 }
 
+static void add_mudurl_config(GString *str, const char *mudurl, int addr_family) {
+	if (mudurl) {
+	        if (addr_family == AF_INET) {
+	                g_string_append (str, MUDURLv4_DEF);
+	                g_string_append_printf (str, MUDURLv4_FMT, mudurl);
+		} else {
+		        g_string_append (str, MUDURLv6_DEF);
+		        g_string_append_printf (str, MUDURLv6_FMT, mudurl);
+		}
+	}
+}
+
+
 static GBytes *
 read_client_id (const char *str)
 {
@@ -286,6 +306,7 @@ nm_dhcp_dhclient_create_config (const char *interface,
                                 guint32 timeout,
                                 gboolean use_fqdn,
                                 NMDhcpHostnameFlags hostname_flags,
+				const char *mudurl,
                                 const char *orig_path,
                                 const char *orig_contents,
                                 GBytes **out_new_client_id)
@@ -451,8 +472,9 @@ nm_dhcp_dhclient_create_config (const char *interface,
 		g_string_append_printf (new_contents, "timeout %u;\n", timeout);
 	}
 
+	add_mudurl_config(new_contents,mudurl,addr_family);
 	if (addr_family == AF_INET) {
-		add_ip4_config (new_contents, client_id, hostname, use_fqdn, hostname_flags);
+	  add_ip4_config (new_contents, client_id, hostname, use_fqdn, hostname_flags);
 		add_request (reqs, "rfc3442-classless-static-routes");
 		add_request (reqs, "ms-classless-static-routes");
 		add_request (reqs, "static-routes");
@@ -460,7 +482,7 @@ nm_dhcp_dhclient_create_config (const char *interface,
 		add_request (reqs, "ntp-servers");
 		add_request (reqs, "root-path");
 	} else {
-		add_hostname6 (new_contents, hostname, hostname_flags);
+	  add_hostname6 (new_contents, hostname, hostname_flags);
 		add_request (reqs, "dhcp6.name-servers");
 		add_request (reqs, "dhcp6.domain-search");
 
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.h b/src/dhcp/nm-dhcp-dhclient-utils.h
index 0cf538872c..20ea8d6852 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.h
+++ b/src/dhcp/nm-dhcp-dhclient-utils.h
@@ -17,6 +17,7 @@ char *nm_dhcp_dhclient_create_config (const char *interface,
                                       guint32 timeout,
                                       gboolean use_fqdn,
                                       NMDhcpHostnameFlags hostname_flags,
+                                      const char *mudurl,
                                       const char *orig_path,
                                       const char *orig_contents,
                                       GBytes **out_new_client_id);
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c
index 617ce2366f..5075702254 100644
--- a/src/dhcp/nm-dhcp-dhclient.c
+++ b/src/dhcp/nm-dhcp-dhclient.c
@@ -147,6 +147,7 @@ merge_dhclient_config (NMDhcpDhclient *self,
                        guint32 timeout,
                        gboolean use_fqdn,
                        NMDhcpHostnameFlags hostname_flags,
+                       const char *mudurl,
                        const char *orig_path,
                        GBytes **out_new_client_id,
                        GError **error)
@@ -176,6 +177,7 @@ merge_dhclient_config (NMDhcpDhclient *self,
 	                                      timeout,
 	                                      use_fqdn,
 	                                      hostname_flags,
+	                                      mudurl,
 	                                      orig_path,
 	                                      orig,
 	                                      out_new_client_id);
@@ -268,6 +270,7 @@ create_dhclient_config (NMDhcpDhclient *self,
                         guint32 timeout,
                         gboolean use_fqdn,
                         NMDhcpHostnameFlags hostname_flags,
+			const char *mudurl,
                         GBytes **out_new_client_id)
 {
 	gs_free char *orig = NULL;
@@ -296,6 +299,7 @@ create_dhclient_config (NMDhcpDhclient *self,
 	                            timeout,
 	                            use_fqdn,
 	                            hostname_flags,
+	                            mudurl,
 	                            orig,
 	                            out_new_client_id,
 	                            &error)) {
@@ -496,6 +500,7 @@ ip4_start (NMDhcpClient *client,
 	                                          nm_dhcp_client_get_timeout (client),
 	                                          nm_dhcp_client_get_use_fqdn (client),
 	                                          nm_dhcp_client_get_hostname_flags (client),
+	                                          nm_dhcp_client_get_mudurl (client),
 	                                          &new_client_id);
 	if (!priv->conf_file) {
 		nm_utils_error_set_literal (error,
@@ -540,6 +545,7 @@ ip6_start (NMDhcpClient *client,
 	                                          nm_dhcp_client_get_timeout (client),
 	                                          TRUE,
 	                                          nm_dhcp_client_get_hostname_flags (client),
+	                                          nm_dhcp_client_get_mudurl (client),
 	                                          NULL);
 	if (!priv->conf_file) {
 		nm_utils_error_set_literal (error,
diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c
index 333744dd31..273e229a94 100644
--- a/src/dhcp/nm-dhcp-manager.c
+++ b/src/dhcp/nm-dhcp-manager.c
@@ -220,6 +220,7 @@ client_start (NMDhcpManager *self,
               const char *hostname,
               gboolean hostname_use_fqdn,
               NMDhcpHostnameFlags hostname_flags,
+              const char *mudurl,
               gboolean info_only,
               NMSettingIP6ConfigPrivacy privacy,
               const char *last_ip4_address,
@@ -303,6 +304,7 @@ client_start (NMDhcpManager *self,
 	                       NM_DHCP_CLIENT_IAID, (guint) iaid,
 	                       NM_DHCP_CLIENT_IAID_EXPLICIT, iaid_explicit,
 	                       NM_DHCP_CLIENT_HOSTNAME, hostname,
+	                       NM_DHCP_CLIENT_MUDURL, mudurl,
 	                       NM_DHCP_CLIENT_ROUTE_TABLE, (guint) route_table,
 	                       NM_DHCP_CLIENT_ROUTE_METRIC, (guint) route_metric,
 	                       NM_DHCP_CLIENT_TIMEOUT, (guint) timeout,
@@ -382,6 +384,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self,
                            const char *dhcp_hostname,
                            const char *dhcp_fqdn,
                            NMDhcpHostnameFlags hostname_flags,
+                           const char *mudurl,
                            GBytes *dhcp_client_id,
                            guint32 timeout,
                            const char *dhcp_anycast_addr,
@@ -440,6 +443,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self,
 	                     hostname,
 	                     use_fqdn,
 	                     hostname_flags,
+	                     mudurl,
 	                     FALSE,
 	                     0,
 	                     last_ip_address,
@@ -462,6 +466,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self,
                            gboolean send_hostname,
                            const char *dhcp_hostname,
                            NMDhcpHostnameFlags hostname_flags,
+                           const char *mudurl,
                            GBytes *duid,
                            gboolean enforce_duid,
                            guint32 iaid,
@@ -503,6 +508,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self,
 	                     hostname,
 	                     TRUE,
 	                     hostname_flags,
+	                     mudurl,
 	                     info_only,
 	                     privacy,
 	                     NULL,
diff --git a/src/dhcp/nm-dhcp-manager.h b/src/dhcp/nm-dhcp-manager.h
index 1b793c22f8..516c326821 100644
--- a/src/dhcp/nm-dhcp-manager.h
+++ b/src/dhcp/nm-dhcp-manager.h
@@ -43,6 +43,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip4     (NMDhcpManager *manager,
                                               const char *dhcp_hostname,
                                               const char *dhcp_fqdn,
                                               NMDhcpHostnameFlags hostname_flags,
+                                              const char *mudurl,
                                               GBytes *dhcp_client_id,
                                               guint32 timeout,
                                               const char *dhcp_anycast_addr,
@@ -62,6 +63,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip6     (NMDhcpManager *manager,
                                               gboolean send_hostname,
                                               const char *dhcp_hostname,
                                               NMDhcpHostnameFlags hostname_flags,
+                                              const char *mudurl,
                                               GBytes *duid,
                                               gboolean enforce_duid,
                                               guint32 iaid,
diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c
index 00b416da3a..75eff17a23 100644
--- a/src/dhcp/nm-dhcp-nettools.c
+++ b/src/dhcp/nm-dhcp-nettools.c
@@ -1285,6 +1285,7 @@ ip4_start (NMDhcpClient *client,
 	gs_free char *lease_file = NULL;
 	struct in_addr last_addr = { 0 };
 	const char *hostname;
+	const char *mudurl;
 	int r, i;
 
 	g_return_val_if_fail (!priv->probe, FALSE);
@@ -1341,6 +1342,15 @@ ip4_start (NMDhcpClient *client,
 		}
 	}
 
+	mudurl = nm_dhcp_client_get_mudurl (client);
+	if (mudurl) {
+		r = n_dhcp4_client_probe_config_append_option (config,
+			NM_DHCP_OPTION_DHCP4_MUDURL, mudurl, strlen (mudurl));
+		if ( r ) {
+	                nm_utils_error_set_errno (error, r,
+	                                          "failed to set MUD URL: %s");
+		}
+	}
 	hostname = nm_dhcp_client_get_hostname (client);
 	if (hostname) {
 		if (nm_dhcp_client_get_use_fqdn (client)) {
diff --git a/src/dhcp/nm-dhcp-options.c b/src/dhcp/nm-dhcp-options.c
index 1d391f3e9c..3f677e4441 100644
--- a/src/dhcp/nm-dhcp-options.c
+++ b/src/dhcp/nm-dhcp-options.c
@@ -126,6 +126,7 @@ const NMDhcpOption _nm_dhcp_option_dhcp4_options[] = {
 	REQ (NM_DHCP_OPTION_DHCP4_TFTP_SERVER_ADDRESS,               "tftp_server_address",             FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP4_V4_PORTPARAMS,                     "v4_portparams",                   FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP4_V4_CAPTIVE_PORTAL,                 "v4_captive_portal",               FALSE ),
+	REQ (NM_DHCP_OPTION_DHCP4_MUDURL,                            "mud_url",                   FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP4_LOADER_CONFIGFILE,                 "loader_configfile",               FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP4_LOADER_PATHPREFIX,                 "loader_pathprefix",               FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP4_LOADER_REBOOTTIME,                 "loader_reboottime",               FALSE ),
@@ -182,7 +183,7 @@ const NMDhcpOption _nm_dhcp_option_dhcp6_options[] = {
 	REQ (NM_DHCP_OPTION_DHCP6_DNS_SERVERS,                      "dhcp6_name_servers",  TRUE ),
 	REQ (NM_DHCP_OPTION_DHCP6_DOMAIN_LIST,                      "dhcp6_domain_search", TRUE ),
 	REQ (NM_DHCP_OPTION_DHCP6_SNTP_SERVERS,                     "dhcp6_sntp_servers",  TRUE ),
-
+	REQ (NM_DHCP_OPTION_DHCP6_MUDURL,                           "dhcp6_mud_url",  FALSE ),
 	/* Internal values */
 	REQ (NM_DHCP_OPTION_DHCP6_NM_IP_ADDRESS,                    "ip6_address",         FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP6_NM_PREFIXLEN,                     "ip6_prefixlen",       FALSE ),
diff --git a/src/dhcp/nm-dhcp-options.h b/src/dhcp/nm-dhcp-options.h
index bf9ccd5719..d8995e1045 100644
--- a/src/dhcp/nm-dhcp-options.h
+++ b/src/dhcp/nm-dhcp-options.h
@@ -110,6 +110,7 @@ typedef enum {
 	NM_DHCP_OPTION_DHCP4_TFTP_SERVER_ADDRESS            = 150,
 	NM_DHCP_OPTION_DHCP4_V4_PORTPARAMS                  = 159,
 	NM_DHCP_OPTION_DHCP4_V4_CAPTIVE_PORTAL              = 160,
+	NM_DHCP_OPTION_DHCP4_MUDURL                         = 161,
 	NM_DHCP_OPTION_DHCP4_LOADER_CONFIGFILE              = 209,
 	NM_DHCP_OPTION_DHCP4_LOADER_PATHPREFIX              = 210,
 	NM_DHCP_OPTION_DHCP4_LOADER_REBOOTTIME              = 211,
@@ -159,6 +160,7 @@ typedef enum {
 	NM_DHCP_OPTION_DHCP6_DNS_SERVERS       = 23,
 	NM_DHCP_OPTION_DHCP6_DOMAIN_LIST       = 24,
 	NM_DHCP_OPTION_DHCP6_SNTP_SERVERS      = 31,
+	NM_DHCP_OPTION_DHCP6_MUDURL            = 112,
 	/* Internal values */
 	NM_DHCP_OPTION_DHCP6_NM_IP_ADDRESS     = 1026,
 	NM_DHCP_OPTION_DHCP6_NM_PREFIXLEN      = 1027,
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
index 23862e9e9b..4d3eee7711 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/dhcp/nm-dhcp-systemd.c
@@ -573,6 +573,7 @@ ip4_start (NMDhcpClient *client,
 	size_t client_id_len;
 	struct in_addr last_addr = { 0 };
 	const char *hostname;
+	const char *mudurl;
 	int r, i;
 
 	g_return_val_if_fail (!priv->client4, FALSE);
@@ -688,6 +689,16 @@ ip4_start (NMDhcpClient *client,
 		}
 	}
 
+	mudurl = nm_dhcp_client_get_mudurl (client);
+
+	if ( mudurl ) {
+		r = sd_dhcp_client_set_mud_url (sd_client, mudurl);
+		if (r < 0) {
+			nm_utils_error_set_errno (error, r, "failed to set DHCP MUDURL: %s");
+			return FALSE;
+		}
+	}
+
 	r = sd_dhcp_client_set_callback (sd_client, dhcp_event_cb, client);
 	if (r < 0) {
 		nm_utils_error_set_errno (error, r, "failed to set callback: %s");
diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c
index 761f9cdba6..a5d89e0a76 100644
--- a/src/dhcp/tests/test-dhcp-dhclient.c
+++ b/src/dhcp/tests/test-dhcp-dhclient.c
@@ -21,6 +21,7 @@
 #include "nm-test-utils-core.h"
 
 #define TEST_DIR             NM_BUILD_SRCDIR"/src/dhcp/tests"
+#define TEST_MUDURL          "https://example.com/mud.json"
 
 static void
 test_config (const char *orig,
@@ -33,7 +34,8 @@ test_config (const char *orig,
              const char *dhcp_client_id,
              GBytes *expected_new_client_id,
              const char *iface,
-             const char *anycast_addr)
+             const char *anycast_addr,
+             const char *mudurl)
 {
 	gs_free char *new = NULL;
 	gs_unref_bytes GBytes *client_id = NULL;
@@ -52,6 +54,7 @@ test_config (const char *orig,
 	                                      timeout,
 	                                      use_fqdn,
 	                                      hostname_flags,
+	                                      mudurl,
 	                                      "/path/to/dhclient.conf",
 	                                      orig,
 	                                      &new_client_id);
@@ -100,7 +103,37 @@ test_orig_missing (void)
 	             orig_missing_expected,
 	             AF_INET, NULL, 0, FALSE,
 	             NM_DHCP_HOSTNAME_FLAG_NONE,
-	             NULL, NULL, "eth0", NULL);
+	             NULL, NULL, "eth0", NULL, NULL);
+}
+
+/*****************************************************************************/
+
+
+static const char *orig_missing_add_mudurl_expected = \
+	"# Created by NetworkManager\n"
+	"\n"
+	"option mudurl code 161 = text;\n"
+	"send mudurl \"https://example.com/mud.json\";\n\n"
+	"option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
+	"option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
+	"option wpad code 252 = string;\n"
+	"\n"
+	"also request rfc3442-classless-static-routes;\n"
+	"also request ms-classless-static-routes;\n"
+	"also request static-routes;\n"
+	"also request wpad;\n"
+	"also request ntp-servers;\n"
+	"also request root-path;\n"
+	"\n";
+
+static void
+test_orig_missing_add_mudurl (void)
+{
+	test_config (NULL,
+	             orig_missing_add_mudurl_expected,
+	             AF_INET, NULL, 0, FALSE,
+	             NM_DHCP_HOSTNAME_FLAG_NONE,
+	             NULL, NULL, "eth0", NULL, TEST_MUDURL);
 }
 
 /*****************************************************************************/
@@ -135,6 +168,7 @@ test_override_client_id (void)
 	             "11:22:33:44:55:66",
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -166,6 +200,7 @@ test_quote_client_id (void)
 	             "abcd",
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -197,6 +232,7 @@ test_quote_client_id_2 (void)
 	             "a\\bc",
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -228,6 +264,7 @@ test_hex_zero_client_id (void)
 	             "00:11:22:33",
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -259,6 +296,7 @@ test_ascii_client_id (void)
 	             "qb:cd:ef:12:34:56",
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -290,6 +328,7 @@ test_hex_single_client_id (void)
 	             "ab:cd:e:12:34:56",
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -329,6 +368,7 @@ test_existing_hex_client_id (void)
 	             NULL,
 	             new_client_id,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -367,6 +407,7 @@ test_existing_escaped_client_id (void)
 	             NULL,
 	             new_client_id,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -409,6 +450,7 @@ test_existing_ascii_client_id (void)
 	             NULL,
 	             new_client_id,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 /*****************************************************************************/
@@ -443,6 +485,7 @@ test_fqdn (void)
 	             NULL,
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -486,6 +529,7 @@ test_fqdn_options_override (void)
 	             TRUE, NULL,
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -521,6 +565,7 @@ test_override_hostname (void)
 	             NULL,
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -550,6 +595,7 @@ test_override_hostname6 (void)
 	             NULL,
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -576,6 +622,7 @@ test_nonfqdn_hostname6 (void)
 	             NULL,
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -613,6 +660,7 @@ test_existing_alsoreq (void)
 	             NULL,
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -653,6 +701,7 @@ test_existing_req (void)
 	             NULL,
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -694,6 +743,7 @@ test_existing_multiline_alsoreq (void)
 	             NULL,
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -934,6 +984,7 @@ test_interface1 (void)
 	             NULL,
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -981,6 +1032,7 @@ test_interface2 (void)
 	             NULL,
 	             NULL,
 	             "eth1",
+	             NULL,
 	             NULL);
 }
 
@@ -1093,6 +1145,7 @@ test_structured (void)
 	             NULL,
 	             new_client_id,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -1149,6 +1202,7 @@ test_config_req_intf (void)
 	             NULL,
 	             NULL,
 	             "eth0",
+	             NULL,
 	             NULL);
 }
 
@@ -1162,6 +1216,7 @@ main (int argc, char **argv)
 	nmtst_init_with_logging (&argc, &argv, NULL, "DEFAULT");
 
 	g_test_add_func ("/dhcp/dhclient/orig_missing", test_orig_missing);
+	g_test_add_func ("/dhcp/dhclient/orig_missing_add_mudurl", test_orig_missing_add_mudurl);
 	g_test_add_func ("/dhcp/dhclient/override_client_id", test_override_client_id);
 	g_test_add_func ("/dhcp/dhclient/quote_client_id/1", test_quote_client_id);
 	g_test_add_func ("/dhcp/dhclient/quote_client_id/2", test_quote_client_id_2);
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index fdc0d4a4ac..6320e722c0 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -64,6 +64,7 @@ static struct {
 	char *dhcp4_clientid;
 	char *dhcp4_hostname;
 	char *dhcp4_fqdn;
+	char *mud_url;
 	char *iid_str;
 	NMSettingIP6ConfigAddrGenMode addr_gen_mode;
 	char *logging_backend;
@@ -523,6 +524,7 @@ main (int argc, char *argv[])
 		                                          global_opt.dhcp4_hostname,
 		                                          global_opt.dhcp4_fqdn,
 		                                          NM_DHCP_HOSTNAME_FLAGS_FQDN_DEFAULT_IP4,
+		                                          global_opt.mud_url,
 		                                          client_id,
 		                                          NM_DHCP_TIMEOUT_DEFAULT,
 		                                          NULL,
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 8e15341238..a16d9de0f7 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -582,6 +582,11 @@ make_connection_setting (const char *file,
 			g_object_set (s_con, NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT, (int) vint64, NULL);
 	}
 
+	nm_clear_g_free (&value);
+	v = svGetValueStr (ifcfg, "MUD_URL", &value);
+	if (v)
+		g_object_set (s_con, NM_SETTING_CONNECTION_MUD_URL, v, NULL);
+
 	i_val = NM_SETTING_CONNECTION_MDNS_DEFAULT;
 	if (!svGetValueEnum (ifcfg, "MDNS",
 	                     nm_setting_connection_mdns_get_type (),
@@ -2204,6 +2209,7 @@ make_ip6_setting (shvarFile *ifcfg,
 		if (v && !strchr (v, '.'))
 			v = NULL;
 	}
+
 	if (v)
 		g_object_set (s_ip6, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, v, NULL);
 
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
index d324361756..92e49caa51 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
@@ -893,6 +893,7 @@ const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[] = {
 	_KEY_TYPE ("METRIC",                                      NMS_IFCFG_KEY_TYPE_IS_NUMBERED ),
 	_KEY_TYPE ("MODE",                                        NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("MTU",                                         NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
+	_KEY_TYPE ("MUD_URL",                                     NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("MULTI_CONNECT",                               NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("MVRP",                                        NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("NAME",                                        NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
index 056d03fabe..25a5c0ac73 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
@@ -33,7 +33,8 @@ typedef struct {
 	NMSIfcfgKeyTypeFlags key_flags;
 } NMSIfcfgKeyTypeInfo;
 
-extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[232];
+/* maybe think about getting rid of the fixed number below at some point.*/
+extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[233];
 
 const NMSIfcfgKeyTypeInfo *nms_ifcfg_well_known_key_find_info (const char *key, gssize *out_idx);
 
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index a0797fdc79..1fd29480d2 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1792,7 +1792,7 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg)
 	NMSettingConnectionMdns mdns;
 	NMSettingConnectionLlmnr llmnr;
 	guint32 vuint32;
-	const char *tmp;
+	const char *tmp, *mud_url;
 
 	svSetValueStr (ifcfg, "NAME", nm_setting_connection_get_id (s_con));
 	svSetValueStr (ifcfg, "UUID", nm_setting_connection_get_uuid (s_con));
@@ -1867,6 +1867,9 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg)
 	svSetValueStr (ifcfg, "TEAM_MASTER_UUID", NULL);
 	svSetValueStr (ifcfg, "TEAM_MASTER", NULL);
 
+	mud_url = nm_setting_connection_get_mud_url (s_con);
+	svSetValueStr (ifcfg, "MUD_URL", mud_url);
+
 	master = nm_setting_connection_get_master (s_con);
 	if (master) {
 		/* The reader prefers the *_UUID variants, however we still try to resolve

From ce282fa3f7208f50ff3a8de4d89e05d20e247e2c Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 09:16:46 +0200
Subject: [PATCH 040/222] systemd: make string argument of
 sd_dhcp6_client_set_request_mud_url() const

See-also: https://github.com/systemd/systemd/pull/15586
---
 src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 +-
 src/systemd/src/systemd/sd-dhcp6-client.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
index 826ad56a9f..02ebb0c201 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
@@ -371,7 +371,7 @@ int sd_dhcp6_client_set_request_option(sd_dhcp6_client *client, uint16_t option)
         return 0;
 }
 
-int sd_dhcp6_client_set_request_mud_url(sd_dhcp6_client *client, char *mudurl) {
+int sd_dhcp6_client_set_request_mud_url(sd_dhcp6_client *client, const char *mudurl) {
 
         assert_return(client, -EINVAL);
         assert_return(client->state == DHCP6_STATE_STOPPED, -EBUSY);
diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h
index 42d4ec752c..091f8287ec 100644
--- a/src/systemd/src/systemd/sd-dhcp6-client.h
+++ b/src/systemd/src/systemd/sd-dhcp6-client.h
@@ -123,7 +123,7 @@ int sd_dhcp6_client_set_request_option(
                 uint16_t option);
 int sd_dhcp6_client_set_request_mud_url(
                 sd_dhcp6_client *client,
-                char *mudurl);
+                const char *mudurl);
 int sd_dhcp6_client_set_prefix_delegation_hint(
                 sd_dhcp6_client *client,
                 uint8_t prefixlen,

From 468c2e01abc111d21fc3dc2e46bbd079b00a1604 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 09:35:12 +0200
Subject: [PATCH 041/222] systemd: add nm_sd_http_url_is_valid() to access
 internal http_url_is_valid()

---
 shared/systemd/nm-sd-utils-shared.c  | 38 ++++++++++++++++++++++++++++
 shared/systemd/nm-sd-utils-shared.h  |  4 +++
 shared/systemd/src/shared/web-util.c | 34 ++++++++++++++-----------
 3 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/shared/systemd/nm-sd-utils-shared.c b/shared/systemd/nm-sd-utils-shared.c
index 85fd6a353e..b4e017c94b 100644
--- a/shared/systemd/nm-sd-utils-shared.c
+++ b/shared/systemd/nm-sd-utils-shared.c
@@ -13,6 +13,7 @@
 #include "hexdecoct.h"
 #include "hostname-util.h"
 #include "path-util.h"
+#include "web-util.h"
 
 /*****************************************************************************/
 
@@ -94,3 +95,40 @@ gboolean nm_sd_hostname_is_valid (const char *s, bool allow_trailing_dot)
 {
 	return hostname_is_valid (s, allow_trailing_dot);
 }
+
+/*****************************************************************************/
+
+static gboolean
+_http_url_is_valid (const char *url)
+{
+	if (   !url
+	    || !url[0])
+		return FALSE;
+
+	if (NM_STR_HAS_PREFIX (url, "http://"))
+		url += NM_STRLEN ("http://");
+	else if (NM_STR_HAS_PREFIX (url, "https://"))
+		url += NM_STRLEN ("https://");
+	else
+		return FALSE;
+
+	if (!url[0])
+		return FALSE;
+
+	return !NM_STRCHAR_ANY (url, ch, (guchar) ch >= 128u);
+}
+
+gboolean
+nm_sd_http_url_is_valid (const char *url)
+{
+	gboolean v;
+
+	/* http_url_is_valid() is part of our API, as we use it to validate connection
+	 * properties. That means, it's behavior must remain stable (or only change
+	 * with care).
+	 *
+	 * Thus, reimplement it, and make sure that our implementation agrees. */
+	v = _http_url_is_valid (url);
+	nm_assert (v == http_url_is_valid (url));
+	return v;
+}
diff --git a/shared/systemd/nm-sd-utils-shared.h b/shared/systemd/nm-sd-utils-shared.h
index 3495a31d19..382db278d1 100644
--- a/shared/systemd/nm-sd-utils-shared.h
+++ b/shared/systemd/nm-sd-utils-shared.h
@@ -34,4 +34,8 @@ int nm_sd_dns_name_to_wire_format (const char *domain,
 int nm_sd_dns_name_is_valid (const char *s);
 gboolean nm_sd_hostname_is_valid(const char *s, bool allow_trailing_dot);
 
+/*****************************************************************************/
+
+gboolean nm_sd_http_url_is_valid (const char *url);
+
 #endif /* __NM_SD_UTILS_SHARED_H__ */
diff --git a/shared/systemd/src/shared/web-util.c b/shared/systemd/src/shared/web-util.c
index f5a5362bd5..4cff5e271d 100644
--- a/shared/systemd/src/shared/web-util.c
+++ b/shared/systemd/src/shared/web-util.c
@@ -24,21 +24,25 @@ bool http_etag_is_valid(const char *etag) {
 }
 #endif /* NM_IGNORED */
 
-bool http_url_is_valid(const char *url) {
-        const char *p;
-
-        if (isempty(url))
-                return false;
-
-        p = STARTSWITH_SET(url, "http://", "https://");
-        if (!p)
-                return false;
-
-        if (isempty(p))
-                return false;
-
-        return ascii_is_valid(p);
-}
+/* NM: we use http_url_is_valid() for our own code, and it must not
+ * change behavior. If a re-import results in a merge-conflict, you must
+ * ensure that it does not change behavior, and possibly do something
+ * about that. */
+/**/   bool http_url_is_valid(const char *url) {
+/**/           const char *p;
+/**/
+/**/           if (isempty(url))
+/**/                   return false;
+/**/
+/**/           p = STARTSWITH_SET(url, "http://", "https://");
+/**/           if (!p)
+/**/                   return false;
+/**/
+/**/           if (isempty(p))
+/**/                   return false;
+/**/
+/**/           return ascii_is_valid(p);
+/**/   }
 
 #if 0 /* NM_IGNORED */
 bool documentation_url_is_valid(const char *url) {

From db645623eedf55bd7ad612cb77c73f8e22a1fe34 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 08:12:24 +0200
Subject: [PATCH 042/222] dhcp: rename mudurl to mud_url

---
 libnm-core/nm-setting-connection.c            |  1 -
 src/dhcp/nm-dhcp-client.c                     | 20 ++++++++--------
 src/dhcp/nm-dhcp-client.h                     |  4 ++--
 src/dhcp/nm-dhcp-dhclient-utils.c             | 24 +++++++++----------
 src/dhcp/nm-dhcp-dhclient-utils.h             |  2 +-
 src/dhcp/nm-dhcp-dhclient.c                   | 12 +++++-----
 src/dhcp/nm-dhcp-manager.c                    | 12 +++++-----
 src/dhcp/nm-dhcp-manager.h                    |  4 ++--
 src/dhcp/nm-dhcp-nettools.c                   | 16 +++++++------
 src/dhcp/nm-dhcp-options.c                    |  5 ++--
 src/dhcp/nm-dhcp-options.h                    |  4 ++--
 src/dhcp/nm-dhcp-systemd.c                    |  9 ++++---
 src/dhcp/tests/test-dhcp-dhclient.c           | 12 +++++-----
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |  1 -
 14 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index 7fa768623c..db05caf633 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -768,7 +768,6 @@ nm_setting_connection_get_mud_url (NMSettingConnection *setting)
 	return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->mud_url;
 }
 
-
 /**
  * nm_setting_connection_add_secondary:
  * @setting: the #NMSettingConnection
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
index b3c9fa88f5..8e50a8f99f 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/dhcp/nm-dhcp-client.c
@@ -50,7 +50,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDhcpClient,
 	PROP_IAID_EXPLICIT,
 	PROP_HOSTNAME,
 	PROP_HOSTNAME_FLAGS,
-	PROP_MUDURL,
+	PROP_MUD_URL,
 );
 
 typedef struct _NMDhcpClientPrivate {
@@ -61,7 +61,7 @@ typedef struct _NMDhcpClientPrivate {
 	char *       uuid;
 	GBytes *     client_id;
 	char *       hostname;
-	char *       mudurl;
+	char *       mud_url;
 	pid_t        pid;
 	guint        timeout_id;
 	guint        watch_id;
@@ -315,11 +315,11 @@ nm_dhcp_client_get_use_fqdn (NMDhcpClient *self)
 }
 
 const char *
-nm_dhcp_client_get_mudurl (NMDhcpClient *self)
+nm_dhcp_client_get_mud_url (NMDhcpClient *self)
 {
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL);
 
-	return NM_DHCP_CLIENT_GET_PRIVATE (self)->mudurl;
+	return NM_DHCP_CLIENT_GET_PRIVATE (self)->mud_url;
 }
 
 /*****************************************************************************/
@@ -980,8 +980,8 @@ get_property (GObject *object, guint prop_id,
 	case PROP_HOSTNAME:
 		g_value_set_string (value, priv->hostname);
 		break;
-	case PROP_MUDURL:
-		g_value_set_string (value, priv->mudurl);
+	case PROP_MUD_URL:
+		g_value_set_string (value, priv->mud_url);
 		break;
 	case PROP_ROUTE_METRIC:
 		g_value_set_uint (value, priv->route_metric);
@@ -1065,9 +1065,9 @@ set_property (GObject *object, guint prop_id,
 		/* construct-only */
 		priv->hostname_flags = g_value_get_uint (value);
 		break;
-	case PROP_MUDURL:
+	case PROP_MUD_URL:
 		/* construct-only */
-		priv->mudurl = g_value_dup_string (value);
+		priv->mud_url = g_value_dup_string (value);
 		break;
 	case PROP_ROUTE_TABLE:
 		priv->route_table = g_value_get_uint (value);
@@ -1208,8 +1208,8 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class)
 	                       G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
 	                       G_PARAM_STATIC_STRINGS);
 
-	obj_properties[PROP_MUDURL] =
-	    g_param_spec_string (NM_DHCP_CLIENT_MUDURL, "", "",
+	obj_properties[PROP_MUD_URL] =
+	    g_param_spec_string (NM_DHCP_CLIENT_MUD_URL, "", "",
 	                         NULL,
 	                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
 	                         G_PARAM_STATIC_STRINGS);
diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h
index eb49488ede..479ea000a9 100644
--- a/src/dhcp/nm-dhcp-client.h
+++ b/src/dhcp/nm-dhcp-client.h
@@ -30,7 +30,7 @@
 #define NM_DHCP_CLIENT_INTERFACE        "iface"
 #define NM_DHCP_CLIENT_MULTI_IDX        "multi-idx"
 #define NM_DHCP_CLIENT_HOSTNAME         "hostname"
-#define NM_DHCP_CLIENT_MUDURL           "mudurl"
+#define NM_DHCP_CLIENT_MUD_URL          "mud-url"
 #define NM_DHCP_CLIENT_ROUTE_METRIC     "route-metric"
 #define NM_DHCP_CLIENT_ROUTE_TABLE      "route-table"
 #define NM_DHCP_CLIENT_TIMEOUT          "timeout"
@@ -142,7 +142,7 @@ gboolean nm_dhcp_client_get_iaid_explicit (NMDhcpClient *self);
 GBytes *nm_dhcp_client_get_client_id (NMDhcpClient *self);
 
 const char *nm_dhcp_client_get_hostname (NMDhcpClient *self);
-const char *nm_dhcp_client_get_mudurl (NMDhcpClient *self);
+const char *nm_dhcp_client_get_mud_url (NMDhcpClient *self);
 
 NMDhcpHostnameFlags nm_dhcp_client_get_hostname_flags (NMDhcpClient *self);
 
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c
index bc80b54e77..76fc1a898d 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp/nm-dhcp-dhclient-utils.c
@@ -190,19 +190,19 @@ add_hostname6 (GString *str,
 	}
 }
 
-static void add_mudurl_config(GString *str, const char *mudurl, int addr_family) {
-	if (mudurl) {
-	        if (addr_family == AF_INET) {
-	                g_string_append (str, MUDURLv4_DEF);
-	                g_string_append_printf (str, MUDURLv4_FMT, mudurl);
+static void add_mud_url_config(GString *str, const char *mud_url, int addr_family)
+{
+	if (mud_url) {
+		if (addr_family == AF_INET) {
+			g_string_append (str, MUDURLv4_DEF);
+			g_string_append_printf (str, MUDURLv4_FMT, mud_url);
 		} else {
-		        g_string_append (str, MUDURLv6_DEF);
-		        g_string_append_printf (str, MUDURLv6_FMT, mudurl);
+			g_string_append (str, MUDURLv6_DEF);
+			g_string_append_printf (str, MUDURLv6_FMT, mud_url);
 		}
 	}
 }
 
-
 static GBytes *
 read_client_id (const char *str)
 {
@@ -306,7 +306,7 @@ nm_dhcp_dhclient_create_config (const char *interface,
                                 guint32 timeout,
                                 gboolean use_fqdn,
                                 NMDhcpHostnameFlags hostname_flags,
-				const char *mudurl,
+                                const char *mud_url,
                                 const char *orig_path,
                                 const char *orig_contents,
                                 GBytes **out_new_client_id)
@@ -472,9 +472,9 @@ nm_dhcp_dhclient_create_config (const char *interface,
 		g_string_append_printf (new_contents, "timeout %u;\n", timeout);
 	}
 
-	add_mudurl_config(new_contents,mudurl,addr_family);
+	add_mud_url_config (new_contents, mud_url, addr_family);
 	if (addr_family == AF_INET) {
-	  add_ip4_config (new_contents, client_id, hostname, use_fqdn, hostname_flags);
+		add_ip4_config (new_contents, client_id, hostname, use_fqdn, hostname_flags);
 		add_request (reqs, "rfc3442-classless-static-routes");
 		add_request (reqs, "ms-classless-static-routes");
 		add_request (reqs, "static-routes");
@@ -482,7 +482,7 @@ nm_dhcp_dhclient_create_config (const char *interface,
 		add_request (reqs, "ntp-servers");
 		add_request (reqs, "root-path");
 	} else {
-	  add_hostname6 (new_contents, hostname, hostname_flags);
+		add_hostname6 (new_contents, hostname, hostname_flags);
 		add_request (reqs, "dhcp6.name-servers");
 		add_request (reqs, "dhcp6.domain-search");
 
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.h b/src/dhcp/nm-dhcp-dhclient-utils.h
index 20ea8d6852..5094d614e6 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.h
+++ b/src/dhcp/nm-dhcp-dhclient-utils.h
@@ -17,7 +17,7 @@ char *nm_dhcp_dhclient_create_config (const char *interface,
                                       guint32 timeout,
                                       gboolean use_fqdn,
                                       NMDhcpHostnameFlags hostname_flags,
-                                      const char *mudurl,
+                                      const char *mud_url,
                                       const char *orig_path,
                                       const char *orig_contents,
                                       GBytes **out_new_client_id);
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c
index 5075702254..4ad056e548 100644
--- a/src/dhcp/nm-dhcp-dhclient.c
+++ b/src/dhcp/nm-dhcp-dhclient.c
@@ -147,7 +147,7 @@ merge_dhclient_config (NMDhcpDhclient *self,
                        guint32 timeout,
                        gboolean use_fqdn,
                        NMDhcpHostnameFlags hostname_flags,
-                       const char *mudurl,
+                       const char *mud_url,
                        const char *orig_path,
                        GBytes **out_new_client_id,
                        GError **error)
@@ -177,7 +177,7 @@ merge_dhclient_config (NMDhcpDhclient *self,
 	                                      timeout,
 	                                      use_fqdn,
 	                                      hostname_flags,
-	                                      mudurl,
+	                                      mud_url,
 	                                      orig_path,
 	                                      orig,
 	                                      out_new_client_id);
@@ -270,7 +270,7 @@ create_dhclient_config (NMDhcpDhclient *self,
                         guint32 timeout,
                         gboolean use_fqdn,
                         NMDhcpHostnameFlags hostname_flags,
-			const char *mudurl,
+                        const char *mud_url,
                         GBytes **out_new_client_id)
 {
 	gs_free char *orig = NULL;
@@ -299,7 +299,7 @@ create_dhclient_config (NMDhcpDhclient *self,
 	                            timeout,
 	                            use_fqdn,
 	                            hostname_flags,
-	                            mudurl,
+	                            mud_url,
 	                            orig,
 	                            out_new_client_id,
 	                            &error)) {
@@ -500,7 +500,7 @@ ip4_start (NMDhcpClient *client,
 	                                          nm_dhcp_client_get_timeout (client),
 	                                          nm_dhcp_client_get_use_fqdn (client),
 	                                          nm_dhcp_client_get_hostname_flags (client),
-	                                          nm_dhcp_client_get_mudurl (client),
+	                                          nm_dhcp_client_get_mud_url (client),
 	                                          &new_client_id);
 	if (!priv->conf_file) {
 		nm_utils_error_set_literal (error,
@@ -545,7 +545,7 @@ ip6_start (NMDhcpClient *client,
 	                                          nm_dhcp_client_get_timeout (client),
 	                                          TRUE,
 	                                          nm_dhcp_client_get_hostname_flags (client),
-	                                          nm_dhcp_client_get_mudurl (client),
+	                                          nm_dhcp_client_get_mud_url (client),
 	                                          NULL);
 	if (!priv->conf_file) {
 		nm_utils_error_set_literal (error,
diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c
index 273e229a94..7565bfc8c6 100644
--- a/src/dhcp/nm-dhcp-manager.c
+++ b/src/dhcp/nm-dhcp-manager.c
@@ -220,7 +220,7 @@ client_start (NMDhcpManager *self,
               const char *hostname,
               gboolean hostname_use_fqdn,
               NMDhcpHostnameFlags hostname_flags,
-              const char *mudurl,
+              const char *mud_url,
               gboolean info_only,
               NMSettingIP6ConfigPrivacy privacy,
               const char *last_ip4_address,
@@ -304,7 +304,7 @@ client_start (NMDhcpManager *self,
 	                       NM_DHCP_CLIENT_IAID, (guint) iaid,
 	                       NM_DHCP_CLIENT_IAID_EXPLICIT, iaid_explicit,
 	                       NM_DHCP_CLIENT_HOSTNAME, hostname,
-	                       NM_DHCP_CLIENT_MUDURL, mudurl,
+	                       NM_DHCP_CLIENT_MUD_URL, mud_url,
 	                       NM_DHCP_CLIENT_ROUTE_TABLE, (guint) route_table,
 	                       NM_DHCP_CLIENT_ROUTE_METRIC, (guint) route_metric,
 	                       NM_DHCP_CLIENT_TIMEOUT, (guint) timeout,
@@ -384,7 +384,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self,
                            const char *dhcp_hostname,
                            const char *dhcp_fqdn,
                            NMDhcpHostnameFlags hostname_flags,
-                           const char *mudurl,
+                           const char *mud_url,
                            GBytes *dhcp_client_id,
                            guint32 timeout,
                            const char *dhcp_anycast_addr,
@@ -443,7 +443,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self,
 	                     hostname,
 	                     use_fqdn,
 	                     hostname_flags,
-	                     mudurl,
+	                     mud_url,
 	                     FALSE,
 	                     0,
 	                     last_ip_address,
@@ -466,7 +466,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self,
                            gboolean send_hostname,
                            const char *dhcp_hostname,
                            NMDhcpHostnameFlags hostname_flags,
-                           const char *mudurl,
+                           const char *mud_url,
                            GBytes *duid,
                            gboolean enforce_duid,
                            guint32 iaid,
@@ -508,7 +508,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self,
 	                     hostname,
 	                     TRUE,
 	                     hostname_flags,
-	                     mudurl,
+	                     mud_url,
 	                     info_only,
 	                     privacy,
 	                     NULL,
diff --git a/src/dhcp/nm-dhcp-manager.h b/src/dhcp/nm-dhcp-manager.h
index 516c326821..88435282e3 100644
--- a/src/dhcp/nm-dhcp-manager.h
+++ b/src/dhcp/nm-dhcp-manager.h
@@ -43,7 +43,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip4     (NMDhcpManager *manager,
                                               const char *dhcp_hostname,
                                               const char *dhcp_fqdn,
                                               NMDhcpHostnameFlags hostname_flags,
-                                              const char *mudurl,
+                                              const char *mud_url,
                                               GBytes *dhcp_client_id,
                                               guint32 timeout,
                                               const char *dhcp_anycast_addr,
@@ -63,7 +63,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip6     (NMDhcpManager *manager,
                                               gboolean send_hostname,
                                               const char *dhcp_hostname,
                                               NMDhcpHostnameFlags hostname_flags,
-                                              const char *mudurl,
+                                              const char *mud_url,
                                               GBytes *duid,
                                               gboolean enforce_duid,
                                               guint32 iaid,
diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c
index 75eff17a23..e078cf39b2 100644
--- a/src/dhcp/nm-dhcp-nettools.c
+++ b/src/dhcp/nm-dhcp-nettools.c
@@ -1285,7 +1285,7 @@ ip4_start (NMDhcpClient *client,
 	gs_free char *lease_file = NULL;
 	struct in_addr last_addr = { 0 };
 	const char *hostname;
-	const char *mudurl;
+	const char *mud_url;
 	int r, i;
 
 	g_return_val_if_fail (!priv->probe, FALSE);
@@ -1342,13 +1342,15 @@ ip4_start (NMDhcpClient *client,
 		}
 	}
 
-	mudurl = nm_dhcp_client_get_mudurl (client);
-	if (mudurl) {
+	mud_url = nm_dhcp_client_get_mud_url (client);
+	if (mud_url) {
 		r = n_dhcp4_client_probe_config_append_option (config,
-			NM_DHCP_OPTION_DHCP4_MUDURL, mudurl, strlen (mudurl));
-		if ( r ) {
-	                nm_utils_error_set_errno (error, r,
-	                                          "failed to set MUD URL: %s");
+		                                               NM_DHCP_OPTION_DHCP4_MUD_URL,
+		                                               mud_url,
+		                                               strlen (mud_url));
+		if (r) {
+			nm_utils_error_set_errno (error, r,
+			                          "failed to set MUD URL: %s");
 		}
 	}
 	hostname = nm_dhcp_client_get_hostname (client);
diff --git a/src/dhcp/nm-dhcp-options.c b/src/dhcp/nm-dhcp-options.c
index 3f677e4441..b10635fc67 100644
--- a/src/dhcp/nm-dhcp-options.c
+++ b/src/dhcp/nm-dhcp-options.c
@@ -126,7 +126,7 @@ const NMDhcpOption _nm_dhcp_option_dhcp4_options[] = {
 	REQ (NM_DHCP_OPTION_DHCP4_TFTP_SERVER_ADDRESS,               "tftp_server_address",             FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP4_V4_PORTPARAMS,                     "v4_portparams",                   FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP4_V4_CAPTIVE_PORTAL,                 "v4_captive_portal",               FALSE ),
-	REQ (NM_DHCP_OPTION_DHCP4_MUDURL,                            "mud_url",                   FALSE ),
+	REQ (NM_DHCP_OPTION_DHCP4_MUD_URL,                           "mud_url",                         FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP4_LOADER_CONFIGFILE,                 "loader_configfile",               FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP4_LOADER_PATHPREFIX,                 "loader_pathprefix",               FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP4_LOADER_REBOOTTIME,                 "loader_reboottime",               FALSE ),
@@ -183,7 +183,8 @@ const NMDhcpOption _nm_dhcp_option_dhcp6_options[] = {
 	REQ (NM_DHCP_OPTION_DHCP6_DNS_SERVERS,                      "dhcp6_name_servers",  TRUE ),
 	REQ (NM_DHCP_OPTION_DHCP6_DOMAIN_LIST,                      "dhcp6_domain_search", TRUE ),
 	REQ (NM_DHCP_OPTION_DHCP6_SNTP_SERVERS,                     "dhcp6_sntp_servers",  TRUE ),
-	REQ (NM_DHCP_OPTION_DHCP6_MUDURL,                           "dhcp6_mud_url",  FALSE ),
+	REQ (NM_DHCP_OPTION_DHCP6_MUD_URL,                          "dhcp6_mud_url",       FALSE ),
+
 	/* Internal values */
 	REQ (NM_DHCP_OPTION_DHCP6_NM_IP_ADDRESS,                    "ip6_address",         FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP6_NM_PREFIXLEN,                     "ip6_prefixlen",       FALSE ),
diff --git a/src/dhcp/nm-dhcp-options.h b/src/dhcp/nm-dhcp-options.h
index d8995e1045..7c0121702d 100644
--- a/src/dhcp/nm-dhcp-options.h
+++ b/src/dhcp/nm-dhcp-options.h
@@ -110,7 +110,7 @@ typedef enum {
 	NM_DHCP_OPTION_DHCP4_TFTP_SERVER_ADDRESS            = 150,
 	NM_DHCP_OPTION_DHCP4_V4_PORTPARAMS                  = 159,
 	NM_DHCP_OPTION_DHCP4_V4_CAPTIVE_PORTAL              = 160,
-	NM_DHCP_OPTION_DHCP4_MUDURL                         = 161,
+	NM_DHCP_OPTION_DHCP4_MUD_URL                        = 161,
 	NM_DHCP_OPTION_DHCP4_LOADER_CONFIGFILE              = 209,
 	NM_DHCP_OPTION_DHCP4_LOADER_PATHPREFIX              = 210,
 	NM_DHCP_OPTION_DHCP4_LOADER_REBOOTTIME              = 211,
@@ -160,7 +160,7 @@ typedef enum {
 	NM_DHCP_OPTION_DHCP6_DNS_SERVERS       = 23,
 	NM_DHCP_OPTION_DHCP6_DOMAIN_LIST       = 24,
 	NM_DHCP_OPTION_DHCP6_SNTP_SERVERS      = 31,
-	NM_DHCP_OPTION_DHCP6_MUDURL            = 112,
+	NM_DHCP_OPTION_DHCP6_MUD_URL           = 112,
 	/* Internal values */
 	NM_DHCP_OPTION_DHCP6_NM_IP_ADDRESS     = 1026,
 	NM_DHCP_OPTION_DHCP6_NM_PREFIXLEN      = 1027,
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
index 4d3eee7711..983f4e2a65 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/dhcp/nm-dhcp-systemd.c
@@ -573,7 +573,7 @@ ip4_start (NMDhcpClient *client,
 	size_t client_id_len;
 	struct in_addr last_addr = { 0 };
 	const char *hostname;
-	const char *mudurl;
+	const char *mud_url;
 	int r, i;
 
 	g_return_val_if_fail (!priv->client4, FALSE);
@@ -689,10 +689,9 @@ ip4_start (NMDhcpClient *client,
 		}
 	}
 
-	mudurl = nm_dhcp_client_get_mudurl (client);
-
-	if ( mudurl ) {
-		r = sd_dhcp_client_set_mud_url (sd_client, mudurl);
+	mud_url = nm_dhcp_client_get_mud_url (client);
+	if (mud_url) {
+		r = sd_dhcp_client_set_mud_url (sd_client, mud_url);
 		if (r < 0) {
 			nm_utils_error_set_errno (error, r, "failed to set DHCP MUDURL: %s");
 			return FALSE;
diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c
index a5d89e0a76..d51bcae5f8 100644
--- a/src/dhcp/tests/test-dhcp-dhclient.c
+++ b/src/dhcp/tests/test-dhcp-dhclient.c
@@ -35,7 +35,7 @@ test_config (const char *orig,
              GBytes *expected_new_client_id,
              const char *iface,
              const char *anycast_addr,
-             const char *mudurl)
+             const char *mud_url)
 {
 	gs_free char *new = NULL;
 	gs_unref_bytes GBytes *client_id = NULL;
@@ -54,7 +54,7 @@ test_config (const char *orig,
 	                                      timeout,
 	                                      use_fqdn,
 	                                      hostname_flags,
-	                                      mudurl,
+	                                      mud_url,
 	                                      "/path/to/dhclient.conf",
 	                                      orig,
 	                                      &new_client_id);
@@ -109,7 +109,7 @@ test_orig_missing (void)
 /*****************************************************************************/
 
 
-static const char *orig_missing_add_mudurl_expected = \
+static const char *orig_missing_add_mud_url_expected = \
 	"# Created by NetworkManager\n"
 	"\n"
 	"option mudurl code 161 = text;\n"
@@ -127,10 +127,10 @@ static const char *orig_missing_add_mudurl_expected = \
 	"\n";
 
 static void
-test_orig_missing_add_mudurl (void)
+test_orig_missing_add_mud_url (void)
 {
 	test_config (NULL,
-	             orig_missing_add_mudurl_expected,
+	             orig_missing_add_mud_url_expected,
 	             AF_INET, NULL, 0, FALSE,
 	             NM_DHCP_HOSTNAME_FLAG_NONE,
 	             NULL, NULL, "eth0", NULL, TEST_MUDURL);
@@ -1216,7 +1216,7 @@ main (int argc, char **argv)
 	nmtst_init_with_logging (&argc, &argv, NULL, "DEFAULT");
 
 	g_test_add_func ("/dhcp/dhclient/orig_missing", test_orig_missing);
-	g_test_add_func ("/dhcp/dhclient/orig_missing_add_mudurl", test_orig_missing_add_mudurl);
+	g_test_add_func ("/dhcp/dhclient/orig_missing_add_mud_url", test_orig_missing_add_mud_url);
 	g_test_add_func ("/dhcp/dhclient/override_client_id", test_override_client_id);
 	g_test_add_func ("/dhcp/dhclient/quote_client_id/1", test_quote_client_id);
 	g_test_add_func ("/dhcp/dhclient/quote_client_id/2", test_quote_client_id_2);
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index a16d9de0f7..ad5d45ac3a 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -2209,7 +2209,6 @@ make_ip6_setting (shvarFile *ifcfg,
 		if (v && !strchr (v, '.'))
 			v = NULL;
 	}
-
 	if (v)
 		g_object_set (s_ip6, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, v, NULL);
 

From a2956db2ee6eccbd6ee60a2dbc5752491a937d97 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 08:18:35 +0200
Subject: [PATCH 043/222] dhcp: abort on error setting DHCP MUD URL option for
 nettools

---
 src/dhcp/nm-dhcp-nettools.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c
index e078cf39b2..8b98447b10 100644
--- a/src/dhcp/nm-dhcp-nettools.c
+++ b/src/dhcp/nm-dhcp-nettools.c
@@ -1351,6 +1351,7 @@ ip4_start (NMDhcpClient *client,
 		if (r) {
 			nm_utils_error_set_errno (error, r,
 			                          "failed to set MUD URL: %s");
+			return FALSE;
 		}
 	}
 	hostname = nm_dhcp_client_get_hostname (client);

From 54e2c60d3440ee57baa968f841605ea43452c31e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 08:30:48 +0200
Subject: [PATCH 044/222] dhcp/nettools: cleanup setting error message from
 n-dhcp4 error code

n-dhcp4 error codes can also be some positive numbers. Those shall not
be converted to errno. Instead, print the error code directly.
---
 src/dhcp/nm-dhcp-nettools.c | 48 ++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c
index 8b98447b10..46c72566ae 100644
--- a/src/dhcp/nm-dhcp-nettools.c
+++ b/src/dhcp/nm-dhcp-nettools.c
@@ -68,6 +68,20 @@ G_DEFINE_TYPE (NMDhcpNettools, nm_dhcp_nettools, NM_TYPE_DHCP_CLIENT)
 
 /*****************************************************************************/
 
+static void
+set_error_nettools (GError **error, int r, const char *message)
+{
+	/* the error code returned from n_dhcp4_* API is either a negative
+	 * errno, or a positive internal error code. Generate different messages
+	 * for these. */
+	if (r < 0)
+		nm_utils_error_set_errno (error, r, "%s: %s", message);
+	else
+		nm_utils_error_set (error, r, "%s (code %d)", message, r);
+}
+
+/*****************************************************************************/
+
 #define DHCP_MAX_FQDN_LENGTH 255
 
 enum {
@@ -681,11 +695,10 @@ lease_parse_metered (NDhcp4ClientLease *lease,
 	int r;
 
 	r = n_dhcp4_client_lease_query (lease, NM_DHCP_OPTION_DHCP4_VENDOR_SPECIFIC, &data, &n_data);
-	if (r) {
+	if (r)
 		metered = FALSE;
-	} else {
+	else
 		metered = !!memmem (data, n_data, "ANDROID_METERED", NM_STRLEN ("ANDROID_METERED"));
-	}
 
 	/* TODO: expose the vendor specific option when present */
 	nm_ip4_config_set_metered (ip4_config, metered);
@@ -1023,9 +1036,8 @@ dhcp4_event_handle (NMDhcpNettools *self,
 	case N_DHCP4_CLIENT_EVENT_OFFER:
 		/* always accept the first lease */
 		r = n_dhcp4_client_lease_select (event->offer.lease);
-		if (r) {
+		if (r)
 			_LOGW ("selecting lease failed: %d", r);
-		}
 		break;
 	case N_DHCP4_CLIENT_EVENT_RETRACTED:
 	case N_DHCP4_CLIENT_EVENT_EXPIRED:
@@ -1170,7 +1182,7 @@ nettools_create (NMDhcpNettools *self,
 
 	r = n_dhcp4_client_config_new (&config);
 	if (r) {
-		nm_utils_error_set_errno (error, r, "failed to create client-config: %s");
+		set_error_nettools (error, r, "failed to create client-config");
 		return FALSE;
 	}
 
@@ -1184,13 +1196,13 @@ nettools_create (NMDhcpNettools *self,
 	                                         client_id_arr,
 	                                         NM_MIN (client_id_len, 1 + _NM_SD_MAX_CLIENT_ID_LEN));
 	if (r) {
-		nm_utils_error_set_errno (error, r, "failed to set client-id: %s");
+		set_error_nettools (error, r, "failed to set client-id");
 		return FALSE;
 	}
 
 	r = n_dhcp4_client_new (&client, config);
 	if (r) {
-		nm_utils_error_set (error, NM_UTILS_ERROR_UNKNOWN, "failed to create client: error %d", r);
+		set_error_nettools (error, r, "failed to create client");
 		return FALSE;
 	}
 
@@ -1224,7 +1236,7 @@ _accept (NMDhcpClient *client,
 
 	r = n_dhcp4_client_lease_accept (priv->lease);
 	if (r) {
-		nm_utils_error_set_errno (error, r, "failed to accept lease: %s");
+		set_error_nettools (error, r, "failed to accept lease");
 		return FALSE;
 	}
 
@@ -1248,7 +1260,7 @@ decline (NMDhcpClient *client,
 
 	r = n_dhcp4_client_lease_decline (priv->lease, error_message);
 	if (r) {
-		nm_utils_error_set_errno (error, r, "failed to decline lease: %s");
+		set_error_nettools (error, r, "failed to decline lease");
 		return FALSE;
 	}
 
@@ -1295,7 +1307,7 @@ ip4_start (NMDhcpClient *client,
 
 	r = n_dhcp4_client_probe_config_new (&config);
 	if (r) {
-		nm_utils_error_set_errno (error, r, "failed to create dhcp-client-probe-config: %s");
+		set_error_nettools (error, r, "failed to create dhcp-client-probe-config");
 		return FALSE;
 	}
 
@@ -1349,8 +1361,7 @@ ip4_start (NMDhcpClient *client,
 		                                               mud_url,
 		                                               strlen (mud_url));
 		if (r) {
-			nm_utils_error_set_errno (error, r,
-			                          "failed to set MUD URL: %s");
+			set_error_nettools (error, r, "failed to set MUD URL");
 			return FALSE;
 		}
 	}
@@ -1372,7 +1383,10 @@ ip4_start (NMDhcpClient *client,
 				                                   sizeof (buffer) - 3,
 				                                   FALSE);
 				if (r <= 0) {
-					nm_utils_error_set_errno (error, r, "failed to convert DHCP FQDN: %s");
+					if (r < 0)
+						nm_utils_error_set_errno (error, r, "failed to convert DHCP FQDN: %s");
+					else
+						nm_utils_error_set (error, r, "failed to convert DHCP FQDN");
 					return FALSE;
 				}
 				fqdn_len = r;
@@ -1390,7 +1404,7 @@ ip4_start (NMDhcpClient *client,
 			                                               buffer,
 			                                               3 + fqdn_len);
 			if (r) {
-				nm_utils_error_set_errno (error, r, "failed to set DHCP FQDN: %s");
+				set_error_nettools (error, r, "failed to set DHCP FQDN");
 				return FALSE;
 			}
 		} else {
@@ -1399,7 +1413,7 @@ ip4_start (NMDhcpClient *client,
 			                                               hostname,
 			                                               strlen (hostname));
 			if (r) {
-				nm_utils_error_set_errno (error, r, "failed to set DHCP hostname: %s");
+				set_error_nettools (error, r, "failed to set DHCP hostname");
 				return FALSE;
 			}
 		}
@@ -1410,7 +1424,7 @@ ip4_start (NMDhcpClient *client,
 
 	r = n_dhcp4_client_probe (priv->client, &priv->probe, config);
 	if (r) {
-		nm_utils_error_set_errno (error, r, "failed to start DHCP client: %s");
+		set_error_nettools (error, r, "failed to start DHCP client");
 		return FALSE;
 	}
 

From a058535b9d6b30506e6ec78806155e1befd9a0fd Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 08:40:47 +0200
Subject: [PATCH 045/222] device: rename local variable s_connection and adjust
 assertions

- avoid g_assert(). Either we want to gracefully assert (g_return_*()) or we
  want to use assertions that are disabled in production builds (nm_assert());

- rename variable s_connection to s_con. This is how variables for this
  purpose are commonly called.
---
 src/devices/nm-device.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 542b6371f6..9b97a35c18 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -8427,7 +8427,7 @@ dhcp4_start (NMDevice *self)
 	gs_unref_bytes GBytes *bcast_hwaddr = NULL;
 	gs_unref_bytes GBytes *client_id = NULL;
 	NMConnection *connection;
-	NMSettingConnection *s_connection;
+	NMSettingConnection *s_con;
 	GError *error = NULL;
 	const NMPlatformLink *pllink;
 
@@ -8436,8 +8436,8 @@ dhcp4_start (NMDevice *self)
 
 	s_ip4 = nm_connection_get_setting_ip4_config (connection);
 
-	s_connection = nm_connection_get_setting_connection (connection);
-	nm_assert (s_connection);
+	s_con = nm_connection_get_setting_connection (connection);
+	nm_assert (s_con);
 
 	/* Clear old exported DHCP options */
 	nm_dbus_object_clear_and_unexport (&priv->dhcp_data_4.config);
@@ -8465,7 +8465,7 @@ dhcp4_start (NMDevice *self)
 	                                                      nm_setting_ip_config_get_dhcp_hostname (s_ip4),
 	                                                      nm_setting_ip4_config_get_dhcp_fqdn (NM_SETTING_IP4_CONFIG (s_ip4)),
 	                                                      get_dhcp_hostname_flags (self, AF_INET),
-	                                                      nm_setting_connection_get_mud_url (s_connection),
+	                                                      nm_setting_connection_get_mud_url (s_con),
 	                                                      client_id,
 	                                                      get_dhcp_timeout (self, AF_INET),
 	                                                      priv->dhcp_anycast_address,
@@ -9216,14 +9216,15 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection)
 	GError *error = NULL;
 	guint32 iaid;
 	gboolean iaid_explicit;
-	NMSettingConnection *s_connection;
+	NMSettingConnection *s_con;
 	const NMPlatformIP6Address *ll_addr = NULL;
 
-	g_assert (connection);
+	g_return_val_if_fail (connection, FALSE);
+
 	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	s_connection = nm_connection_get_setting_connection (connection);
-	nm_assert (s_connection);
+	nm_assert (s_ip6);
+	s_con = nm_connection_get_setting_connection (connection);
+	nm_assert (s_con);
 
 	if (priv->ext_ip6_config_captured) {
 		ll_addr = nm_ip6_config_find_first_address (priv->ext_ip6_config_captured,
@@ -9258,7 +9259,7 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection)
 	                                                      nm_setting_ip_config_get_dhcp_send_hostname (s_ip6),
 	                                                      nm_setting_ip_config_get_dhcp_hostname (s_ip6),
 	                                                      get_dhcp_hostname_flags (self, AF_INET6),
-	                                                      nm_setting_connection_get_mud_url (s_connection),
+	                                                      nm_setting_connection_get_mud_url (s_con),
 	                                                      duid,
 	                                                      enforce_duid,
 	                                                      iaid,

From 4bcaff4cb5f65e9d965d3ed4d1fcacb626d36847 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 08:46:31 +0200
Subject: [PATCH 046/222] dhcp: don't make mud-url property of NMDhcpClient
 readable

We have this as a GObject property, so that it can be set at construct
time (to be never modified afterwards). We don't need a readable
GObject property, because there is a getter function that should be
used instead.
---
 src/dhcp/nm-dhcp-client.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
index 8e50a8f99f..1f6179a8da 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/dhcp/nm-dhcp-client.c
@@ -980,9 +980,6 @@ get_property (GObject *object, guint prop_id,
 	case PROP_HOSTNAME:
 		g_value_set_string (value, priv->hostname);
 		break;
-	case PROP_MUD_URL:
-		g_value_set_string (value, priv->mud_url);
-		break;
 	case PROP_ROUTE_METRIC:
 		g_value_set_uint (value, priv->route_metric);
 		break;
@@ -1211,7 +1208,7 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class)
 	obj_properties[PROP_MUD_URL] =
 	    g_param_spec_string (NM_DHCP_CLIENT_MUD_URL, "", "",
 	                         NULL,
-	                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+	                         G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
 	                         G_PARAM_STATIC_STRINGS);
 
 	obj_properties[PROP_ROUTE_TABLE] =

From 3e6b6d34db5de71db503e6c8bcfd9e07efe6e0a5 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 08:50:33 +0200
Subject: [PATCH 047/222] dhcp: fix leaking mud_url in NMDhcpClient

---
 src/dhcp/nm-dhcp-client.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
index 1f6179a8da..f7324baf6e 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/dhcp/nm-dhcp-client.c
@@ -1116,6 +1116,7 @@ dispose (GObject *object)
 	nm_clear_g_free (&priv->iface);
 	nm_clear_g_free (&priv->hostname);
 	nm_clear_g_free (&priv->uuid);
+	nm_clear_g_free (&priv->mud_url);
 	nm_clear_pointer (&priv->client_id, g_bytes_unref);
 	nm_clear_pointer (&priv->hwaddr, g_bytes_unref);
 	nm_clear_pointer (&priv->bcast_hwaddr, g_bytes_unref);

From bdb1d71cfa0ef3feb8c6be2d60f84c963fd5d30b Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 08:50:33 +0200
Subject: [PATCH 048/222] dhcp: fix leaking mud_url in NMSettingConnection

---
 libnm-core/nm-setting-connection.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index db05caf633..2f64e17739 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -1643,6 +1643,7 @@ finalize (GObject *object)
 	g_free (priv->zone);
 	g_free (priv->master);
 	g_free (priv->slave_type);
+	g_free (priv->mud_url);
 	g_slist_free_full (priv->permissions, (GDestroyNotify) permission_free);
 	g_slist_free_full (priv->secondaries, g_free);
 

From 3a2858a2fddfa306f9b37ed02055eb75c7f89dea Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 09:05:25 +0200
Subject: [PATCH 049/222] ifcfg-rh/trivial: drop comment for
 nms_ifcfg_well_known_keys

The comment isn't right. The fixed array size is in the header file,
because other parts of the code need to know how many elements are in
the array. The alternative would be a define for the size, but that
is only redundant information. Also, even with a define the user who
adds an entry needs to adjust the code in the header. Explicitly stating
the array size in the header makes it almost impossible to accidentally
choosing the wrong size, because the compiler (and unit tests) ensure
the consistency.
---
 src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
index 25a5c0ac73..e6343e1dcd 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
@@ -33,7 +33,6 @@ typedef struct {
 	NMSIfcfgKeyTypeFlags key_flags;
 } NMSIfcfgKeyTypeInfo;
 
-/* maybe think about getting rid of the fixed number below at some point.*/
 extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[233];
 
 const NMSIfcfgKeyTypeInfo *nms_ifcfg_well_known_key_find_info (const char *key, gssize *out_idx);

From 03b606d1ffc6fd19394490fc310b22026abfca32 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 09:11:12 +0200
Subject: [PATCH 050/222] dhcp: set MUD URL in DHCPv6 request for systemd DHCP
 client

---
 src/dhcp/nm-dhcp-systemd.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
index 983f4e2a65..72f60ccbf0 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/dhcp/nm-dhcp-systemd.c
@@ -904,6 +904,7 @@ ip6_start (NMDhcpClient *client,
 	nm_auto (sd_dhcp6_client_unrefp) sd_dhcp6_client *sd_client = NULL;
 	GBytes *hwaddr;
 	const char *hostname;
+	const char *mud_url;
 	int r, i;
 	const guint8 *duid_arr;
 	gsize duid_len;
@@ -986,6 +987,15 @@ ip6_start (NMDhcpClient *client,
 		}
 	}
 
+	mud_url = nm_dhcp_client_get_mud_url (client);
+	if (mud_url) {
+		r = sd_dhcp6_client_set_request_mud_url (sd_client, mud_url);
+		if (r < 0) {
+			nm_utils_error_set_errno (error, r, "failed to set mud-url: %s");
+			return FALSE;
+		}
+	}
+
 	if (needed_prefixes > 0) {
 		if (needed_prefixes > 1)
 			_LOGW ("dhcp-client6: only one prefix request is supported");

From b775dda9288aff27febf375b601cbf8e9da34891 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 09:17:59 +0200
Subject: [PATCH 051/222] libnm: fix symbol versioning for
 nm_setting_connection_get_mud_url()

---
 libnm/libnm.ver | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index e572ccb3b2..b4af766a42 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -473,7 +473,6 @@ global:
 	nm_setting_connection_get_id;
 	nm_setting_connection_get_interface_name;
 	nm_setting_connection_get_master;
-	nm_setting_connection_get_mud_url;
 	nm_setting_connection_get_num_permissions;
 	nm_setting_connection_get_num_secondaries;
 	nm_setting_connection_get_permission;
@@ -1696,3 +1695,8 @@ global:
 	nm_setting_vrf_get_type;
 	nm_setting_vrf_new;
 } libnm_1_22_8;
+
+libnm_1_26_0 {
+global:
+	nm_setting_connection_get_mud_url;
+} libnm_1_24_0;

From de2062c08d71fa603448cd3ef260d7ad62896a73 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 09:20:25 +0200
Subject: [PATCH 052/222] libnm: fix API version annotation for
 nm_setting_connection_get_mud_url()

---
 libnm-core/nm-setting-connection.c | 5 +++--
 libnm-core/nm-setting-connection.h | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index 2f64e17739..caacdf36c5 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -758,8 +758,9 @@ nm_setting_connection_get_secondary (NMSettingConnection *setting, guint32 idx)
  *
  * Returns the value contained in the #NMSettingConnection:mud-url
  * property.
+ *
+ * Since: 1.26
  **/
-
 const char *
 nm_setting_connection_get_mud_url (NMSettingConnection *setting)
 {
@@ -2327,6 +2328,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * to manufacturer-recommended network policies for IoT devices. It is transmitted
 	 * as a DHCPv4 or DHCPv6 option.
 	 *
+	 * Since: 1.26
 	 **/
 	/* ---ifcfg-rh---
 	 * property: mud-url
@@ -2336,7 +2338,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * example: https://yourdevice.example.com/model.json
 	 * ---end---
 	 */
-
 	obj_properties[PROP_MUD_URL] =
 	    g_param_spec_string (NM_SETTING_CONNECTION_MUD_URL, "", "",
 	                         NULL,
diff --git a/libnm-core/nm-setting-connection.h b/libnm-core/nm-setting-connection.h
index 36df389671..9a6f09a852 100644
--- a/libnm-core/nm-setting-connection.h
+++ b/libnm-core/nm-setting-connection.h
@@ -205,6 +205,7 @@ NMSettingConnectionLlmnr  nm_setting_connection_get_llmnr (NMSettingConnection *
 NM_AVAILABLE_IN_1_20
 gint32 nm_setting_connection_get_wait_device_timeout (NMSettingConnection *setting);
 
+NM_AVAILABLE_IN_1_26
 const char *nm_setting_connection_get_mud_url (NMSettingConnection *setting);
 
 G_END_DECLS

From cedcea5ee812ce99a62d47b400518401e018bf74 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 09:31:30 +0200
Subject: [PATCH 053/222] libnm: fix verification of connection:mud-url
 property

For one, the setters sd_dhcp_client_set_mud_url() and sd_dhcp6_client_set_request_mud_url()
assert that the value honors these settings. So, we must never pass such values to the
function. Also, before calling n_dhcp4_client_probe_config_append_option()
the code doesn't check whether the URL is short enough. That would be
a bug (unless we ensure that the property is valid from the beginning).

In general, it is necessary to strictly validate the parameter.

Also, returning NM_SETTING_VERIFY_NORMALIZABLE_ERROR for a property that does
not get normalized is a bug.
---
 libnm-core/nm-setting-connection.c | 33 ++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index caacdf36c5..545dd8168c 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -16,6 +16,7 @@
 #include "nm-setting-bridge.h"
 #include "nm-setting-team.h"
 #include "nm-setting-vlan.h"
+#include "systemd/nm-sd-utils-shared.h"
 
 /**
  * SECTION:nm-setting-connection
@@ -1230,6 +1231,27 @@ after_interface_name:
 		return FALSE;
 	}
 
+	if (priv->mud_url) {
+		if (!priv->mud_url[0]) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("property is empty"));
+			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL);
+			return FALSE;
+		}
+		if (strlen (priv->mud_url) > 255) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("DHCP option cannot be longer than 255 characters"));
+			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL);
+			return FALSE;
+		}
+		if (!nm_sd_http_url_is_valid (priv->mud_url)) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("MUD URL is not a valid URL"));
+			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL);
+			return FALSE;
+		}
+	}
+
 	/* *** errors above here should be always fatal, below NORMALIZABLE_ERROR *** */
 
 	if (!priv->uuid) {
@@ -1241,13 +1263,6 @@ after_interface_name:
 		return NM_SETTING_VERIFY_NORMALIZABLE_ERROR;
 	}
 
-	if (priv->mud_url && !*priv->mud_url) {
-		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
-		                     _("property is empty"));
-		g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL);
-		return NM_SETTING_VERIFY_NORMALIZABLE_ERROR;
-	}
-
 	if (normerr_base_type) {
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
@@ -1493,8 +1508,8 @@ get_property (GObject *object, guint prop_id,
 	case PROP_WAIT_DEVICE_TIMEOUT:
 		g_value_set_int (value, priv->wait_device_timeout);
 		break;
-        case PROP_MUD_URL:
-		g_value_set_string (value, nm_setting_connection_get_mud_url(setting));
+	case PROP_MUD_URL:
+		g_value_set_string (value, priv->mud_url);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);

From fff8119317a93ee2ded6ea8862424bfa68aa5117 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 10:15:47 +0200
Subject: [PATCH 054/222] NEWS: update

---
 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index d83eeb74c4..2b87553835 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ The API is subject to change and not guaranteed to be compatible
 with the later release.
 USE AT YOUR OWN RISK.  NOT RECOMMENDED FOR PRODUCTION USE!
 
+* Add MUD URL property for connection profiles (RFC 8520) and set it
+  for DHCP and DHCPv6 requests.
 * IPv6 SLAAC: improved the reaction of IPv6 SLAAC to renumbering events:
   - honor PIO Valid Lifetimes < 2 hours.
   - cap the Preferred Lifetime of PIOs to the "Router Lifetime" value

From cd5157a0c38adb20eb290a145888703b3d09dd4f Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 23 Apr 2020 14:23:23 +0200
Subject: [PATCH 055/222] shared: add nm_utils_invoke_on_timeout()

Add nm_utils_invoke_on_timeout() beside nm_utils_invoke_on_idle().
They are fundamentally similar, except one schedules an idle handler
and the other a timeout.

Also, use the current g_main_context_get_thread_default() as context
instead of the singleton instance. That is a change in behavior, but
the only caller of nm_utils_invoke_on_idle() is the daemon, which
doesn't use different main contexts. Anyway, to avoid anybody being
tripped up by this also change the order of arguments. It anyway
seems nicer to first pass the cancellable, and the callback and user
data as last arguments. It's more in line with glib's asynchronous
methods.

Also, in the unlikely case that the cancellable is already cancelled
from the start, always schedule an idle action to complete fast.
---
 shared/nm-glib-aux/nm-shared-utils.c      | 103 ++++++++++++++++------
 shared/nm-glib-aux/nm-shared-utils.h      |  13 ++-
 src/devices/bluetooth/nm-bluez-manager.c  |   6 +-
 src/devices/ovs/nm-device-ovs-interface.c |   2 +-
 src/devices/wifi/nm-device-iwd.c          |   2 +-
 src/devices/wifi/nm-device-wifi.c         |   2 +-
 src/devices/wwan/nm-modem-broadband.c     |   6 +-
 src/devices/wwan/nm-modem-ofono.c         |   6 +-
 src/platform/nm-linux-platform.c          |   8 +-
 9 files changed, 100 insertions(+), 48 deletions(-)

diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c
index c06399dda8..61e3e26716 100644
--- a/shared/nm-glib-aux/nm-shared-utils.c
+++ b/shared/nm-glib-aux/nm-shared-utils.c
@@ -3655,9 +3655,9 @@ _nm_utils_user_data_unpack (gpointer user_data, int nargs, ...)
 typedef struct {
 	gpointer callback_user_data;
 	GCancellable *cancellable;
+	GSource *source;
 	NMUtilsInvokeOnIdleCallback callback;
 	gulong cancelled_id;
-	guint idle_id;
 } InvokeOnIdleData;
 
 static gboolean
@@ -3665,12 +3665,13 @@ _nm_utils_invoke_on_idle_cb_idle (gpointer user_data)
 {
 	InvokeOnIdleData *data = user_data;
 
-	data->idle_id = 0;
 	nm_clear_g_signal_handler (data->cancellable, &data->cancelled_id);
 
 	data->callback (data->callback_user_data, data->cancellable);
+
 	nm_g_object_unref (data->cancellable);
-	g_slice_free (InvokeOnIdleData, data);
+	g_source_destroy (data->source);
+	nm_g_slice_free (data);
 	return G_SOURCE_REMOVE;
 }
 
@@ -3680,41 +3681,87 @@ _nm_utils_invoke_on_idle_cb_cancelled (GCancellable *cancellable,
 {
 	/* on cancellation, we invoke the callback synchronously. */
 	nm_clear_g_signal_handler (data->cancellable, &data->cancelled_id);
-	nm_clear_g_source (&data->idle_id);
+	nm_clear_g_source_inst (&data->source);
 	data->callback (data->callback_user_data, data->cancellable);
 	nm_g_object_unref (data->cancellable);
-	g_slice_free (InvokeOnIdleData, data);
+	nm_g_slice_free (data);
 }
 
-void
-nm_utils_invoke_on_idle (NMUtilsInvokeOnIdleCallback callback,
-                         gpointer callback_user_data,
-                         GCancellable *cancellable)
+static void
+_nm_utils_invoke_on_idle_start (gboolean use_timeout,
+                                guint timeout_msec,
+                                GCancellable *cancellable,
+                                NMUtilsInvokeOnIdleCallback callback,
+                                gpointer callback_user_data)
 {
 	InvokeOnIdleData *data;
+	GSource *source;
 
 	g_return_if_fail (callback);
 
 	data = g_slice_new (InvokeOnIdleData);
-	data->callback = callback;
-	data->callback_user_data = callback_user_data;
-	data->cancellable = nm_g_object_ref (cancellable);
-	if (   cancellable
-	    && !g_cancellable_is_cancelled (cancellable)) {
-		/* if we are passed a non-cancelled cancellable, we register to the "cancelled"
-		 * signal an invoke the callback synchronously (from the signal handler).
-		 *
-		 * We don't do that,
-		 *  - if the cancellable is already cancelled (because we don't want to invoke
-		 *    the callback synchronously from the caller).
-		 *  - if we have no cancellable at hand. */
-		data->cancelled_id = g_signal_connect (cancellable,
-		                                       "cancelled",
-		                                       G_CALLBACK (_nm_utils_invoke_on_idle_cb_cancelled),
-		                                       data);
-	} else
-		data->cancelled_id = 0;
-	data->idle_id = g_idle_add (_nm_utils_invoke_on_idle_cb_idle, data);
+	*data = (InvokeOnIdleData) {
+		.callback           = callback,
+		.callback_user_data = callback_user_data,
+		.cancellable        = nm_g_object_ref (cancellable),
+		.cancelled_id       = 0,
+	};
+
+	if (cancellable) {
+		if (g_cancellable_is_cancelled (cancellable)) {
+			/* the cancellable is already cancelled. We ignore the timeout
+			 * and always schedule an idle action. */
+			use_timeout = FALSE;
+		} else {
+			/* if we are passed a non-cancelled cancellable, we register to the "cancelled"
+			 * signal an invoke the callback synchronously (from the signal handler).
+			 *
+			 * We don't do that,
+			 *  - if the cancellable is already cancelled (because we don't want to invoke
+			 *    the callback synchronously from the caller).
+			 *  - if we have no cancellable at hand. */
+			data->cancelled_id = g_signal_connect (cancellable,
+			                                       "cancelled",
+			                                       G_CALLBACK (_nm_utils_invoke_on_idle_cb_cancelled),
+			                                       data);
+		}
+	}
+
+	if (use_timeout) {
+		source = nm_g_timeout_source_new (timeout_msec,
+		                                  G_PRIORITY_DEFAULT,
+		                                  _nm_utils_invoke_on_idle_cb_idle,
+		                                  data,
+		                                  NULL);
+	} else {
+		source = nm_g_idle_source_new (G_PRIORITY_DEFAULT,
+		                               _nm_utils_invoke_on_idle_cb_idle,
+		                               data,
+		                               NULL);
+	}
+
+	/* use the current thread default context. */
+	g_source_attach (source,
+	                 g_main_context_get_thread_default ());
+
+	data->source = source;
+}
+
+void
+nm_utils_invoke_on_idle (GCancellable *cancellable,
+                         NMUtilsInvokeOnIdleCallback callback,
+                         gpointer callback_user_data)
+{
+	_nm_utils_invoke_on_idle_start (FALSE, 0, cancellable, callback, callback_user_data);
+}
+
+void
+nm_utils_invoke_on_timeout (guint timeout_msec,
+                            GCancellable *cancellable,
+                            NMUtilsInvokeOnIdleCallback callback,
+                            gpointer callback_user_data)
+{
+	_nm_utils_invoke_on_idle_start (TRUE, timeout_msec, cancellable, callback, callback_user_data);
 }
 
 /*****************************************************************************/
diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index 38b100416d..9200f80fdf 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -1629,12 +1629,17 @@ void _nm_utils_user_data_unpack (gpointer user_data, int nargs, ...);
 
 /*****************************************************************************/
 
-typedef void (*NMUtilsInvokeOnIdleCallback) (gpointer callback_user_data,
+typedef void (*NMUtilsInvokeOnIdleCallback) (gpointer user_data,
                                              GCancellable *cancellable);
 
-void nm_utils_invoke_on_idle (NMUtilsInvokeOnIdleCallback callback,
-                              gpointer callback_user_data,
-                              GCancellable *cancellable);
+void nm_utils_invoke_on_idle (GCancellable *cancellable,
+                              NMUtilsInvokeOnIdleCallback callback,
+                              gpointer callback_user_data);
+
+void nm_utils_invoke_on_timeout (guint timeout_msec,
+                                 GCancellable *cancellable,
+                                 NMUtilsInvokeOnIdleCallback callback,
+                                 gpointer callback_user_data);
 
 /*****************************************************************************/
 
diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c
index 6ff96c323b..0bbac4c435 100644
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/devices/bluetooth/nm-bluez-manager.c
@@ -1251,9 +1251,9 @@ _network_server_unregister_bridge (NMBluezManager *self,
 
 	if (r_req_data) {
 		nm_clear_g_cancellable (&r_req_data->int_cancellable);
-		nm_utils_invoke_on_idle (_network_server_unregister_bridge_complete_on_idle_cb,
-		                         nm_utils_user_data_pack (r_req_data, g_strdup (reason)),
-		                         r_req_data->ext_cancellable);
+		nm_utils_invoke_on_idle (r_req_data->ext_cancellable,
+		                         _network_server_unregister_bridge_complete_on_idle_cb,
+		                         nm_utils_user_data_pack (r_req_data, g_strdup (reason)));
 	}
 
 	_nm_device_bridge_notify_unregister_bt_nap (device, reason);
diff --git a/src/devices/ovs/nm-device-ovs-interface.c b/src/devices/ovs/nm-device-ovs-interface.c
index 951b578892..10f9fa9431 100644
--- a/src/devices/ovs/nm-device-ovs-interface.c
+++ b/src/devices/ovs/nm-device-ovs-interface.c
@@ -310,7 +310,7 @@ deactivate_async (NMDevice *device,
 	                                        nm_device_get_iface (device))) {
 		_LOGT (LOGD_CORE, "deactivate: link not present, proceeding");
 		nm_device_update_from_platform_link (NM_DEVICE (self), NULL);
-		nm_utils_invoke_on_idle (deactivate_cb_on_idle, data, cancellable);
+		nm_utils_invoke_on_idle (cancellable, deactivate_cb_on_idle, data);
 		return;
 	}
 
diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c
index 3c1d5b2298..3dccd1cb94 100644
--- a/src/devices/wifi/nm-device-iwd.c
+++ b/src/devices/wifi/nm-device-iwd.c
@@ -507,7 +507,7 @@ deactivate_async (NMDevice *device,
 	user_data = nm_utils_user_data_pack (g_object_ref (self), callback, callback_user_data);
 
 	if (!priv->dbus_obj) {
-		nm_utils_invoke_on_idle (disconnect_cb_on_idle, user_data, cancellable);
+		nm_utils_invoke_on_idle (cancellable, disconnect_cb_on_idle, user_data);
 		return;
 	}
 
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 266a842514..40faa13470 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -684,7 +684,7 @@ deactivate_async (NMDevice *device,
 
 	user_data = nm_utils_user_data_pack (g_object_ref (self), callback, callback_user_data);
 	if (!priv->sup_iface) {
-		nm_utils_invoke_on_idle (disconnect_cb_on_idle, user_data, cancellable);
+		nm_utils_invoke_on_idle (cancellable, disconnect_cb_on_idle, user_data);
 		return;
 	}
 
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
index f89ec86c9f..3fdc5ac54b 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/devices/wwan/nm-modem-broadband.c
@@ -1254,9 +1254,9 @@ disconnect (NMModem *modem,
 	/* Already cancelled or no simple-iface? We are done. */
 	if (   !ctx->self->_priv.simple_iface
 	    || g_cancellable_is_cancelled (cancellable)) {
-		nm_utils_invoke_on_idle (disconnect_context_complete_on_idle,
-		                         ctx,
-		                         cancellable);
+		nm_utils_invoke_on_idle (cancellable,
+		                         disconnect_context_complete_on_idle,
+		                         ctx);
 		return;
 	}
 
diff --git a/src/devices/wwan/nm-modem-ofono.c b/src/devices/wwan/nm-modem-ofono.c
index 2fc44881a9..96b08e7cff 100644
--- a/src/devices/wwan/nm-modem-ofono.c
+++ b/src/devices/wwan/nm-modem-ofono.c
@@ -211,9 +211,9 @@ disconnect (NMModem *modem,
 
 	if (   state != NM_MODEM_STATE_CONNECTED
 	    || g_cancellable_is_cancelled (cancellable)) {
-		nm_utils_invoke_on_idle (disconnect_context_complete_on_idle,
-		                         ctx,
-		                         cancellable);
+		nm_utils_invoke_on_idle (cancellable,
+		                         disconnect_context_complete_on_idle,
+		                         ctx);
 		return;
 	}
 
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index f7249bb71e..014cca71da 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -5131,9 +5131,9 @@ sysctl_set_async (NMPlatform *platform,
 			                                  callback,
 			                                  data,
 			                                  error);
-			nm_utils_invoke_on_idle (sysctl_set_async_return_idle,
-			                         packed,
-			                         cancellable);
+			nm_utils_invoke_on_idle (cancellable,
+			                         sysctl_set_async_return_idle,
+			                         packed);
 			return;
 		}
 	} else
@@ -7390,7 +7390,7 @@ out_idle:
 		                                  g_steal_pointer (&error),
 		                                  callback,
 		                                  data);
-		nm_utils_invoke_on_idle (sriov_idle_cb, packed, cancellable);
+		nm_utils_invoke_on_idle (cancellable, sriov_idle_cb, packed);
 	}
 }
 

From 27e2d51abc52e203d22d63398558e4a0edd8b019 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 23 Apr 2020 14:28:27 +0200
Subject: [PATCH 056/222] cli: repeatedly trigger Wi-Fi scans while waiting for
 scan result

NetworkManager will reject scan requests, if it is currently scanning.
That is very wrong. Even if NetworkManager wants to ratelimit scan
requests or not scan at critical moments, it should never reject a
request, but remember and start scanning as soon as it can.
That should be fixed.

But regardless, also nmcli can do better.

If you issue

  $ nmcli device wifi list --rescan yes

once, it works as expected.

If you issue it again right after, the scan request of nmcli will be
rejected. But nmcli cannot just merely complete and print the result.
Instead, it will wait in the hope that a scan result will be present
soon. But if the request was simply rejected, then the result will
never come, and nmcli hangs for the 15 seconds timeout.

Instead, repeatedly re-trigger scan requests, in the hope that as soon
as possible we will be ready.
---
 clients/cli/devices.c | 63 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 53 insertions(+), 10 deletions(-)

diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 4ea4e772e4..7031b43756 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -2978,6 +2978,24 @@ wifi_last_scan_updated (GObject *gobject, GParamSpec *pspec, gpointer user_data)
 	wifi_list_finish (user_data, FALSE);
 }
 
+static void wifi_list_rescan_cb (GObject *source_object, GAsyncResult *res, gpointer user_data);
+
+static void
+wifi_list_rescan_retry_cb (gpointer user_data,
+                           GCancellable *cancellable)
+{
+	WifiListData *wifi_list_data;
+
+	if (g_cancellable_is_cancelled (cancellable))
+		return;
+
+	wifi_list_data = user_data;
+	nm_device_wifi_request_scan_async (wifi_list_data->wifi,
+	                                   wifi_list_data->scan_cancellable,
+	                                   wifi_list_rescan_cb,
+	                                   wifi_list_data);
+}
+
 static void
 wifi_list_rescan_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
@@ -2985,22 +3003,47 @@ wifi_list_rescan_cb (GObject *source_object, GAsyncResult *res, gpointer user_da
 	gs_free_error GError *error = NULL;
 	WifiListData *wifi_list_data;
 	gboolean force_finished;
+	gboolean done;
 
 	nm_device_wifi_request_scan_finish (wifi, res, &error);
 	if (nm_utils_error_is_cancelled (error))
 		return;
 
-	if (g_error_matches (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_NOT_ALLOWED)) {
-		/* This likely means that scanning is already in progress. There's
-		 * a good chance we'll get updated results soon; wait for them. */
-		force_finished = FALSE;
-	} else if (error)
-		force_finished = TRUE;
-	else
-		force_finished = FALSE;
-
 	wifi_list_data = user_data;
-	g_clear_object (&wifi_list_data->scan_cancellable);
+
+	if (g_error_matches (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_NOT_ALLOWED)) {
+		if (nm_device_get_state (NM_DEVICE (wifi)) < NM_DEVICE_STATE_DISCONNECTED) {
+			/* the device is either unmanaged or unavailable.
+			 *
+			 * If it's unmanaged, we don't expect any scan result and are done.
+			 * If it's unavailable, that usually means that we wait for wpa_supplicant
+			 * to start. In that case, also quit (without scan results). */
+			force_finished = TRUE;
+			done = TRUE;
+		} else {
+			/* This likely means that scanning is already in progress. There's
+			 * a good chance we'll get updated results soon; wait for them.
+			 *
+			 * But also, NetworkManager ratelimits (and rejects requests). That
+			 * means, possibly we were just ratelimited, so waiting will not lead
+			 * to a new scan result. Instead, repeatedly ask new scans... */
+			nm_utils_invoke_on_timeout (1000,
+			                            wifi_list_data->scan_cancellable,
+			                            wifi_list_rescan_retry_cb,
+			                            wifi_list_data);
+			force_finished = FALSE;
+			done = FALSE;
+		}
+	} else if (error) {
+		force_finished = TRUE;
+		done = TRUE;
+	} else {
+		force_finished = FALSE;
+		done = TRUE;
+	}
+
+	if (done)
+		g_clear_object (&wifi_list_data->scan_cancellable);
 	wifi_list_finish (wifi_list_data, force_finished);
 }
 

From 8ecc325f29f5cba83daf6fca0003c7e13bafba31 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 23 Apr 2020 19:43:05 +0200
Subject: [PATCH 057/222] wifi: add more trace logging to supplicant interface

---
 src/supplicant/nm-supplicant-interface.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index a02f540256..bfee298445 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -1123,7 +1123,7 @@ set_state (NMSupplicantInterface *self, NMSupplicantInterfaceState new_state)
 	if (new_state == priv->state)
 		return;
 
-	_LOGT ("set state \"%s\" (was \"%s\")",
+	_LOGT ("state: set state \"%s\" (was \"%s\")",
 	       nm_supplicant_interface_state_to_string (new_state),
 	       nm_supplicant_interface_state_to_string (priv->state));
 
@@ -1789,8 +1789,12 @@ _properties_changed_main (NMSupplicantInterface *self,
 		g_variant_unref (v_v);
 	}
 
-	if (nm_g_variant_lookup (properties, "Scanning", "b", &v_b))
-		priv->scanning_property = v_b;
+	if (nm_g_variant_lookup (properties, "Scanning", "b", &v_b)) {
+		if (priv->scanning_property != (!!v_b)) {
+			_LOGT ("scanning: %s (plain property)", v_b ? "yes" : "no");
+			priv->scanning_property = v_b;
+		}
+	}
 
 	if (nm_g_variant_lookup (properties, "Ifname", "&s", &v_s)) {
 		if (nm_utils_strdup_reset (&priv->ifname, v_s))
@@ -1816,8 +1820,13 @@ _properties_changed_main (NMSupplicantInterface *self,
 
 		state = wpas_state_string_to_enum (v_s);
 		if (state == NM_SUPPLICANT_INTERFACE_STATE_INVALID)
-			_LOGT ("ignore unknown supplicant state '%s'", v_s);
+			_LOGT ("state: ignore unknown supplicant state '%s' (is %s, plain property)",
+			       v_s,
+			       nm_supplicant_interface_state_to_string (priv->supp_state));
 		else if (priv->supp_state != state) {
+			_LOGT ("state: %s (was %s, plain property)",
+			       nm_supplicant_interface_state_to_string (state),
+			       nm_supplicant_interface_state_to_string (priv->supp_state));
 			priv->supp_state = state;
 			if (priv->state > NM_SUPPLICANT_INTERFACE_STATE_STARTING) {
 				/* Only transition to actual wpa_supplicant interface states (ie,

From 93b634f1a23c43dd71c3b7668ae738c3ab6c970e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 13:41:46 +0200
Subject: [PATCH 058/222] platform: simplify static assert in
 _nl_static_assert_tb()

---
 src/platform/nm-netlink.h | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/platform/nm-netlink.h b/src/platform/nm-netlink.h
index 0ac5b3b7c0..a5124f52e8 100644
--- a/src/platform/nm-netlink.h
+++ b/src/platform/nm-netlink.h
@@ -77,17 +77,13 @@ struct nla_policy {
 /* static asserts that @tb and @policy are suitable arguments to nla_parse(). */
 #define _nl_static_assert_tb(tb, policy) \
 	G_STMT_START { \
-		\
 		G_STATIC_ASSERT_EXPR (G_N_ELEMENTS (tb) > 0); \
 		\
-		/* we allow @policy to be either NULL or a C array. */ \
-		G_STATIC_ASSERT_EXPR (   sizeof (policy) == sizeof (NULL) \
-		                      || G_N_ELEMENTS (tb) == (sizeof (policy) / sizeof (struct nla_policy))); \
-		\
-		/* For above check to work, we don't support policy being an array with same size as
-		 * sizeof(NULL), otherwise, the compile time check breaks down. */ \
-		G_STATIC_ASSERT_EXPR (sizeof (NULL) != G_N_ELEMENTS (tb) * sizeof (struct nla_policy)); \
-		\
+		/* We allow @policy to be either a C array or NULL. The sizeof()
+		 * must either match the expected array size or the sizeof(NULL),
+		 * but not both. */ \
+		G_STATIC_ASSERT_EXPR (  (sizeof (policy) == G_N_ELEMENTS (tb) * sizeof (struct nla_policy)) \
+		                      ^ (sizeof (policy) == sizeof (NULL))); \
 	} G_STMT_END
 
 /*****************************************************************************/

From 16c1869476106859b684151eb1b101c24cff3451 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 16:42:13 +0200
Subject: [PATCH 059/222] wifi: add callback to
 nm_supplicant_interface_request_scan()

While we request a scan, we are not yet actually scanning. That means, the supplicant's
"scanning" property will only change to TRUE a while after we initiate the scan. It may
even never happen.

We thus need to handle that the request is currently pending and react when the
request completes.
---
 src/devices/wifi/nm-device-wifi.c        |  6 +-
 src/supplicant/nm-supplicant-interface.c | 92 ++++++++++++++++++++----
 src/supplicant/nm-supplicant-interface.h |  9 ++-
 3 files changed, 90 insertions(+), 17 deletions(-)

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 40faa13470..bf3e6ad27a 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -1509,7 +1509,11 @@ request_wireless_scan (NMDeviceWifi *self,
 
 		nm_supplicant_interface_request_scan (priv->sup_iface,
 		                                      ssids ? (GBytes *const*) ssids->pdata : NULL,
-		                                      ssids ? ssids->len : 0u);
+		                                      ssids ? ssids->len : 0u,
+		                                      NULL,
+		                                      NULL,
+		                                      NULL);
+
 		request_started = TRUE;
 	} else
 		_LOGD (LOGD_WIFI, "wifi-scan: scanning requested but not allowed at this time");
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index bfee298445..099c3bf2ca 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -2337,40 +2337,82 @@ nm_supplicant_interface_assoc (NMSupplicantInterface *self,
 
 /*****************************************************************************/
 
+typedef struct {
+	NMSupplicantInterface *self;
+	GCancellable *cancellable;
+	NMSupplicantInterfaceRequestScanCallback callback;
+	gpointer user_data;
+} ScanRequestData;
+
 static void
 scan_request_cb (GObject *source, GAsyncResult *result, gpointer user_data)
 {
+	gs_unref_object NMSupplicantInterface *self_keep_alive = NULL;
 	NMSupplicantInterface *self;
 	gs_unref_variant GVariant *res = NULL;
 	gs_free_error GError *error = NULL;
+	ScanRequestData *data = user_data;
+	gboolean cancelled = FALSE;
 
 	res = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
-	if (nm_utils_error_is_cancelled (error))
-		return;
-
-	self = NM_SUPPLICANT_INTERFACE (user_data);
-	if (error) {
-		if (_nm_dbus_error_has_name (error, "fi.w1.wpa_supplicant1.Interface.ScanError"))
-			_LOGD ("request-scan: could not get scan request result: %s", error->message);
-		else {
-			g_dbus_error_strip_remote_error (error);
-			_LOGW ("request-scan: could not get scan request result: %s", error->message);
+	if (nm_utils_error_is_cancelled (error)) {
+		if (!data->callback) {
+			/* the self instance was not kept alive. We also must not touch it. Return. */
+			nm_g_object_unref (data->cancellable);
+			nm_g_slice_free (data);
+			return;
 		}
-	} else
-		_LOGT ("request-scan: request scanning success");
+		cancelled = TRUE;
+	}
+
+	self = data->self;
+	if (data->callback) {
+		/* the self instance was kept alive. Balance the reference count. */
+		self_keep_alive = self;
+	}
+
+	/* we don't propagate the error/success. That is, because either answer is not
+	 * reliable. What is important to us is whether the request completed, and
+	 * the current nm_supplicant_interface_get_scanning() state. */
+	if (cancelled)
+		_LOGD ("request-scan: request cancelled");
+	else {
+		if (error) {
+			if (_nm_dbus_error_has_name (error, "fi.w1.wpa_supplicant1.Interface.ScanError"))
+				_LOGD ("request-scan: could not get scan request result: %s", error->message);
+			else {
+				g_dbus_error_strip_remote_error (error);
+				_LOGW ("request-scan: could not get scan request result: %s", error->message);
+			}
+		} else
+			_LOGT ("request-scan: request scanning success");
+	}
+
+	if (data->callback)
+		data->callback (self, data->cancellable, data->user_data);
+
+	nm_g_object_unref (data->cancellable);
+	nm_g_slice_free (data);
 }
 
 void
 nm_supplicant_interface_request_scan (NMSupplicantInterface *self,
                                       GBytes *const*ssids,
-                                      guint ssids_len)
+                                      guint ssids_len,
+                                      GCancellable *cancellable,
+                                      NMSupplicantInterfaceRequestScanCallback callback,
+                                      gpointer user_data)
 {
 	NMSupplicantInterfacePrivate *priv;
 	GVariantBuilder builder;
+	ScanRequestData *data;
 	guint i;
 
 	g_return_if_fail (NM_IS_SUPPLICANT_INTERFACE (self));
 
+	nm_assert (   (!cancellable && !callback)
+	           || (G_IS_CANCELLABLE (cancellable) && callback));
+
 	priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
 
 	_LOGT ("request-scan: request scanning (%u ssids)...", ssids_len);
@@ -2390,6 +2432,26 @@ nm_supplicant_interface_request_scan (NMSupplicantInterface *self,
 		g_variant_builder_add (&builder, "{sv}", "SSIDs", g_variant_builder_end (&ssids_builder));
 	}
 
+	data = g_slice_new (ScanRequestData);
+	*data = (ScanRequestData) {
+		.self            = self,
+		.callback        = callback,
+		.user_data       = user_data,
+		.cancellable     = nm_g_object_ref (cancellable),
+	};
+
+	if (callback) {
+		/* A callback was provided. This keeps @self alive. The caller
+		 * must provide a cancellable as the caller must never leave an asynchronous
+		 * operation pending indefinitely. */
+		nm_assert (G_IS_CANCELLABLE (cancellable));
+		g_object_ref (self);
+	} else {
+		/* We don't keep @self alive, and we don't accept a cancellable either. */
+		nm_assert (!cancellable);
+		cancellable = priv->main_cancellable;
+	}
+
 	_dbus_connection_call (self,
 	                       NM_WPAS_DBUS_IFACE_INTERFACE,
 	                       "Scan",
@@ -2397,9 +2459,9 @@ nm_supplicant_interface_request_scan (NMSupplicantInterface *self,
 	                       G_VARIANT_TYPE ("()"),
 	                       G_DBUS_CALL_FLAGS_NONE,
 	                       DBUS_TIMEOUT_MSEC,
-	                       priv->main_cancellable,
+	                       cancellable,
 	                       scan_request_cb,
-	                       self);
+	                       data);
 }
 
 /*****************************************************************************/
diff --git a/src/supplicant/nm-supplicant-interface.h b/src/supplicant/nm-supplicant-interface.h
index eb414f26f5..9ef198167f 100644
--- a/src/supplicant/nm-supplicant-interface.h
+++ b/src/supplicant/nm-supplicant-interface.h
@@ -128,9 +128,16 @@ nm_supplicant_interface_disconnect_async (NMSupplicantInterface * self,
                                           NMSupplicantInterfaceDisconnectCb callback,
                                           gpointer user_data);
 
+typedef void (*NMSupplicantInterfaceRequestScanCallback) (NMSupplicantInterface *self,
+                                                          GCancellable *cancellable,
+                                                          gpointer user_data);
+
 void nm_supplicant_interface_request_scan (NMSupplicantInterface *self,
                                            GBytes *const*ssids,
-                                           guint ssids_len);
+                                           guint ssids_len,
+                                           GCancellable *cancellable,
+                                           NMSupplicantInterfaceRequestScanCallback callback,
+                                           gpointer user_data);
 
 NMSupplicantInterfaceState nm_supplicant_interface_get_state (NMSupplicantInterface * self);
 

From dec1678fecadfcbf25ed21e4929bfd36d8008f66 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 20:53:11 +0200
Subject: [PATCH 060/222] dhcp: enforce MUD URL to use "https://" scheme

nm_sd_http_url_is_valid_https() is rather clunky, but it is
this way, because we must not disagree with systemd code
about what makes a valid URL.

RFC 8520 says "MUD URLs MUST use the "https" scheme".

See-also: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/463#note_476190

Fixes: cedcea5ee812 ('libnm: fix verification of connection:mud-url property')
---
 libnm-core/nm-setting-connection.c  |  2 +-
 shared/systemd/nm-sd-utils-shared.c | 29 +++++++++++++++++------------
 shared/systemd/nm-sd-utils-shared.h |  2 +-
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index 545dd8168c..c47b461a9a 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -1244,7 +1244,7 @@ after_interface_name:
 			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL);
 			return FALSE;
 		}
-		if (!nm_sd_http_url_is_valid (priv->mud_url)) {
+		if (!nm_sd_http_url_is_valid_https (priv->mud_url)) {
 			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
 			                     _("MUD URL is not a valid URL"));
 			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL);
diff --git a/shared/systemd/nm-sd-utils-shared.c b/shared/systemd/nm-sd-utils-shared.c
index b4e017c94b..4444e6c7f6 100644
--- a/shared/systemd/nm-sd-utils-shared.c
+++ b/shared/systemd/nm-sd-utils-shared.c
@@ -99,13 +99,14 @@ gboolean nm_sd_hostname_is_valid (const char *s, bool allow_trailing_dot)
 /*****************************************************************************/
 
 static gboolean
-_http_url_is_valid (const char *url)
+_http_url_is_valid (const char *url, gboolean only_https)
 {
 	if (   !url
 	    || !url[0])
 		return FALSE;
 
-	if (NM_STR_HAS_PREFIX (url, "http://"))
+	if (   !only_https
+	    && NM_STR_HAS_PREFIX (url, "http://"))
 		url += NM_STRLEN ("http://");
 	else if (NM_STR_HAS_PREFIX (url, "https://"))
 		url += NM_STRLEN ("https://");
@@ -119,16 +120,20 @@ _http_url_is_valid (const char *url)
 }
 
 gboolean
-nm_sd_http_url_is_valid (const char *url)
+nm_sd_http_url_is_valid_https (const char *url)
 {
-	gboolean v;
-
-	/* http_url_is_valid() is part of our API, as we use it to validate connection
-	 * properties. That means, it's behavior must remain stable (or only change
-	 * with care).
+	/* We use this function to verify connection:mud-url property, it must thus
+	 * not change behavior.
 	 *
-	 * Thus, reimplement it, and make sure that our implementation agrees. */
-	v = _http_url_is_valid (url);
-	nm_assert (v == http_url_is_valid (url));
-	return v;
+	 * Note that sd_dhcp_client_set_mud_url() and sd_dhcp6_client_set_request_mud_url()
+	 * assert with http_url_is_valid() that the argument is valid. We thus must make
+	 * sure to only pass URLs that are valid according to http_url_is_valid().
+	 *
+	 * This is given, because our nm_sd_http_url_is_valid_https() is more strict
+	 * than http_url_is_valid().
+	 *
+	 * We only must make sure that this is also correct in the future, when we
+	 * re-import systemd code. */
+	nm_assert (_http_url_is_valid (url, FALSE) == http_url_is_valid (url));
+	return _http_url_is_valid (url, TRUE);
 }
diff --git a/shared/systemd/nm-sd-utils-shared.h b/shared/systemd/nm-sd-utils-shared.h
index 382db278d1..a3ca1edc03 100644
--- a/shared/systemd/nm-sd-utils-shared.h
+++ b/shared/systemd/nm-sd-utils-shared.h
@@ -36,6 +36,6 @@ gboolean nm_sd_hostname_is_valid(const char *s, bool allow_trailing_dot);
 
 /*****************************************************************************/
 
-gboolean nm_sd_http_url_is_valid (const char *url);
+gboolean nm_sd_http_url_is_valid_https (const char *url);
 
 #endif /* __NM_SD_UTILS_SHARED_H__ */

From d4e33a0c2b8641b4a48eb44a89fca2debc1495a9 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@google.com>
Date: Sat, 25 Apr 2020 20:36:57 +0200
Subject: [PATCH 061/222] libnm/meson.build: stop using env -i (just env)

env -i starts with an empty environment, which is undesired when the build
environment needs certain environment variables to function.

One such example is a custom PYTHONPATH, which gets dropped by env -i and
results in the nm-settings-docs.xml generator not finding the gi Python module.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/478
---
 libnm/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libnm/meson.build b/libnm/meson.build
index 98d39f8ea8..406766c707 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -255,7 +255,7 @@ if enable_introspection
   ld_library_path = meson.current_build_dir() + ld_library_path
 
   generate_setting_docs_env = [
-    'env', '-i',
+    'env',
     'GI_TYPELIB_PATH=' + gi_typelib_path,
     'LD_LIBRARY_PATH=' + ld_library_path,
   ]

From fc837cbb6f43c3718752ac4c8884c18b64fdec7c Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 26 Apr 2020 11:59:06 +0200
Subject: [PATCH 062/222] libnm/doc: clarify use of "ipv[46].gateway in
 nm-settings manual

---
 clients/common/settings-docs.h.in | 4 ++--
 libnm-core/nm-setting-ip-config.c | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 8415b82c5a..0bb88c6973 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -224,7 +224,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". The \"trust-ad\" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have \"trust-ad\" enabled.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set. This also requires \"never-default\" to be unset. Otherwise, the gateway will be cleared during normalization.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set. The gateway's main purpose is to control the next hop of the standard default route on the device. Hence, the gateway property conflicts with \"never-default\" and will be automatically dropped if the IP configuration is set to never-default. As an alternative to set the gateway, configure a static default route with /0 as prefix length.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured routes are ignored and only routes specified in the \"routes\" property, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_MAY_FAIL N_("If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.")
@@ -246,7 +246,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are \"attempts\", \"debug\", \"edns0\", \"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". The \"trust-ad\" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have \"trust-ad\" enabled.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set. This also requires \"never-default\" to be unset. Otherwise, the gateway will be cleared during normalization.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set. The gateway's main purpose is to control the next hop of the standard default route on the device. Hence, the gateway property conflicts with \"never-default\" and will be automatically dropped if the IP configuration is set to never-default. As an alternative to set the gateway, configure a static default route with /0 as prefix length.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured routes are ignored and only routes specified in the \"routes\" property, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IP6_PRIVACY N_("Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If 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: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to \"-1\" (unknown) means fallback to global configuration \"ipv6.ip6-privacy\". If also global configuration is 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\" setting as another way of avoiding host tracking with IPv6 addresses.")
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index a004e8f30f..36f09b694b 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -5686,8 +5686,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * The gateway associated with this configuration. This is only meaningful
 	 * if #NMSettingIPConfig:addresses is also set.
 	 *
-	 * This also requires #NMSettingIPConfig:never-default to be unset. Otherwise,
-	 * the gateway will be cleared during normalization.
+	 * The gateway's main purpose is to control the next hop of the standard default route on the device.
+	 * Hence, the gateway property conflicts with #NMSettingIPConfig:never-default and will be
+	 * automatically dropped if the IP configuration is set to never-default.
+	 *
+	 * As an alternative to set the gateway, configure a static default route with /0 as prefix
+	 * length.
 	 **/
 	obj_properties[PROP_GATEWAY] =
 	    g_param_spec_string (NM_SETTING_IP_CONFIG_GATEWAY, "", "",

From 552aa962d7a113ee9c107679fc28fa309c57ec66 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 27 Apr 2020 12:54:14 +0200
Subject: [PATCH 063/222] libnm,dhcp: use nm_clear_g_free() instead of
 nm_clear_pointer(, g_free)

---
 libnm-core/nm-utils.c       | 2 +-
 src/dhcp/nm-dhcp-nettools.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 4e83b16700..8bddbd23ea 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -2500,7 +2500,7 @@ nm_utils_tc_qdisc_from_str (const char *str, GError **error)
 			break;
 		}
 	}
-	nm_clear_pointer (&rest, g_free);
+	nm_clear_g_free (&rest);
 
 	if (options) {
 		value = g_hash_table_lookup (options, "");
diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c
index 46c72566ae..1019f33a2a 100644
--- a/src/dhcp/nm-dhcp-nettools.c
+++ b/src/dhcp/nm-dhcp-nettools.c
@@ -1461,7 +1461,7 @@ dispose (GObject *object)
 {
 	NMDhcpNettoolsPrivate *priv = NM_DHCP_NETTOOLS_GET_PRIVATE (object);
 
-	nm_clear_pointer (&priv->lease_file, g_free);
+	nm_clear_g_free (&priv->lease_file);
 	nm_clear_g_source_inst (&priv->event_source);
 	nm_clear_pointer (&priv->lease, n_dhcp4_client_lease_unref);
 	nm_clear_pointer (&priv->probe, n_dhcp4_client_probe_free);

From 2c4d19c1dccce2f17d73aabd1ba4fdeeb108a7a0 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Mon, 27 Apr 2020 15:38:09 +0200
Subject: [PATCH 064/222] examples: add Wi-Fi P2P example

Add a python example using GObject introspection that shows how to
scan for Wi-Fi P2P peers and connect to one of them.
---
 examples/python/gi/wifi-p2p.py | 109 +++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100755 examples/python/gi/wifi-p2p.py

diff --git a/examples/python/gi/wifi-p2p.py b/examples/python/gi/wifi-p2p.py
new file mode 100755
index 0000000000..746d8d7975
--- /dev/null
+++ b/examples/python/gi/wifi-p2p.py
@@ -0,0 +1,109 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2020 Red Hat, Inc.
+
+# This example performs a scan of Wi-Fi P2P peers and connects to one
+# of them.
+
+import sys
+import uuid
+import gi
+gi.require_version('NM', '1.0')
+from gi.repository import GLib, NM
+
+main_loop = None
+client = None
+
+def create_profile(name, peer_mac):
+    profile = NM.SimpleConnection.new()
+
+    s_con = NM.SettingConnection.new()
+    s_con.set_property(NM.SETTING_CONNECTION_ID, name)
+    s_con.set_property(NM.SETTING_CONNECTION_UUID, str(uuid.uuid4()))
+    s_con.set_property(NM.SETTING_CONNECTION_TYPE, "wifi-p2p")
+    s_con.set_property(NM.SETTING_CONNECTION_AUTOCONNECT, False)
+
+    s_ip4 = NM.SettingIP4Config.new()
+    s_ip4.set_property(NM.SETTING_IP_CONFIG_METHOD, "auto")
+
+    s_ip6 = NM.SettingIP6Config.new()
+    s_ip6.set_property(NM.SETTING_IP_CONFIG_METHOD, "auto")
+
+    s_wifi_p2p = NM.SettingWifiP2P.new()
+    s_wifi_p2p.set_property(NM.SETTING_WIFI_P2P_PEER, peer_mac)
+    s_wifi_p2p.set_property(NM.SETTING_WIFI_P2P_WFD_IES,
+                            GLib.Bytes.new(b'\x00\x00\x06\x00\x90\x1c\x44\x00\xc8'))
+
+    profile.add_setting(s_con)
+    profile.add_setting(s_ip4)
+    profile.add_setting(s_ip6)
+    profile.add_setting(s_wifi_p2p)
+
+    return profile
+
+def activated_cb(client, result, data):
+    try:
+        client.add_and_activate_connection2_finish(result)
+        print(" * Connection profile activated successfully")
+    except Exception as e:
+        sys.stderr.write("Error: %s\n" % e)
+    main_loop.quit()
+
+def scan_timeout_cb(device):
+    peers = device.get_peers()
+    if len(peers) == 0:
+        main_loop.quit()
+        sys.exit("No peer found")
+
+    print("\n   {:20} {:30} {:3} {:30}".format("MAC", "Name", "Sig", "Wfd-IEs"));
+    for p in peers:
+        if p.get_wfd_ies() is not None:
+            ies = p.get_wfd_ies().get_data().hex()
+        else:
+            ies = ""
+        print("   {:20} {:30} {:3} {:30}".format(p.get_hw_address(),
+                                                 p.get_name(),
+                                                 p.get_strength(),
+                                                 ies))
+    print("")
+
+    # Connect to first peer
+    profile = create_profile('P2P-connection', peers[0].get_hw_address())
+    client.add_and_activate_connection2(profile,
+                                        device,
+                                        "/",
+                                        GLib.Variant('a{sv}', {}),
+                                        None,
+                                        activated_cb,
+                                        None)
+    print(" * Connecting to peer {} using profile '{}'".format(peers[0].get_hw_address(),
+                                                               profile.get_id()))
+
+def start_find_cb(device, async_result, user_data):
+    try:
+        r = device.start_find_finish(async_result)
+    except Exception as e:
+        sys.stderr.write("Error: %s\n" % e)
+        main_loop.quit()
+
+    print(" * Scanning on device {}...".format(device.get_iface()));
+    GLib.timeout_add(10000, scan_timeout_cb, device)
+
+if __name__ == "__main__":
+    client = NM.Client.new(None)
+    device = None
+
+    devices = client.get_devices()
+    for d in devices:
+        if d.get_device_type() == NM.DeviceType.WIFI_P2P:
+            device = d
+            break
+
+    if device is None:
+        sys.exit("No Wi-Fi P2P device found")
+
+    device.start_find(GLib.Variant('a{sv}', {}), None, start_find_cb, None)
+
+    main_loop = GLib.MainLoop()
+    main_loop.run()

From b437bb4a6e8f4b1ca8678e8727b02b21d4cb7562 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 27 Apr 2020 20:28:04 +0200
Subject: [PATCH 065/222] vpn: clear host part of IPv6 routes received from VPN
 plugin

Kernel would reject adding a route with a destination host part not
all zero. NetworkManager generally coerces such routes and there
are assertions in place to ensure that.

We forgot to ensure that for certain IPv6 routes from VPN plugins.
This can cause an assertion failure and wrong behavior.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/425

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/482
---
 src/vpn/nm-vpn-connection.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c
index 35bf4afb3e..6be8d9bac6 100644
--- a/src/vpn/nm-vpn-connection.c
+++ b/src/vpn/nm-vpn-connection.c
@@ -1790,6 +1790,8 @@ nm_vpn_connection_ip6_config_get (NMVpnConnection *self, GVariant *dict)
 			route.metric = route_metric;
 			route.rt_source = NM_IP_CONFIG_SOURCE_VPN;
 
+			nm_utils_ip6_address_clear_host_address (&route.network, &route.network, route.plen);
+
 			/* Ignore host routes to the VPN gateway since NM adds one itself.
 			 * Since NM knows more about the routing situation than the VPN
 			 * server, we want to use the NM created route instead of whatever

From f89b841b37b2642fb0aaccf233dc5eb4de50ccf6 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 27 Apr 2020 20:29:13 +0200
Subject: [PATCH 066/222] vpn: cleanup loop in
 nm_vpn_connection_ip6_config_get()

I find it simpler to follow the pattern of checking conditions and
"erroring out", by going to the next entry. The entire loop already
behaves like that.
---
 src/vpn/nm-vpn-connection.c | 38 +++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c
index 6be8d9bac6..6d995dc489 100644
--- a/src/vpn/nm-vpn-connection.c
+++ b/src/vpn/nm-vpn-connection.c
@@ -1595,13 +1595,18 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict)
 				route.plen = plen;
 				route.network = nm_utils_ip4_address_clear_host_address (route.network, plen);
 
-				/* Ignore host routes to the VPN gateway since NM adds one itself
-				 * below.  Since NM knows more about the routing situation than
-				 * the VPN server, we want to use the NM created route instead of
-				 * whatever the server provides.
-				 */
-				if (!(priv->ip4_external_gw && route.network == priv->ip4_external_gw && route.plen == 32))
-					nm_ip4_config_add_route (config, &route, NULL);
+				if (   priv->ip4_external_gw
+				    && route.network == priv->ip4_external_gw
+				    && route.plen == 32) {
+					/* Ignore host routes to the VPN gateway since NM adds one itself
+					 * below.  Since NM knows more about the routing situation than
+					 * the VPN server, we want to use the NM created route instead of
+					 * whatever the server provides.
+					 */
+					break;
+				}
+
+				nm_ip4_config_add_route (config, &route, NULL);
 				break;
 			default:
 				break;
@@ -1792,13 +1797,18 @@ nm_vpn_connection_ip6_config_get (NMVpnConnection *self, GVariant *dict)
 
 			nm_utils_ip6_address_clear_host_address (&route.network, &route.network, route.plen);
 
-			/* Ignore host routes to the VPN gateway since NM adds one itself.
-			 * Since NM knows more about the routing situation than the VPN
-			 * server, we want to use the NM created route instead of whatever
-			 * the server provides.
-			 */
-			if (!(priv->ip6_external_gw && IN6_ARE_ADDR_EQUAL (&route.network, priv->ip6_external_gw) && route.plen == 128))
-				nm_ip6_config_add_route (config, &route, NULL);
+			if (   priv->ip6_external_gw
+			    && IN6_ARE_ADDR_EQUAL (&route.network, priv->ip6_external_gw)
+			    && route.plen == 128) {
+				/* Ignore host routes to the VPN gateway since NM adds one itself.
+				 * Since NM knows more about the routing situation than the VPN
+				 * server, we want to use the NM created route instead of whatever
+				 * the server provides.
+				 */
+				goto next;
+			}
+
+			nm_ip6_config_add_route (config, &route, NULL);
 
 next:
 			g_variant_unref (dest);

From e302f5ff77a9c6cc57c332e8274ce05ac85cf608 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 23 Apr 2020 08:48:33 +0200
Subject: [PATCH 067/222] device: flush IP configuration of slaves during
 activation

If a device only has an IPv6 link-local address, we don't generate an
assumed connection. Therefore, when a new slave connection (without IP
configuration) is activated on the device, we don't deactivate any
existing connection and the link-local address remains configured.

The IP configuration of an activated slave should be predictable and
not depend on the previous state; let's flush addresses and routes on
activation.

https://bugzilla.redhat.com/show_bug.cgi?id=1816517
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/480
---
 src/devices/nm-device.c | 41 ++++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 9b97a35c18..462620a5bd 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -10566,6 +10566,8 @@ act_stage3_ip_config_start (NMDevice *self,
 	} else {
 		NMSettingIP6ConfigPrivacy ip6_privacy = NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN;
 		const char *ip6_privacy_str = "0";
+		NMPlatform *platform;
+		int ifindex;
 
 		if (nm_streq (method, NM_SETTING_IP6_CONFIG_METHOD_DISABLED)) {
 			nm_device_sysctl_ip_conf_set (self, AF_INET6, "disable_ipv6", "1");
@@ -10573,18 +10575,35 @@ act_stage3_ip_config_start (NMDevice *self,
 		}
 
 		if (nm_streq (method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
-			if (   !priv->master
-			    && !nm_device_sys_iface_state_is_external (self)) {
-				gboolean ipv6ll_handle_old = priv->ipv6ll_handle;
+			if (!nm_device_sys_iface_state_is_external (self)) {
+				if (priv->master) {
+					/* If a device only has an IPv6 link-local address,
+					 * we don't generate an assumed connection. Therefore,
+					 * when a new slave connection (without IP configuration)
+					 * is activated on the device, the link-local address
+					 * remains configured. The IP configuration of an activated
+					 * slave should not depend on the previous state. Flush
+					 * addresses and routes on activation.
+					 */
+					ifindex = nm_device_get_ip_ifindex (self);
+					platform = nm_device_get_platform (self);
 
-				/* When activating an IPv6 'ignore' connection we need to revert back
-				 * to kernel IPv6LL, but the kernel won't actually assign an address
-				 * to the interface until disable_ipv6 is bounced.
-				 */
-				set_nm_ipv6ll (self, FALSE);
-				if (ipv6ll_handle_old)
-					nm_device_sysctl_ip_conf_set (self, AF_INET6, "disable_ipv6", "1");
-				restore_ip6_properties (self);
+					if (ifindex > 0) {
+						nm_platform_ip_route_flush (platform, AF_INET6, ifindex);
+						nm_platform_ip_address_flush (platform, AF_INET6, ifindex);
+					}
+				} else {
+					gboolean ipv6ll_handle_old = priv->ipv6ll_handle;
+
+					/* When activating an IPv6 'ignore' connection we need to revert back
+					 * to kernel IPv6LL, but the kernel won't actually assign an address
+					 * to the interface until disable_ipv6 is bounced.
+					 */
+					set_nm_ipv6ll (self, FALSE);
+					if (ipv6ll_handle_old)
+						nm_device_sysctl_ip_conf_set (self, AF_INET6, "disable_ipv6", "1");
+					restore_ip6_properties (self);
+				}
 			}
 			return NM_ACT_STAGE_RETURN_IP_DONE;
 		}

From e9ee4e39f199d4a69e2fc20f01e383ec73661018 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sat, 25 Apr 2020 08:22:32 +0200
Subject: [PATCH 068/222] cli: handle string properties that can both be empty
 and %NULL

The default value of a string property (almost?) always should be
%NULL, which means the value is absent and not specified.
That is necessary because adding new properties must be backward
compatible. That means, after upgrade those properties will have their
value unset. In these cases, %NULL really translates to some property
dependant behavior (like not using the value, or using a special default
value).

For example leaving "ethernet.cloned-mac-address" unset really means
"preserve", with the twist that %NULL can be overridden by a global
connection default.

For most string properties, a value can only be unset (%NULL) or set to
a non-empty string. nm_connection_verify() enforces that.

However, for some properties, it makes sense to allow both unset and the
empty word "" as value. This is the case if a property can have it's
value overridden by a global connection default, or if we need the
differentiation between having a value unset and having it set to the empty
word.

We would usually avoid allowing the empty word beside %NULL, because
that makes it hard to express the difference on the command line of
nmcli or in a UI text entry field. In the "ethernet.cloned-mac-address"
example, "" is not necessary nor sensible.

However, for some properties really all string values may be possible (including
"") and also unset/%NULL. Then, we need some form of escaping/mangling,
to allow to express all possible values. The chosen style here is that
on nmcli input field "" means %NULL, while a word with all white space
stands for the word with one less white space characters.

This is still unused, but I think it makes sense for some properties.
I initially added this for "connection.mud-url", but a valid MUD-URL
always must start with "https://", so not all strings are possible
to begin with. So to explicitly express that no MUD-URL should be set,
we will instead introduce a special word "none", and not use the empty
word, due to the oddities discussed here. However, I think this may
well make sense for some properties where all strings are valid.
---
 clients/common/nm-meta-setting-desc.c | 50 ++++++++++++++++++++++-----
 clients/common/nm-meta-setting-desc.h |  1 +
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index b7aacd7907..4f4758fc49 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -783,6 +783,17 @@ _coerce_str_emptyunset (NMMetaAccessorGetType get_type,
 	return cstr;
 }
 
+#define RETURN_STR_EMPTYUNSET(get_type, is_default, cstr) \
+	G_STMT_START { \
+		char *_str = NULL; \
+		const char *_cstr; \
+		\
+		_cstr = _coerce_str_emptyunset ((get_type), (is_default), (cstr), &_str); \
+		if (_str) \
+			RETURN_STR_TO_FREE (_str); \
+		RETURN_STR_TEMPORARY (_cstr); \
+	} G_STMT_END
+
 static gboolean
 _is_default (const NMMetaPropertyInfo *property_info,
              NMSetting *setting)
@@ -836,6 +847,19 @@ _get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info,
 	           || (   gtype_prop == G_TYPE_STRV
 	               && !glib_handles_str_transform));
 
+	if (gtype_prop == G_TYPE_STRING) {
+		nm_assert (glib_handles_str_transform);
+		nm_assert (!handle_emptyunset);
+		if (   property_info->property_typ_data
+		    && property_info->property_typ_data->subtype.gobject_string.handle_emptyunset) {
+			/* This string property can both be empty and NULL. We need to
+			 * signal them differently. */
+			cstr = g_value_get_string (&val);
+			nm_assert ((!!is_default) == (cstr == NULL));
+			RETURN_STR_EMPTYUNSET (get_type, is_default, NULL);
+		}
+	}
+
 	if (glib_handles_str_transform)
 		RETURN_STR_TEMPORARY (g_value_get_string (&val));
 
@@ -857,15 +881,9 @@ _get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info,
 		if (strv && strv[0])
 			RETURN_STR_TO_FREE (g_strjoinv (",", (char **) strv));
 
-		/* special hack for handling properties that can be empty and unset
-		 * (see multilist.clear_emptyunset_fcn). */
 		if (handle_emptyunset) {
-			char *str = NULL;
-
-			cstr = _coerce_str_emptyunset (get_type, is_default, NULL, &str);
-			if (str)
-				RETURN_STR_TO_FREE (str);
-			RETURN_STR_TEMPORARY (cstr);
+			/* we need to express empty lists from unset lists differently. */
+			RETURN_STR_EMPTYUNSET (get_type, is_default, NULL);
 		}
 
 		return "";
@@ -1183,6 +1201,22 @@ _set_fcn_gobject_string (ARGS_SET_FCN)
 		return _gobject_property_reset_default (setting, property_info->property_name);
 
 	if (property_info->property_typ_data) {
+		if (property_info->property_typ_data->subtype.gobject_string.handle_emptyunset) {
+			if (   value
+			    && value[0]
+			    && NM_STRCHAR_ALL (value, ch, ch == ' ')) {
+				/* this string property can both be %NULL and empty. To express that, we coerce
+				 * a value of all whitespaces to dropping the first whitespace. That means,
+				 * " " gives "", "  " gives " ", and so on.
+				 *
+				 * This way the user can set the string value to "" (meaning NULL) and to
+				 * " " (meaning ""), and any other string.
+				 *
+				 * This is and non-obvious escaping mechanism. But out of all the possible
+				 * solutions, it seems the most sensible one. */
+				value++;
+			}
+		}
 		if (property_info->property_typ_data->subtype.gobject_string.validate_fcn) {
 			value = property_info->property_typ_data->subtype.gobject_string.validate_fcn (value, &to_free, error);
 			if (!value)
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
index 2ba48f5de2..639f4200e3 100644
--- a/clients/common/nm-meta-setting-desc.h
+++ b/clients/common/nm-meta-setting-desc.h
@@ -257,6 +257,7 @@ struct _NMMetaPropertyTypData {
 		} gobject_int;
 		struct {
 			const char *(*validate_fcn) (const char *value, char **out_to_free, GError **error);
+			bool handle_emptyunset:1;
 		} gobject_string;
 		struct {
 			bool legacy_format:1;

From 9b295f0df56880be2677f18a21bc6b5c27c51dfc Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sat, 25 Apr 2020 07:46:56 +0200
Subject: [PATCH 069/222] dhcp: make connection.mud-url configurable as global
 connection default

Conceptionally, the MUD URL really depends on the device, and not so
much the connection profile. That is, when you have a specific IoT
device, then this device probably should use the same MUD URL for all
profiles (at least by default).

We already have a mechanism for that: global connection defaults. Use
that. This allows a vendor drop pre-install a file
"/usr/lib/NetworkManager/conf.d/10-mud-url.conf" with

  [connection-10-mud-url]
  connection.mud-url=https://example.com

Note that we introduce the special "connection.mud-url" value "none", to
indicate not to use a MUD URL (but also not to consult the global connection
default).
---
 clients/common/settings-docs.h.in             |  2 +-
 libnm-core/nm-setting-connection.c            | 34 +++++++++++------
 man/NetworkManager.conf.xml                   |  4 ++
 .../nm-libnm-core-intern/nm-common-macros.h   |  2 +
 src/devices/nm-device.c                       | 38 ++++++++++++++++++-
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |  2 +-
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    |  2 +-
 7 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 0bb88c6973..c9667b47c8 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -152,7 +152,7 @@
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MASTER N_("Interface name of the master device or UUID of the master connection.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("Whether mDNS is enabled for the connection. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable mDNS for the interface, \"resolve\" (1) do not register hostname but allow resolving of mDNS host names and \"default\" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"no\"). This feature requires a plugin which supports mDNS. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_METERED N_("Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.")
-#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MUD_URL N_("If configured, set to a Manufacturer Usage Description (MUD) URL that points to manufacturer-recommended network policies for IoT devices. It is transmitted as a DHCPv4 or DHCPv6 option.")
+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MUD_URL N_("If configured, set to a Manufacturer Usage Description (MUD) URL that points to manufacturer-recommended network policies for IoT devices. It is transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL starting with \"https://\". The special value \"none\" is allowed to indicate that no MUD URL is used. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the ultimate default is \"none\".")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MULTI_CONNECT N_("Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_PERMISSIONS N_("An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection; otherwise users are allowed if and only if they are in this list.  When this is not empty, the connection can be active only when one of the specified users is logged into an active session.  Each entry is of the form \"[type]:[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this time only the \"user\" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the \":\" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_READ_ONLY N_("FALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.")
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index c47b461a9a..018129bef2 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -8,6 +8,7 @@
 
 #include "nm-setting-connection.h"
 
+#include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-core-enum-types.h"
@@ -1238,17 +1239,21 @@ after_interface_name:
 			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL);
 			return FALSE;
 		}
-		if (strlen (priv->mud_url) > 255) {
-			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
-			                     _("DHCP option cannot be longer than 255 characters"));
-			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL);
-			return FALSE;
-		}
-		if (!nm_sd_http_url_is_valid_https (priv->mud_url)) {
-			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
-			                     _("MUD URL is not a valid URL"));
-			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL);
-			return FALSE;
+		if (nm_streq (priv->mud_url, NM_CONNECTION_MUD_URL_NONE)) {
+			/* pass */
+		} else {
+			if (strlen (priv->mud_url) > 255) {
+				g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				                     _("DHCP option cannot be longer than 255 characters"));
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL);
+				return FALSE;
+			}
+			if (!nm_sd_http_url_is_valid_https (priv->mud_url)) {
+				g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				                     _("MUD URL is not a valid URL"));
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL);
+				return FALSE;
+			}
 		}
 	}
 
@@ -2341,7 +2346,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 *
 	 * If configured, set to a Manufacturer Usage Description (MUD) URL that points
 	 * to manufacturer-recommended network policies for IoT devices. It is transmitted
-	 * as a DHCPv4 or DHCPv6 option.
+	 * as a DHCPv4 or DHCPv6 option. The value must be a valid URL starting with "https://".
+	 *
+	 * The special value "none" is allowed to indicate that no MUD URL is used.
+	 *
+	 * If the per-profile value is unspecified (the default), a global connection default gets
+	 * consulted. If still unspecified, the ultimate default is "none".
 	 *
 	 * Since: 1.26
 	 **/
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 6aa0398e64..76a535fb5d 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -678,6 +678,10 @@ ipv6.ip6-privacy=0
         <varlistentry>
           <term><varname>connection.autoconnect-slaves</varname></term>
         </varlistentry>
+        <varlistentry>
+          <term><varname>connection.mud-url</varname></term>
+          <listitem><para>If unspecified, MUD URL defaults to <literal>"none"</literal>.</para></listitem>
+        </varlistentry>
         <varlistentry>
           <term><varname>connection.lldp</varname></term>
         </varlistentry>
diff --git a/shared/nm-libnm-core-intern/nm-common-macros.h b/shared/nm-libnm-core-intern/nm-common-macros.h
index 5f011efd64..fcfe6919b0 100644
--- a/shared/nm-libnm-core-intern/nm-common-macros.h
+++ b/shared/nm-libnm-core-intern/nm-common-macros.h
@@ -46,6 +46,8 @@ NM_CLONED_MAC_IS_SPECIAL (const char *str)
 #define NM_IAID_IFNAME             "ifname"
 #define NM_IAID_STABLE             "stable"
 
+#define NM_CONNECTION_MUD_URL_NONE "none"
+
 static inline gboolean
 NM_IAID_IS_SPECIAL (const char *str)
 {
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 462620a5bd..d400d90617 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -24,6 +24,7 @@
 #include "nm-std-aux/unaligned.h"
 #include "nm-glib-aux/nm-dedup-multi.h"
 #include "nm-glib-aux/nm-random-utils.h"
+#include "systemd/nm-sd-utils-shared.h"
 
 #include "nm-libnm-core-intern/nm-ethtool-utils.h"
 #include "nm-libnm-core-intern/nm-common-macros.h"
@@ -8288,6 +8289,37 @@ get_dhcp_hostname_flags (NMDevice *self, int addr_family)
 		return NM_DHCP_HOSTNAME_FLAGS_FQDN_DEFAULT_IP6;
 }
 
+static const char *
+connection_get_mud_url (NMDevice *self,
+                        NMSettingConnection *s_con,
+                        char **out_mud_url)
+{
+	const char *mud_url;
+	gs_free char *s = NULL;
+
+	nm_assert (out_mud_url && !*out_mud_url);
+
+	mud_url = nm_setting_connection_get_mud_url (s_con);
+
+	if (mud_url) {
+		if (nm_streq (mud_url, NM_CONNECTION_MUD_URL_NONE))
+			return NULL;
+		return mud_url;
+	}
+
+	s = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA,
+	                                           NM_CON_DEFAULT ("connection.mud-url"),
+	                                           self);
+	if (s) {
+		if (nm_streq (s, NM_CONNECTION_MUD_URL_NONE))
+			return NULL;
+		if (nm_sd_http_url_is_valid_https (s))
+			return (*out_mud_url = g_steal_pointer (&s));
+	}
+
+	return NULL;
+}
+
 static GBytes *
 dhcp4_get_client_id (NMDevice *self,
                      NMConnection *connection,
@@ -8426,6 +8458,7 @@ dhcp4_start (NMDevice *self)
 	gs_unref_bytes GBytes *hwaddr = NULL;
 	gs_unref_bytes GBytes *bcast_hwaddr = NULL;
 	gs_unref_bytes GBytes *client_id = NULL;
+	gs_free char *mud_url_free = NULL;
 	NMConnection *connection;
 	NMSettingConnection *s_con;
 	GError *error = NULL;
@@ -8465,7 +8498,7 @@ dhcp4_start (NMDevice *self)
 	                                                      nm_setting_ip_config_get_dhcp_hostname (s_ip4),
 	                                                      nm_setting_ip4_config_get_dhcp_fqdn (NM_SETTING_IP4_CONFIG (s_ip4)),
 	                                                      get_dhcp_hostname_flags (self, AF_INET),
-	                                                      nm_setting_connection_get_mud_url (s_con),
+	                                                      connection_get_mud_url (self, s_con, &mud_url_free),
 	                                                      client_id,
 	                                                      get_dhcp_timeout (self, AF_INET),
 	                                                      priv->dhcp_anycast_address,
@@ -9213,6 +9246,7 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection)
 	gs_unref_bytes GBytes *duid = NULL;
 	gboolean enforce_duid = FALSE;
 	const NMPlatformLink *pllink;
+	gs_free char *mud_url_free = NULL;
 	GError *error = NULL;
 	guint32 iaid;
 	gboolean iaid_explicit;
@@ -9259,7 +9293,7 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection)
 	                                                      nm_setting_ip_config_get_dhcp_send_hostname (s_ip6),
 	                                                      nm_setting_ip_config_get_dhcp_hostname (s_ip6),
 	                                                      get_dhcp_hostname_flags (self, AF_INET6),
-	                                                      nm_setting_connection_get_mud_url (s_con),
+	                                                      connection_get_mud_url (self, s_con, &mud_url_free),
 	                                                      duid,
 	                                                      enforce_duid,
 	                                                      iaid,
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index ad5d45ac3a..db9d0d4c76 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -583,7 +583,7 @@ make_connection_setting (const char *file,
 	}
 
 	nm_clear_g_free (&value);
-	v = svGetValueStr (ifcfg, "MUD_URL", &value);
+	v = svGetValue (ifcfg, "MUD_URL", &value);
 	if (v)
 		g_object_set (s_con, NM_SETTING_CONNECTION_MUD_URL, v, NULL);
 
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 1fd29480d2..52d59ec33f 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1868,7 +1868,7 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg)
 	svSetValueStr (ifcfg, "TEAM_MASTER", NULL);
 
 	mud_url = nm_setting_connection_get_mud_url (s_con);
-	svSetValueStr (ifcfg, "MUD_URL", mud_url);
+	svSetValue (ifcfg, "MUD_URL", mud_url);
 
 	master = nm_setting_connection_get_master (s_con);
 	if (master) {

From 3cf1e8395e2b6b007b45b9dedcb76289ec977e05 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sat, 25 Apr 2020 09:53:12 +0200
Subject: [PATCH 070/222] cli: hide default setting of "connection.mud-url"
 from nmcli output

"connection.mud-url" is a commonly not used parameter, that most
users won't care. To minimize the output of

  $ nmcli connection show "$PROFILE"

hide the MUD URL if it is unset.

This mechanism of nmcli is not yet great, because there is currently
no way to print a default value, and

  $ nmcli -f connection.mud-url connection show "$PROFILE"

does not work as one would expect(??). But that is a shortcoming of the
general mechanism in nmcli, and not specific to the MUD URL property.
---
 clients/common/nm-meta-setting-desc.c         |   1 +
 .../test_002.expected                         |  10 +-
 .../test_003.expected                         | 482 ++++++-------
 .../test_004.expected                         | 678 ++++++++----------
 4 files changed, 517 insertions(+), 654 deletions(-)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 4f4758fc49..66c1a4f1be 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -5263,6 +5263,7 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_MUD_URL,
 	    .property_type =                &_pt_gobject_string,
+	    .hide_if_default =              TRUE,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT,
 	    .property_type =                &_pt_gobject_int,
diff --git a/clients/tests/test-client.check-on-disk/test_002.expected b/clients/tests/test-client.check-on-disk/test_002.expected
index 1b40086ec8..1c6eecc59b 100644
--- a/clients/tests/test-client.check-on-disk/test_002.expected
+++ b/clients/tests/test-client.check-on-disk/test_002.expected
@@ -502,12 +502,12 @@ NAME   UUID                                  TYPE      DEVICE
 con-1  5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
 
 <<<
-size: 1306
+size: 1263
 location: clients/tests/test-client.py:test_002()/23
 cmd: $NMCLI c s con-1
 lang: C
 returncode: 0
-stdout: 1181 bytes
+stdout: 1138 bytes
 >>>
 connection.id:                          con-1
 connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -532,16 +532,15 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 
 <<<
-size: 1318
+size: 1275
 location: clients/tests/test-client.py:test_002()/24
 cmd: $NMCLI c s con-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1183 bytes
+stdout: 1140 bytes
 >>>
 connection.id:                          con-1
 connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -566,7 +565,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 
 <<<
diff --git a/clients/tests/test-client.check-on-disk/test_003.expected b/clients/tests/test-client.check-on-disk/test_003.expected
index 2b8f720f56..9517e81fe1 100644
--- a/clients/tests/test-client.check-on-disk/test_003.expected
+++ b/clients/tests/test-client.check-on-disk/test_003.expected
@@ -150,12 +150,12 @@ id
 path
 uuid
 <<<
-size: 4490
+size: 4447
 location: clients/tests/test-client.py:test_003()/12
 cmd: $NMCLI con s con-gsm1
 lang: C
 returncode: 0
-stdout: 4360 bytes
+stdout: 4317 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -180,7 +180,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -255,12 +254,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4520
+size: 4477
 location: clients/tests/test-client.py:test_003()/13
 cmd: $NMCLI con s con-gsm1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4380 bytes
+stdout: 4337 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -285,7 +284,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -492,12 +490,12 @@ UUID                                  NAME
 UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
 
 <<<
-size: 4265
+size: 4222
 location: clients/tests/test-client.py:test_003()/25
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
-stdout: 4128 bytes
+stdout: 4085 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -522,7 +520,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -592,12 +589,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4293
+size: 4250
 location: clients/tests/test-client.py:test_003()/26
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4146 bytes
+stdout: 4103 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -622,7 +619,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -712,12 +708,12 @@ stdout: 51 bytes
 GENERAL.STATE:                          aktywowano
 
 <<<
-size: 4965
+size: 4922
 location: clients/tests/test-client.py:test_003()/29
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 4835 bytes
+stdout: 4792 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -742,7 +738,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -825,12 +820,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4997
+size: 4954
 location: clients/tests/test-client.py:test_003()/30
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4857 bytes
+stdout: 4814 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -855,7 +850,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -1408,12 +1402,12 @@ UUID                                  NAME
 UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
 
 <<<
-size: 4265
+size: 4222
 location: clients/tests/test-client.py:test_003()/50
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
-stdout: 4128 bytes
+stdout: 4085 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1438,7 +1432,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -1508,12 +1501,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4293
+size: 4250
 location: clients/tests/test-client.py:test_003()/51
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4146 bytes
+stdout: 4103 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1538,7 +1531,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -1632,12 +1624,12 @@ GENERAL.STATE:                          aktywowano
 GENERAL.STATE:                          aktywowano
 
 <<<
-size: 5673
+size: 5630
 location: clients/tests/test-client.py:test_003()/54
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 5543 bytes
+stdout: 5500 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1662,7 +1654,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -1759,12 +1750,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5709
+size: 5666
 location: clients/tests/test-client.py:test_003()/55
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5569 bytes
+stdout: 5526 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1789,7 +1780,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -2274,12 +2264,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5676
+size: 5633
 location: clients/tests/test-client.py:test_003()/68
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 5546 bytes
+stdout: 5503 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2304,7 +2294,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -2401,12 +2390,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5713
+size: 5670
 location: clients/tests/test-client.py:test_003()/69
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5573 bytes
+stdout: 5530 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2431,7 +2420,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -2528,12 +2516,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5008
+size: 4965
 location: clients/tests/test-client.py:test_003()/70
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4838 bytes
+stdout: 4795 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2558,7 +2546,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -2641,12 +2628,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5041
+size: 4998
 location: clients/tests/test-client.py:test_003()/71
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4861 bytes
+stdout: 4818 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2671,7 +2658,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -2952,12 +2938,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5688
+size: 5645
 location: clients/tests/test-client.py:test_003()/78
 cmd: $NMCLI --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5546 bytes
+stdout: 5503 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2982,7 +2968,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -3079,12 +3064,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5725
+size: 5682
 location: clients/tests/test-client.py:test_003()/79
 cmd: $NMCLI --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5573 bytes
+stdout: 5530 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3109,7 +3094,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -3206,12 +3190,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5020
+size: 4977
 location: clients/tests/test-client.py:test_003()/80
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4838 bytes
+stdout: 4795 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3236,7 +3220,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -3319,12 +3302,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5053
+size: 5010
 location: clients/tests/test-client.py:test_003()/81
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4861 bytes
+stdout: 4818 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3349,7 +3332,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -3646,12 +3628,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6930
+size: 6887
 location: clients/tests/test-client.py:test_003()/88
 cmd: $NMCLI --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 6791 bytes
+stdout: 6748 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -3679,7 +3661,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -3789,12 +3770,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6986
+size: 6943
 location: clients/tests/test-client.py:test_003()/89
 cmd: $NMCLI --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6837 bytes
+stdout: 6794 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -3822,7 +3803,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -3932,12 +3912,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5949
+size: 5906
 location: clients/tests/test-client.py:test_003()/90
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5770 bytes
+stdout: 5727 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -3965,7 +3945,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -4057,12 +4036,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5994
+size: 5951
 location: clients/tests/test-client.py:test_003()/91
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5805 bytes
+stdout: 5762 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4090,7 +4069,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -4420,12 +4398,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6942
+size: 6899
 location: clients/tests/test-client.py:test_003()/98
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 6791 bytes
+stdout: 6748 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -4453,7 +4431,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -4563,12 +4540,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6998
+size: 6955
 location: clients/tests/test-client.py:test_003()/99
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6837 bytes
+stdout: 6794 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4596,7 +4573,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -4706,12 +4682,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5962
+size: 5919
 location: clients/tests/test-client.py:test_003()/100
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5770 bytes
+stdout: 5727 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -4739,7 +4715,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -4831,12 +4806,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6007
+size: 5964
 location: clients/tests/test-client.py:test_003()/101
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5805 bytes
+stdout: 5762 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4864,7 +4839,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -5174,12 +5148,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 3021
+size: 3001
 location: clients/tests/test-client.py:test_003()/108
 cmd: $NMCLI --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 2882 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5204,7 +5178,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -5301,12 +5274,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3031
+size: 3011
 location: clients/tests/test-client.py:test_003()/109
 cmd: $NMCLI --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2882 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5331,7 +5304,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -5428,12 +5400,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2675
+size: 2655
 location: clients/tests/test-client.py:test_003()/110
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2496 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5458,7 +5430,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -5541,12 +5512,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2685
+size: 2665
 location: clients/tests/test-client.py:test_003()/111
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2496 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5571,7 +5542,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -5848,12 +5818,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 3033
+size: 3013
 location: clients/tests/test-client.py:test_003()/118
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 2882 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5878,7 +5848,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -5975,12 +5944,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3043
+size: 3023
 location: clients/tests/test-client.py:test_003()/119
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2882 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -6005,7 +5974,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -6102,12 +6070,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2687
+size: 2667
 location: clients/tests/test-client.py:test_003()/120
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2496 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -6132,7 +6100,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -6215,12 +6182,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2697
+size: 2677
 location: clients/tests/test-client.py:test_003()/121
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2496 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -6245,7 +6212,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -6526,15 +6492,15 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 3754
+size: 3736
 location: clients/tests/test-client.py:test_003()/128
 cmd: $NMCLI --mode tabular con s ethernet
 lang: C
 returncode: 0
-stdout: 3608 bytes
+stdout: 3590 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
@@ -6557,15 +6523,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 3788
+size: 3770
 location: clients/tests/test-client.py:test_003()/129
 cmd: $NMCLI --mode tabular con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3632 bytes
+stdout: 3614 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
@@ -6588,15 +6554,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deza
 
 
 <<<
-size: 3292
+size: 3274
 location: clients/tests/test-client.py:test_003()/130
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 3106 bytes
+stdout: 3088 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
@@ -6615,15 +6581,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 3324
+size: 3306
 location: clients/tests/test-client.py:test_003()/131
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3128 bytes
+stdout: 3110 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
@@ -6770,15 +6736,15 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 3766
+size: 3748
 location: clients/tests/test-client.py:test_003()/138
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 3608 bytes
+stdout: 3590 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
@@ -6801,15 +6767,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 3800
+size: 3782
 location: clients/tests/test-client.py:test_003()/139
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3632 bytes
+stdout: 3614 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
@@ -6832,15 +6798,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deza
 
 
 <<<
-size: 3304
+size: 3286
 location: clients/tests/test-client.py:test_003()/140
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 3106 bytes
+stdout: 3088 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
@@ -6859,15 +6825,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 3336
+size: 3318
 location: clients/tests/test-client.py:test_003()/141
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3128 bytes
+stdout: 3110 bytes
 >>>
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
@@ -7030,19 +6996,19 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6116
+size: 6089
 location: clients/tests/test-client.py:test_003()/148
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 5961 bytes
+stdout: 5934 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
 =========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7077,19 +7043,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 6210
+size: 6183
 location: clients/tests/test-client.py:test_003()/149
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6045 bytes
+stdout: 6018 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
 ===========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7124,19 +7090,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deza
 
 
 <<<
-size: 5192
+size: 5165
 location: clients/tests/test-client.py:test_003()/150
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4997 bytes
+stdout: 4970 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
 =========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7163,19 +7129,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 5264
+size: 5237
 location: clients/tests/test-client.py:test_003()/151
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5059 bytes
+stdout: 5032 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
 ===========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7370,19 +7336,19 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6128
+size: 6101
 location: clients/tests/test-client.py:test_003()/158
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5961 bytes
+stdout: 5934 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
 =========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7417,19 +7383,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 6222
+size: 6195
 location: clients/tests/test-client.py:test_003()/159
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6045 bytes
+stdout: 6018 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
 ===========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7464,19 +7430,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deza
 
 
 <<<
-size: 5204
+size: 5177
 location: clients/tests/test-client.py:test_003()/160
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4997 bytes
+stdout: 4970 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
 =========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7503,19 +7469,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 5276
+size: 5249
 location: clients/tests/test-client.py:test_003()/161
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5059 bytes
+stdout: 5032 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
 ===========================================
-name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7690,14 +7656,14 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 844
+size: 843
 location: clients/tests/test-client.py:test_003()/168
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 691 bytes
+stdout: 690 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7707,14 +7673,14 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 854
+size: 853
 location: clients/tests/test-client.py:test_003()/169
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 691 bytes
+stdout: 690 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7724,14 +7690,14 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 696
+size: 695
 location: clients/tests/test-client.py:test_003()/170
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 503 bytes
+stdout: 502 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7739,14 +7705,14 @@ proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 706
+size: 705
 location: clients/tests/test-client.py:test_003()/171
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 503 bytes
+stdout: 502 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7844,14 +7810,14 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 856
+size: 855
 location: clients/tests/test-client.py:test_003()/178
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 691 bytes
+stdout: 690 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7861,14 +7827,14 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 866
+size: 865
 location: clients/tests/test-client.py:test_003()/179
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 691 bytes
+stdout: 690 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7878,14 +7844,14 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 708
+size: 707
 location: clients/tests/test-client.py:test_003()/180
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 503 bytes
+stdout: 502 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -7893,14 +7859,14 @@ proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 718
+size: 717
 location: clients/tests/test-client.py:test_003()/181
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 503 bytes
+stdout: 502 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
@@ -8146,12 +8112,12 @@ UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:                                   ethernet
 
 <<<
-size: 5694
+size: 5651
 location: clients/tests/test-client.py:test_003()/188
 cmd: $NMCLI --mode multiline con s ethernet
 lang: C
 returncode: 0
-stdout: 5546 bytes
+stdout: 5503 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8176,7 +8142,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -8273,12 +8238,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5731
+size: 5688
 location: clients/tests/test-client.py:test_003()/189
 cmd: $NMCLI --mode multiline con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5573 bytes
+stdout: 5530 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8303,7 +8268,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -8400,12 +8364,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5026
+size: 4983
 location: clients/tests/test-client.py:test_003()/190
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4838 bytes
+stdout: 4795 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8430,7 +8394,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -8513,12 +8476,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5059
+size: 5016
 location: clients/tests/test-client.py:test_003()/191
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4861 bytes
+stdout: 4818 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8543,7 +8506,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -8968,12 +8930,12 @@ UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:                                   ethernet
 
 <<<
-size: 5706
+size: 5663
 location: clients/tests/test-client.py:test_003()/198
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5546 bytes
+stdout: 5503 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8998,7 +8960,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -9095,12 +9056,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5743
+size: 5700
 location: clients/tests/test-client.py:test_003()/199
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5573 bytes
+stdout: 5530 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -9125,7 +9086,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -9222,12 +9182,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5038
+size: 4995
 location: clients/tests/test-client.py:test_003()/200
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4838 bytes
+stdout: 4795 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -9252,7 +9212,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -9335,12 +9294,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5071
+size: 5028
 location: clients/tests/test-client.py:test_003()/201
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4861 bytes
+stdout: 4818 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -9365,7 +9324,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -9820,12 +9778,12 @@ TYPE:                                   ethernet
 -------------------------------------------------------------------------------
 
 <<<
-size: 6948
+size: 6905
 location: clients/tests/test-client.py:test_003()/208
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 6791 bytes
+stdout: 6748 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -9853,7 +9811,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -9963,12 +9920,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 7004
+size: 6961
 location: clients/tests/test-client.py:test_003()/209
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6837 bytes
+stdout: 6794 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -9996,7 +9953,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -10106,12 +10062,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5967
+size: 5924
 location: clients/tests/test-client.py:test_003()/210
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5770 bytes
+stdout: 5727 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -10139,7 +10095,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -10231,12 +10186,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6012
+size: 5969
 location: clients/tests/test-client.py:test_003()/211
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5805 bytes
+stdout: 5762 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -10264,7 +10219,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -10752,12 +10706,12 @@ TYPE:                                   ethernet
 -------------------------------------------------------------------------------
 
 <<<
-size: 6960
+size: 6917
 location: clients/tests/test-client.py:test_003()/218
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 6791 bytes
+stdout: 6748 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -10785,7 +10739,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -10895,12 +10848,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 7016
+size: 6973
 location: clients/tests/test-client.py:test_003()/219
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6837 bytes
+stdout: 6794 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -10928,7 +10881,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -11038,12 +10990,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5979
+size: 5936
 location: clients/tests/test-client.py:test_003()/220
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5770 bytes
+stdout: 5727 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -11071,7 +11023,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -11163,12 +11114,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6024
+size: 5981
 location: clients/tests/test-client.py:test_003()/221
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5805 bytes
+stdout: 5762 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -11196,7 +11147,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
@@ -11654,12 +11604,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:802-3-ethernet
 
 <<<
-size: 3038
+size: 3018
 location: clients/tests/test-client.py:test_003()/228
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 2882 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11684,7 +11634,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -11781,12 +11730,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3048
+size: 3028
 location: clients/tests/test-client.py:test_003()/229
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2882 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11811,7 +11760,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -11908,12 +11856,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2692
+size: 2672
 location: clients/tests/test-client.py:test_003()/230
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2496 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11938,7 +11886,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -12021,12 +11968,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2702
+size: 2682
 location: clients/tests/test-client.py:test_003()/231
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2496 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12051,7 +11998,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -12476,12 +12422,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:802-3-ethernet
 
 <<<
-size: 3050
+size: 3030
 location: clients/tests/test-client.py:test_003()/238
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 2882 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12506,7 +12452,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -12603,12 +12548,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3060
+size: 3040
 location: clients/tests/test-client.py:test_003()/239
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2882 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12633,7 +12578,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -12730,12 +12674,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2704
+size: 2684
 location: clients/tests/test-client.py:test_003()/240
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2496 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12760,7 +12704,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
@@ -12843,12 +12786,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2714
+size: 2694
 location: clients/tests/test-client.py:test_003()/241
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2496 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12873,7 +12816,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
diff --git a/clients/tests/test-client.check-on-disk/test_004.expected b/clients/tests/test-client.check-on-disk/test_004.expected
index 2c7418bfcf..08be36d466 100644
--- a/clients/tests/test-client.check-on-disk/test_004.expected
+++ b/clients/tests/test-client.check-on-disk/test_004.expected
@@ -58,12 +58,12 @@ location: clients/tests/test-client.py:test_004()/7
 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128
 lang: C
 returncode: 0
-size: 4507
+size: 4464
 location: clients/tests/test-client.py:test_004()/8
 cmd: $NMCLI con s con-xx1
 lang: C
 returncode: 0
-stdout: 4379 bytes
+stdout: 4336 bytes
 >>>
 connection.id:                          con-xx1
 connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -88,7 +88,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-11-wireless.ssid:                   foobar
 802-11-wireless.mode:                   infrastructure
@@ -161,12 +160,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4535
+size: 4492
 location: clients/tests/test-client.py:test_004()/9
 cmd: $NMCLI con s con-xx1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4397 bytes
+stdout: 4354 bytes
 >>>
 connection.id:                          con-xx1
 connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -191,7 +190,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 802-11-wireless.ssid:                   foobar
 802-11-wireless.mode:                   infrastructure
@@ -300,12 +298,12 @@ con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       --
 con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      --     
 
 <<<
-size: 3974
+size: 3931
 location: clients/tests/test-client.py:test_004()/13
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3843 bytes
+stdout: 3800 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -330,7 +328,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -392,12 +389,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3994
+size: 3951
 location: clients/tests/test-client.py:test_004()/14
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3853 bytes
+stdout: 3810 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -422,7 +419,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -556,12 +552,12 @@ con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      wlan0
 con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
 
 <<<
-size: 5099
+size: 5056
 location: clients/tests/test-client.py:test_004()/21
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4968 bytes
+stdout: 4925 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -586,7 +582,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -669,12 +664,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5125
+size: 5082
 location: clients/tests/test-client.py:test_004()/22
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4984 bytes
+stdout: 4941 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -699,7 +694,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -782,12 +776,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5105
+size: 5062
 location: clients/tests/test-client.py:test_004()/23
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4974 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -812,7 +806,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -895,12 +888,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5135
+size: 5092
 location: clients/tests/test-client.py:test_004()/24
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4994 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -925,7 +918,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -1008,12 +1000,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5105
+size: 5062
 location: clients/tests/test-client.py:test_004()/25
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4974 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1038,7 +1030,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -1121,12 +1112,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5135
+size: 5092
 location: clients/tests/test-client.py:test_004()/26
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4994 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1151,7 +1142,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -1234,12 +1224,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3981
+size: 3938
 location: clients/tests/test-client.py:test_004()/27
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3843 bytes
+stdout: 3800 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1264,7 +1254,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -1326,12 +1315,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4001
+size: 3958
 location: clients/tests/test-client.py:test_004()/28
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3853 bytes
+stdout: 3810 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1356,7 +1345,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -3978,12 +3966,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 5117
+size: 5074
 location: clients/tests/test-client.py:test_004()/73
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4974 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4008,7 +3996,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -4091,12 +4078,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5147
+size: 5104
 location: clients/tests/test-client.py:test_004()/74
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4994 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4121,7 +4108,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -4204,12 +4190,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5117
+size: 5074
 location: clients/tests/test-client.py:test_004()/75
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4974 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4234,7 +4220,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -4317,12 +4302,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5147
+size: 5104
 location: clients/tests/test-client.py:test_004()/76
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4994 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4347,7 +4332,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -4430,12 +4414,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3993
+size: 3950
 location: clients/tests/test-client.py:test_004()/77
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3843 bytes
+stdout: 3800 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4460,7 +4444,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -4522,12 +4505,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4013
+size: 3970
 location: clients/tests/test-client.py:test_004()/78
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3853 bytes
+stdout: 3810 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4552,7 +4535,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -7174,12 +7156,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 6127
+size: 6084
 location: clients/tests/test-client.py:test_004()/123
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5986 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -7207,7 +7189,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -7300,12 +7281,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6169
+size: 6126
 location: clients/tests/test-client.py:test_004()/124
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6018 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7333,7 +7314,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -7426,12 +7406,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6127
+size: 6084
 location: clients/tests/test-client.py:test_004()/125
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5986 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -7459,7 +7439,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -7552,12 +7531,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6169
+size: 6126
 location: clients/tests/test-client.py:test_004()/126
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6018 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7585,7 +7564,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -7678,12 +7656,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4610
+size: 4567
 location: clients/tests/test-client.py:test_004()/127
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4462 bytes
+stdout: 4419 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -7711,7 +7689,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -7778,12 +7755,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4635
+size: 4592
 location: clients/tests/test-client.py:test_004()/128
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4477 bytes
+stdout: 4434 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7811,7 +7788,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -11042,12 +11018,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6139
+size: 6096
 location: clients/tests/test-client.py:test_004()/173
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5986 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -11075,7 +11051,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -11168,12 +11143,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6181
+size: 6138
 location: clients/tests/test-client.py:test_004()/174
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6018 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -11201,7 +11176,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -11294,12 +11268,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6139
+size: 6096
 location: clients/tests/test-client.py:test_004()/175
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5986 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -11327,7 +11301,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -11420,12 +11393,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6181
+size: 6138
 location: clients/tests/test-client.py:test_004()/176
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6018 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -11453,7 +11426,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -11546,12 +11518,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4622
+size: 4579
 location: clients/tests/test-client.py:test_004()/177
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4462 bytes
+stdout: 4419 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -11579,7 +11551,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -11646,12 +11617,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4647
+size: 4604
 location: clients/tests/test-client.py:test_004()/178
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4477 bytes
+stdout: 4434 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -11679,7 +11650,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -14910,12 +14880,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 2556
+size: 2536
 location: clients/tests/test-client.py:test_004()/223
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -14940,7 +14910,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -15023,12 +14992,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2566
+size: 2546
 location: clients/tests/test-client.py:test_004()/224
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15053,7 +15022,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -15136,12 +15104,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2556
+size: 2536
 location: clients/tests/test-client.py:test_004()/225
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15166,7 +15134,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -15249,12 +15216,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2566
+size: 2546
 location: clients/tests/test-client.py:test_004()/226
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15279,7 +15246,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -15362,12 +15328,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1986
+size: 1966
 location: clients/tests/test-client.py:test_004()/227
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1839 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15392,7 +15358,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -15454,12 +15419,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1996
+size: 1976
 location: clients/tests/test-client.py:test_004()/228
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1839 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15484,7 +15449,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -18076,12 +18040,12 @@ connection.type:802-11-wireless
 connection.interface-name:
 
 <<<
-size: 2568
+size: 2548
 location: clients/tests/test-client.py:test_004()/273
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18106,7 +18070,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -18189,12 +18152,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2578
+size: 2558
 location: clients/tests/test-client.py:test_004()/274
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18219,7 +18182,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -18302,12 +18264,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2568
+size: 2548
 location: clients/tests/test-client.py:test_004()/275
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18332,7 +18294,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -18415,12 +18376,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2578
+size: 2558
 location: clients/tests/test-client.py:test_004()/276
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18445,7 +18406,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -18528,12 +18488,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1998
+size: 1978
 location: clients/tests/test-client.py:test_004()/277
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1839 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18558,7 +18518,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -18620,12 +18579,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 2008
+size: 1988
 location: clients/tests/test-client.py:test_004()/278
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1839 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18650,7 +18609,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -21242,15 +21200,15 @@ connection.type:802-11-wireless
 connection.interface-name:
 
 <<<
-size: 3295
+size: 3277
 location: clients/tests/test-client.py:test_004()/323
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3148 bytes
+stdout: 3130 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
@@ -21271,15 +21229,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3318
+size: 3300
 location: clients/tests/test-client.py:test_004()/324
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3161 bytes
+stdout: 3143 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
@@ -21300,15 +21258,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3295
+size: 3277
 location: clients/tests/test-client.py:test_004()/325
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3148 bytes
+stdout: 3130 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
@@ -21329,15 +21287,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3318
+size: 3300
 location: clients/tests/test-client.py:test_004()/326
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3161 bytes
+stdout: 3143 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
@@ -21358,15 +21316,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2543
+size: 2525
 location: clients/tests/test-client.py:test_004()/327
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2389 bytes
+stdout: 2371 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
@@ -21382,15 +21340,15 @@ proxy  none    no            --       --
 
 
 <<<
-size: 2555
+size: 2537
 location: clients/tests/test-client.py:test_004()/328
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2391 bytes
+stdout: 2373 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
@@ -22896,15 +22854,15 @@ interface-name
 
 
 <<<
-size: 3307
+size: 3289
 location: clients/tests/test-client.py:test_004()/373
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3148 bytes
+stdout: 3130 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
@@ -22925,15 +22883,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3330
+size: 3312
 location: clients/tests/test-client.py:test_004()/374
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3161 bytes
+stdout: 3143 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
@@ -22954,15 +22912,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3307
+size: 3289
 location: clients/tests/test-client.py:test_004()/375
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3148 bytes
+stdout: 3130 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
@@ -22983,15 +22941,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3330
+size: 3312
 location: clients/tests/test-client.py:test_004()/376
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3161 bytes
+stdout: 3143 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
@@ -23012,15 +22970,15 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2555
+size: 2537
 location: clients/tests/test-client.py:test_004()/377
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2389 bytes
+stdout: 2371 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
@@ -23036,15 +22994,15 @@ proxy  none    no            --       --
 
 
 <<<
-size: 2567
+size: 2549
 location: clients/tests/test-client.py:test_004()/378
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2391 bytes
+stdout: 2373 bytes
 >>>
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
@@ -24550,19 +24508,19 @@ interface-name
 
 
 <<<
-size: 5220
+size: 5193
 location: clients/tests/test-client.py:test_004()/423
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5064 bytes
+stdout: 5037 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24592,19 +24550,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5276
+size: 5249
 location: clients/tests/test-client.py:test_004()/424
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5110 bytes
+stdout: 5083 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24634,19 +24592,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5220
+size: 5193
 location: clients/tests/test-client.py:test_004()/425
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5064 bytes
+stdout: 5037 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24676,19 +24634,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5276
+size: 5249
 location: clients/tests/test-client.py:test_004()/426
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5110 bytes
+stdout: 5083 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24718,19 +24676,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3876
+size: 3849
 location: clients/tests/test-client.py:test_004()/427
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3713 bytes
+stdout: 3686 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24750,19 +24708,19 @@ proxy  none    no            --       --
 
 
 <<<
-size: 3899
+size: 3872
 location: clients/tests/test-client.py:test_004()/428
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3726 bytes
+stdout: 3699 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26858,19 +26816,19 @@ interface-name
 
 
 <<<
-size: 5232
+size: 5205
 location: clients/tests/test-client.py:test_004()/473
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5064 bytes
+stdout: 5037 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26900,19 +26858,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5288
+size: 5261
 location: clients/tests/test-client.py:test_004()/474
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5110 bytes
+stdout: 5083 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26942,19 +26900,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5232
+size: 5205
 location: clients/tests/test-client.py:test_004()/475
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5064 bytes
+stdout: 5037 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26984,19 +26942,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5288
+size: 5261
 location: clients/tests/test-client.py:test_004()/476
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5110 bytes
+stdout: 5083 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27026,19 +26984,19 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3888
+size: 3861
 location: clients/tests/test-client.py:test_004()/477
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3713 bytes
+stdout: 3686 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         mud-url  wait-device-timeout 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27058,19 +27016,19 @@ proxy  none    no            --       --
 
 
 <<<
-size: 3911
+size: 3884
 location: clients/tests/test-client.py:test_004()/478
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3726 bytes
+stdout: 3699 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         mud-url  wait-device-timeout 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  --       -1                  
+name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -29166,14 +29124,14 @@ interface-name
 
 
 <<<
-size: 805
+size: 804
 location: clients/tests/test-client.py:test_004()/523
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 651 bytes
+stdout: 650 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -29182,14 +29140,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 815
+size: 814
 location: clients/tests/test-client.py:test_004()/524
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 651 bytes
+stdout: 650 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -29198,14 +29156,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 805
+size: 804
 location: clients/tests/test-client.py:test_004()/525
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 651 bytes
+stdout: 650 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -29214,14 +29172,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 815
+size: 814
 location: clients/tests/test-client.py:test_004()/526
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 651 bytes
+stdout: 650 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -29230,28 +29188,28 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 517
+size: 516
 location: clients/tests/test-client.py:test_004()/527
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 356 bytes
+stdout: 355 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
-size: 527
+size: 526
 location: clients/tests/test-client.py:test_004()/528
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 356 bytes
+stdout: 355 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -30104,14 +30062,14 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA
 
 
 <<<
-size: 817
+size: 816
 location: clients/tests/test-client.py:test_004()/573
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 651 bytes
+stdout: 650 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -30120,14 +30078,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 827
+size: 826
 location: clients/tests/test-client.py:test_004()/574
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 651 bytes
+stdout: 650 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -30136,14 +30094,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 817
+size: 816
 location: clients/tests/test-client.py:test_004()/575
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 651 bytes
+stdout: 650 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -30152,14 +30110,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 827
+size: 826
 location: clients/tests/test-client.py:test_004()/576
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 651 bytes
+stdout: 650 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -30168,28 +30126,28 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 529
+size: 528
 location: clients/tests/test-client.py:test_004()/577
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 356 bytes
+stdout: 355 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
-size: 539
+size: 538
 location: clients/tests/test-client.py:test_004()/578
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 356 bytes
+stdout: 355 bytes
 >>>
-connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1
+connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
@@ -31042,12 +31000,12 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA
 
 
 <<<
-size: 5123
+size: 5080
 location: clients/tests/test-client.py:test_004()/623
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4974 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31072,7 +31030,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -31155,12 +31112,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5153
+size: 5110
 location: clients/tests/test-client.py:test_004()/624
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4994 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31185,7 +31142,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -31268,12 +31224,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5123
+size: 5080
 location: clients/tests/test-client.py:test_004()/625
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4974 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31298,7 +31254,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -31381,12 +31336,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5153
+size: 5110
 location: clients/tests/test-client.py:test_004()/626
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4994 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31411,7 +31366,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -31494,12 +31448,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3999
+size: 3956
 location: clients/tests/test-client.py:test_004()/627
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3843 bytes
+stdout: 3800 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31524,7 +31478,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -31586,12 +31539,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4019
+size: 3976
 location: clients/tests/test-client.py:test_004()/628
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3853 bytes
+stdout: 3810 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31616,7 +31569,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -34738,12 +34690,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 5135
+size: 5092
 location: clients/tests/test-client.py:test_004()/673
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4974 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -34768,7 +34720,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -34851,12 +34802,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5165
+size: 5122
 location: clients/tests/test-client.py:test_004()/674
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4994 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -34881,7 +34832,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -34964,12 +34914,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5135
+size: 5092
 location: clients/tests/test-client.py:test_004()/675
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4974 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -34994,7 +34944,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -35077,12 +35026,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5165
+size: 5122
 location: clients/tests/test-client.py:test_004()/676
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4994 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -35107,7 +35056,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -35190,12 +35138,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4011
+size: 3968
 location: clients/tests/test-client.py:test_004()/677
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3843 bytes
+stdout: 3800 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -35220,7 +35168,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -35282,12 +35229,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4031
+size: 3988
 location: clients/tests/test-client.py:test_004()/678
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3853 bytes
+stdout: 3810 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -35312,7 +35259,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
@@ -38434,12 +38380,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 6144
+size: 6101
 location: clients/tests/test-client.py:test_004()/723
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5986 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -38467,7 +38413,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -38560,12 +38505,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6186
+size: 6143
 location: clients/tests/test-client.py:test_004()/724
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6018 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -38593,7 +38538,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -38686,12 +38630,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6144
+size: 6101
 location: clients/tests/test-client.py:test_004()/725
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5986 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -38719,7 +38663,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -38812,12 +38755,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6186
+size: 6143
 location: clients/tests/test-client.py:test_004()/726
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6018 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -38845,7 +38788,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -38938,12 +38880,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4627
+size: 4584
 location: clients/tests/test-client.py:test_004()/727
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4462 bytes
+stdout: 4419 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -38971,7 +38913,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -39038,12 +38979,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4652
+size: 4609
 location: clients/tests/test-client.py:test_004()/728
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4477 bytes
+stdout: 4434 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -39071,7 +39012,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -42832,12 +42772,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6156
+size: 6113
 location: clients/tests/test-client.py:test_004()/773
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5986 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -42865,7 +42805,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -42958,12 +42897,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6198
+size: 6155
 location: clients/tests/test-client.py:test_004()/774
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6018 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -42991,7 +42930,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -43084,12 +43022,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6156
+size: 6113
 location: clients/tests/test-client.py:test_004()/775
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5986 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -43117,7 +43055,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -43210,12 +43147,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6198
+size: 6155
 location: clients/tests/test-client.py:test_004()/776
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6018 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -43243,7 +43180,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -43336,12 +43272,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4639
+size: 4596
 location: clients/tests/test-client.py:test_004()/777
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4462 bytes
+stdout: 4419 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -43369,7 +43305,6 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -43436,12 +43371,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4664
+size: 4621
 location: clients/tests/test-client.py:test_004()/778
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4477 bytes
+stdout: 4434 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -43469,7 +43404,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
-connection.mud-url:                     --
 connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
@@ -47230,12 +47164,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 2573
+size: 2553
 location: clients/tests/test-client.py:test_004()/823
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47260,7 +47194,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -47343,12 +47276,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2583
+size: 2563
 location: clients/tests/test-client.py:test_004()/824
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47373,7 +47306,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -47456,12 +47388,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2573
+size: 2553
 location: clients/tests/test-client.py:test_004()/825
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47486,7 +47418,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -47569,12 +47500,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2583
+size: 2563
 location: clients/tests/test-client.py:test_004()/826
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47599,7 +47530,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -47682,12 +47612,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2003
+size: 1983
 location: clients/tests/test-client.py:test_004()/827
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1839 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47712,7 +47642,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -47774,12 +47703,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 2013
+size: 1993
 location: clients/tests/test-client.py:test_004()/828
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1839 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47804,7 +47733,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -50926,12 +50854,12 @@ connection.type:802-11-wireless
 connection.interface-name:
 
 <<<
-size: 2585
+size: 2565
 location: clients/tests/test-client.py:test_004()/873
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50956,7 +50884,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -51039,12 +50966,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2595
+size: 2575
 location: clients/tests/test-client.py:test_004()/874
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51069,7 +50996,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -51152,12 +51078,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2585
+size: 2565
 location: clients/tests/test-client.py:test_004()/875
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51182,7 +51108,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -51265,12 +51190,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2595
+size: 2575
 location: clients/tests/test-client.py:test_004()/876
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2416 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51295,7 +51220,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -51378,12 +51302,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2015
+size: 1995
 location: clients/tests/test-client.py:test_004()/877
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1839 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51408,7 +51332,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
@@ -51470,12 +51393,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 2025
+size: 2005
 location: clients/tests/test-client.py:test_004()/878
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1839 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51500,7 +51423,6 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
-connection.mud-url:
 connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:

From 2a26562ec8c1d824dc0f64397b1e1b452baded50 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 27 Apr 2020 08:02:11 +0200
Subject: [PATCH 071/222] shared: add nm_gbytes_hash() and nm_gbytes_equal()

---
 shared/nm-glib-aux/nm-hash-utils.c | 11 +++++++++++
 shared/nm-glib-aux/nm-hash-utils.h |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/shared/nm-glib-aux/nm-hash-utils.c b/shared/nm-glib-aux/nm-hash-utils.c
index 0a701d06e1..232c62c036 100644
--- a/shared/nm-glib-aux/nm-hash-utils.c
+++ b/shared/nm-glib-aux/nm-hash-utils.c
@@ -264,6 +264,17 @@ nm_ppdirect_equal (gconstpointer a, gconstpointer b)
 
 /*****************************************************************************/
 
+guint
+nm_gbytes_hash (gconstpointer p)
+{
+	GBytes *ptr = (GBytes *) p;
+	gconstpointer arr;
+	gsize len;
+
+	arr = g_bytes_get_data (ptr, &len);
+	return nm_hash_mem (792701303u, arr, len);
+}
+
 guint
 nm_pgbytes_hash (gconstpointer p)
 {
diff --git a/shared/nm-glib-aux/nm-hash-utils.h b/shared/nm-glib-aux/nm-hash-utils.h
index 9f2e976678..be69bfa8dc 100644
--- a/shared/nm-glib-aux/nm-hash-utils.h
+++ b/shared/nm-glib-aux/nm-hash-utils.h
@@ -315,6 +315,9 @@ gboolean nm_ppdirect_equal (gconstpointer a, gconstpointer b);
 
 /*****************************************************************************/
 
+guint nm_gbytes_hash (gconstpointer p);
+#define nm_gbytes_equal g_bytes_equal
+
 guint nm_pgbytes_hash (gconstpointer p);
 gboolean nm_pgbytes_equal (gconstpointer a, gconstpointer b);
 

From 32664c72a5a61e1b2a156436d9132cbbc928b9c0 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 27 Apr 2020 08:02:40 +0200
Subject: [PATCH 072/222] shared: add nm_gbytes_get_empty() singleton getter

---
 shared/nm-glib-aux/nm-shared-utils.c | 18 ++++++++++++++++++
 shared/nm-glib-aux/nm-shared-utils.h |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c
index 61e3e26716..5dd099a7c9 100644
--- a/shared/nm-glib-aux/nm-shared-utils.c
+++ b/shared/nm-glib-aux/nm-shared-utils.c
@@ -397,6 +397,24 @@ truncate:
 
 /*****************************************************************************/
 
+GBytes *
+nm_gbytes_get_empty (void)
+{
+	static GBytes *bytes = NULL;
+	GBytes *b;
+
+again:
+	b = g_atomic_pointer_get (&bytes);
+	if (G_UNLIKELY (!b)) {
+		b = g_bytes_new_static ("", 0);
+		if (!g_atomic_pointer_compare_and_exchange (&bytes, NULL, b)) {
+			g_bytes_unref (b);
+			goto again;
+		}
+	}
+	return b;
+}
+
 /**
  * nm_utils_gbytes_equals:
  * @bytes: (allow-none): a #GBytes array to compare. Note that
diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index 9200f80fdf..d5990c2d54 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -389,6 +389,8 @@ nm_utils_is_separator (const char c)
 
 /*****************************************************************************/
 
+GBytes *nm_gbytes_get_empty (void);
+
 static inline gboolean
 nm_gbytes_equal0 (GBytes *a, GBytes *b)
 {

From ee7fbc954ec6ca4f85e384083f8065271147f53e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 26 Apr 2020 15:46:53 +0200
Subject: [PATCH 073/222] shared/glib: prevent users to use
 g_cancellable_reset()

When handling a GCancellable, you make decisions based on when the cancelled
property of a GCancellable changes. Correctly handling a cancellable becoming
uncancelled again is really complicated, nor is it clear what it even means:
should the flipping be treated as cancellation or not? Probably if the
cancelled property gets reset, you already start aborting and there is
no way back. So, you would want that a cancellation is always handled.
But it's hard to implement that correctly, and it's odd to claim
something was cancelled, if g_cancellable_is_cancelled() doesn't agree
(anymore).

Avoid such problems by preventing users to call g_cancellable_reset().
---
 shared/nm-glib-aux/nm-glib.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/shared/nm-glib-aux/nm-glib.h b/shared/nm-glib-aux/nm-glib.h
index 4ecba9ffca..7a5b8edd7d 100644
--- a/shared/nm-glib-aux/nm-glib.h
+++ b/shared/nm-glib-aux/nm-glib.h
@@ -622,4 +622,12 @@ g_hash_table_steal_extended (GHashTable    *hash_table,
 
 /*****************************************************************************/
 
+__attribute__((__deprecated__("Don't use g_cancellable_reset(). Create a new cancellable instead.")))
+void _nm_g_cancellable_reset (GCancellable *cancellable);
+
+#undef g_cancellable_reset
+#define g_cancellable_reset(cancellable) _nm_g_cancellable_reset(cancellable)
+
+/*****************************************************************************/
+
 #endif  /* __NM_GLIB_H__ */

From 800ac28ccab6fad6278c5455d45a8ec950319e80 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 26 Apr 2020 14:44:41 +0200
Subject: [PATCH 074/222] device: add nm_device_get_manager()

NMDevice already has access to the NMSettings singleton. It is permissible that
NMDevice *knows* about NMManager. The current alternative is emitting GObject signals
like NM_DEVICE_AUTH_REQUEST, pretending that NMDevice and NMManager would be completely
independent, or that there could be anybody else handling the request aside NMManager.

No, NMManager and NMDevice may know each other and refer to each other. Just like
NMDevice also knows and refers to NMSettings.
---
 src/devices/nm-device-private.h |  2 ++
 src/devices/nm-device.c         | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h
index 8d539026e7..f9bc4125b8 100644
--- a/src/devices/nm-device-private.h
+++ b/src/devices/nm-device-private.h
@@ -46,6 +46,8 @@ void nm_device_arp_announce (NMDevice *self);
 
 NMSettings *nm_device_get_settings (NMDevice *self);
 
+NMManager *nm_device_get_manager (NMDevice *self);
+
 gboolean nm_device_set_ip_ifindex (NMDevice *self, int ifindex);
 
 gboolean nm_device_set_ip_iface (NMDevice *self, const char *iface);
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index d400d90617..4a24c40bc5 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -578,6 +578,7 @@ typedef struct _NMDevicePrivate {
 	NMMetered       metered;
 
 	NMSettings *settings;
+	NMManager *manager;
 
 	NMNetns *netns;
 
@@ -913,6 +914,12 @@ nm_device_get_settings (NMDevice *self)
 	return NM_DEVICE_GET_PRIVATE (self)->settings;
 }
 
+NMManager *
+nm_device_get_manager (NMDevice *self)
+{
+	return NM_DEVICE_GET_PRIVATE (self)->manager;
+}
+
 NMNetns *
 nm_device_get_netns (NMDevice *self)
 {
@@ -17452,8 +17459,8 @@ constructed (GObject *object)
 	g_signal_connect (platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, G_CALLBACK (device_ipx_changed), self);
 	g_signal_connect (platform, NM_PLATFORM_SIGNAL_LINK_CHANGED, G_CALLBACK (link_changed_cb), self);
 
+	priv->manager = g_object_ref (NM_MANAGER_GET);
 	priv->settings = g_object_ref (NM_SETTINGS_GET);
-	g_assert (priv->settings);
 
 	g_signal_connect (priv->settings,
 	                  NM_SETTINGS_SIGNAL_CONNECTION_ADDED,
@@ -17610,6 +17617,7 @@ finalize (GObject *object)
 	/* for testing, NMDeviceTest does not invoke NMDevice::constructed,
 	 * and thus @settings might be unset. */
 	nm_g_object_unref (priv->settings);
+	nm_g_object_unref (priv->manager);
 
 	nm_g_object_unref (priv->concheck_mgr);
 

From ef7fd9e4e35359ecf83f5987816013c960d91cf1 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 26 Apr 2020 15:40:40 +0200
Subject: [PATCH 075/222] auth: natively support GCancellable in NMAuthChain

We want that our asynchronous operations are cancellable.

In fact, NMAuthChain is already (manually) cancellable by the
user calling nm_auth_chain_destroy(). However, sometimes we have a
GCancellable at hand, so the callers would have to register to the
cancellable themselves.

Instead, support setting a cancellable to the NMAuthChain, that aborts
the request and invokes the callback.

It does so always on an idle handler. Also, the user may only set the
cancellable once, and only before starting the first call.
---
 src/nm-auth-utils.c | 160 ++++++++++++++++++++++++++++++++++++--------
 src/nm-auth-utils.h |   4 ++
 2 files changed, 137 insertions(+), 27 deletions(-)

diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c
index ca2870db72..663739b457 100644
--- a/src/nm-auth-utils.c
+++ b/src/nm-auth-utils.c
@@ -27,11 +27,19 @@ struct _NMAuthChain {
 	GDBusMethodInvocation *context;
 	NMAuthSubject *subject;
 
+	GCancellable *cancellable;
+
+	/* if set, it also means that the chain is already started and was cancelled. */
+	GSource *cancellable_idle_source;
+
 	NMAuthChainResultFunc done_func;
 	gpointer user_data;
 
+	gulong cancellable_id;
+
 	guint num_pending_auth_calls;
 
+	bool is_started:1;
 	bool is_destroyed:1;
 	bool is_finishing:1;
 };
@@ -77,6 +85,82 @@ _ASSERT_call (AuthCall *call)
 
 /*****************************************************************************/
 
+static void
+_done_and_destroy (NMAuthChain *self)
+{
+	self->is_finishing = TRUE;
+	self->done_func (self, self->context, self->user_data);
+	nm_assert (self->is_finishing);
+	_auth_chain_destroy (self);
+}
+
+static gboolean
+_cancellable_idle_cb (gpointer user_data)
+{
+	NMAuthChain *self = user_data;
+	AuthCall *call;
+
+	nm_assert (g_cancellable_is_cancelled (self->cancellable));
+	nm_assert (self->cancellable_idle_source);
+
+	c_list_for_each_entry (call, &self->auth_call_lst_head, auth_call_lst) {
+		if (call->call_id) {
+			self->num_pending_auth_calls--;
+			nm_auth_manager_check_authorization_cancel (g_steal_pointer (&call->call_id));
+		}
+	}
+
+	_done_and_destroy (self);
+	return G_SOURCE_REMOVE;
+}
+
+static void
+_cancellable_on_idle (NMAuthChain *self)
+{
+	if (self->cancellable_idle_source)
+		return;
+
+	self->cancellable_idle_source = nm_g_idle_source_new (G_PRIORITY_DEFAULT,
+	                                                      _cancellable_idle_cb,
+	                                                      self,
+	                                                      NULL);
+	g_source_attach (self->cancellable_idle_source, NULL);
+}
+
+GCancellable *
+nm_auth_chain_get_cancellable (NMAuthChain *self)
+{
+	return self->cancellable;
+}
+
+static void
+_cancellable_cancelled (GCancellable *cancellable,
+                        NMAuthChain *self)
+{
+	_cancellable_on_idle (self);
+}
+
+void
+nm_auth_chain_set_cancellable (NMAuthChain *self,
+                               GCancellable *cancellable)
+{
+	g_return_if_fail (self);
+	g_return_if_fail (G_IS_CANCELLABLE (cancellable));
+
+	/* after the chain is started, the cancellable can no longer be changed.
+	 * No need to handle the complexity of swapping the cancellable *after*
+	 * requests are already started. */
+	g_return_if_fail (!self->is_started);
+	nm_assert (c_list_is_empty (&self->auth_call_lst_head));
+
+	/* also no need to allow setting different cancellables. */
+	g_return_if_fail (!self->cancellable);
+
+	self->cancellable = g_object_ref (cancellable);
+}
+
+/*****************************************************************************/
+
 static void
 auth_call_free (AuthCall *call)
 {
@@ -87,7 +171,7 @@ auth_call_free (AuthCall *call)
 		call->chain->num_pending_auth_calls--;
 		nm_auth_manager_check_authorization_cancel (call->call_id);
 	}
-	g_slice_free (AuthCall, call);
+	nm_g_slice_free (call);
 }
 
 static AuthCall *
@@ -255,6 +339,12 @@ nm_auth_chain_get_result (NMAuthChain *self, const char *permission)
 
 	nm_assert (!auth_call->call_id);
 
+	if (self->cancellable_idle_source) {
+		/* already cancelled. We always return unknown (even if we happen to
+		 * have already received the response. */
+		return NM_AUTH_CALL_RESULT_UNKNOWN;
+	}
+
 	return auth_call->result;
 }
 
@@ -314,10 +404,7 @@ pk_call_cb (NMAuthManager *auth_manager,
 	if (call->chain->num_pending_auth_calls == 0) {
 		/* we are on an idle-handler or a clean call-stack (non-reentrant) so it's safe
 		 * to invoke the callback right away. */
-		self->is_finishing = TRUE;
-		self->done_func (self, self->context, self->user_data);
-		nm_assert (self->is_finishing);
-		_auth_chain_destroy (self);
+		_done_and_destroy (self);
 	}
 }
 
@@ -350,23 +437,36 @@ nm_auth_chain_add_call_unsafe (NMAuthChain *self,
 	g_return_if_fail (!self->is_finishing);
 	g_return_if_fail (!self->is_destroyed);
 	g_return_if_fail (permission && *permission);
-	nm_assert (   nm_auth_subject_get_subject_type (self->subject)
-	           == NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS
-	           || nm_auth_subject_get_subject_type (self->subject)
-	           == NM_AUTH_SUBJECT_TYPE_INTERNAL);
+	nm_assert (NM_IN_SET (nm_auth_subject_get_subject_type (self->subject), NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS,
+	                                                                        NM_AUTH_SUBJECT_TYPE_INTERNAL));
 
 	/* duplicate permissions are not supported, also because nm_auth_chain_get_result()
 	 * can only return one-permission. */
 	nm_assert (!_find_auth_call (self, permission));
 
-	call = g_slice_new (AuthCall);
+	if (!self->is_started) {
+		self->is_started = TRUE;
+		nm_assert (!self->cancellable_id);
+		if (self->cancellable) {
+			if (g_cancellable_is_cancelled (self->cancellable)) {
+				/* the operation is already cancelled. Schedule the callback on idle. */
+				_cancellable_on_idle (self);
+			} else {
+				self->cancellable_id = g_signal_connect (self->cancellable,
+				                                         "cancelled",
+				                                         G_CALLBACK (_cancellable_cancelled),
+				                                         self);
+			}
+		}
+	}
 
+	call = g_slice_new (AuthCall);
 	*call = (AuthCall) {
 		.chain      = self,
 		.call_id    = NULL,
 		.result     = NM_AUTH_CALL_RESULT_UNKNOWN,
 
-		/* we don't clone the permission string. It's the callers responsiblity. */
+		/* we don't clone the permission string. It's the callers responsibility. */
 		.permission = permission,
 	};
 
@@ -375,14 +475,19 @@ nm_auth_chain_add_call_unsafe (NMAuthChain *self,
 	 * call. */
 	c_list_link_front (&self->auth_call_lst_head, &call->auth_call_lst);
 
-	call->call_id = nm_auth_manager_check_authorization (nm_auth_manager_get (),
-	                                                     self->subject,
-	                                                     permission,
-	                                                     allow_interaction,
-	                                                     pk_call_cb,
-	                                                     call);
+	if (self->cancellable_idle_source) {
+		/* already cancelled. No need to actually start the request. */
+		nm_assert (call->result == NM_AUTH_CALL_RESULT_UNKNOWN);
+	} else {
+		call->call_id = nm_auth_manager_check_authorization (nm_auth_manager_get (),
+		                                                     self->subject,
+		                                                     permission,
+		                                                     allow_interaction,
+		                                                     pk_call_cb,
+		                                                     call);
 
-	self->num_pending_auth_calls++;
+		self->num_pending_auth_calls++;
+	}
 
 	_ASSERT_call (call);
 
@@ -427,10 +532,8 @@ nm_auth_chain_new_subject (NMAuthSubject *subject,
 	NMAuthChain *self;
 
 	g_return_val_if_fail (NM_IS_AUTH_SUBJECT (subject), NULL);
-	nm_assert (   nm_auth_subject_get_subject_type (subject)
-	           == NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS
-	           || nm_auth_subject_get_subject_type (subject)
-	           == NM_AUTH_SUBJECT_TYPE_INTERNAL);
+	nm_assert (NM_IN_SET (nm_auth_subject_get_subject_type (subject), NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS,
+	                                                                  NM_AUTH_SUBJECT_TYPE_INTERNAL));
 	nm_assert (done_func);
 
 	self = g_slice_new (NMAuthChain);
@@ -489,6 +592,9 @@ _auth_chain_destroy (NMAuthChain *self)
 	nm_clear_g_object (&self->subject);
 	nm_clear_g_object (&self->context);
 
+	nm_clear_g_signal_handler (self->cancellable, &self->cancellable_id);
+	nm_clear_g_source_inst (&self->cancellable_idle_source);
+
 	/* we must first destry all AuthCall instances before ChainData. The reason is
 	 * that AuthData.permission is not cloned and the lifetime of the string must
 	 * be ensured by the caller. A sensible thing to do for the caller is attach the
@@ -499,7 +605,9 @@ _auth_chain_destroy (NMAuthChain *self)
 	while ((chain_data = c_list_first_entry (&self->data_lst_head, ChainData, data_lst)))
 		chain_data_free (chain_data);
 
-	g_slice_free (NMAuthChain, self);
+	nm_g_object_unref (self->cancellable);
+
+	nm_g_slice_free (self);
 }
 
 /******************************************************************************
@@ -517,10 +625,8 @@ nm_auth_is_subject_in_acl (NMConnection *connection,
 
 	g_return_val_if_fail (connection, FALSE);
 	g_return_val_if_fail (NM_IS_AUTH_SUBJECT (subject), FALSE);
-	nm_assert (   nm_auth_subject_get_subject_type (subject)
-	              == NM_AUTH_SUBJECT_TYPE_INTERNAL
-	           || nm_auth_subject_get_subject_type (subject)
-	              == NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS);
+	nm_assert (NM_IN_SET (nm_auth_subject_get_subject_type (subject), NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS,
+	                                                                  NM_AUTH_SUBJECT_TYPE_INTERNAL));
 
 	if (nm_auth_subject_get_subject_type (subject) == NM_AUTH_SUBJECT_TYPE_INTERNAL)
 		return TRUE;
diff --git a/src/nm-auth-utils.h b/src/nm-auth-utils.h
index 978d607aed..a6c6d65965 100644
--- a/src/nm-auth-utils.h
+++ b/src/nm-auth-utils.h
@@ -27,6 +27,10 @@ NMAuthChain *nm_auth_chain_new_subject (NMAuthSubject *subject,
                                         NMAuthChainResultFunc done_func,
                                         gpointer user_data);
 
+GCancellable *nm_auth_chain_get_cancellable (NMAuthChain *self);
+void nm_auth_chain_set_cancellable (NMAuthChain *self,
+                                    GCancellable *cancellable);
+
 gpointer nm_auth_chain_get_data (NMAuthChain *chain, const char *tag);
 
 gpointer nm_auth_chain_steal_data (NMAuthChain *chain, const char *tag);

From d935692bc7bcb774aa9c27840265687d1b79c729 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 26 Apr 2020 17:41:55 +0200
Subject: [PATCH 076/222] auth: track NMAuthChain data in array instead of
 CList

It's about as complicated to track a CList as it is to track
an allocated array. The latter requires fewer allocations and
has better locality. That makes it preferable.
---
 src/nm-auth-utils.c | 88 ++++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 45 deletions(-)

diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c
index 663739b457..b9efff4805 100644
--- a/src/nm-auth-utils.c
+++ b/src/nm-auth-utils.c
@@ -16,11 +16,19 @@
 
 /*****************************************************************************/
 
+typedef struct {
+	const char *tag;
+	gpointer data;
+	GDestroyNotify destroy;
+} ChainData;
+
 struct _NMAuthChain {
 
 	CList parent_lst;
 
-	CList data_lst_head;
+	ChainData *data_arr;
+	guint data_len;
+	guint data_alloc;
 
 	CList auth_call_lst_head;
 
@@ -188,29 +196,16 @@ _find_auth_call (NMAuthChain *self, const char *permission)
 
 /*****************************************************************************/
 
-typedef struct {
-	CList data_lst;
-	const char *tag;
-	gpointer data;
-	GDestroyNotify destroy;
-} ChainData;
-
-static void
-chain_data_free (ChainData *chain_data)
-{
-	c_list_unlink_stale (&chain_data->data_lst);
-	if (chain_data->destroy)
-		chain_data->destroy (chain_data->data);
-	g_slice_free (ChainData, chain_data);
-}
-
 static ChainData *
 _get_data (NMAuthChain *self, const char *tag)
 {
-	ChainData *chain_data;
+	guint i;
 
-	c_list_for_each_entry (chain_data, &self->data_lst_head, data_lst) {
-		if (nm_streq (chain_data->tag, tag))
+	for (i = 0; i < self->data_len; i++) {
+		ChainData *chain_data = &self->data_arr[i];
+
+		if (   chain_data->tag
+		    && nm_streq (chain_data->tag, tag))
 			return chain_data;
 	}
 	return NULL;
@@ -243,7 +238,6 @@ gpointer
 nm_auth_chain_steal_data (NMAuthChain *self, const char *tag)
 {
 	ChainData *chain_data;
-	gpointer value;
 
 	g_return_val_if_fail (self, NULL);
 	g_return_val_if_fail (tag, NULL);
@@ -252,12 +246,13 @@ nm_auth_chain_steal_data (NMAuthChain *self, const char *tag)
 	if (!chain_data)
 		return NULL;
 
-	value = chain_data->data;
-
-	/* Make sure the destroy handler isn't called when freeing */
+	/* Make sure the destroy handler isn't called when freeing.
+	 *
+	 * We don't bother to really remove the element from the array.
+	 * Just mark the entry as unused by clearing the tag. */
 	chain_data->destroy = NULL;
-	chain_data_free (chain_data);
-	return value;
+	chain_data->tag = NULL;
+	return chain_data->data;
 }
 
 /**
@@ -268,7 +263,7 @@ nm_auth_chain_steal_data (NMAuthChain *self, const char *tag)
  *   and nothing is attached.
  * @data_destroy: (allow-none): the destroy function for the data pointer.
  *
- * @tag string is not cloned and must outlife @self. That is why
+ * @tag string is not cloned and must outlive @self. That is why
  * the function is "unsafe". Use nm_auth_chain_set_data() with a C literal
  * instead.
  *
@@ -285,12 +280,8 @@ nm_auth_chain_set_data_unsafe (NMAuthChain *self,
 	g_return_if_fail (self);
 	g_return_if_fail (tag);
 
-	/* we should not track a large number of elements via a linked list. If this becomes
-	 * necessary, revert the code to use GHashTable again. */
-	nm_assert (c_list_length (&self->data_lst_head) < 25);
-
-	/* The tag must not yet exist. Otherwise we'd have to first search the linked
-	 * list for an existing entry. */
+	/* The tag must not yet exist. Otherwise we'd have to first search the
+	 * list for an existing entry. That usage pattern is not supported. */
 	nm_assert (!_get_data (self, tag));
 
 	if (!data) {
@@ -302,17 +293,20 @@ nm_auth_chain_set_data_unsafe (NMAuthChain *self,
 		return;
 	}
 
-	chain_data = g_slice_new (ChainData);
+	if (self->data_len + 1 > self->data_alloc) {
+		if (self->data_alloc == 0)
+			self->data_alloc = 8;
+		else
+			self->data_alloc *= 2;
+		self->data_arr = g_realloc (self->data_arr, sizeof (self->data_arr[0]) * self->data_alloc);
+	}
+
+	chain_data = &self->data_arr[self->data_len++];
 	*chain_data = (ChainData) {
 		.tag     = tag,
 		.data    = data,
 		.destroy = data_destroy,
 	};
-
-	/* we assert that no duplicate tags are added. But still, add the new
-	 * element to the front, so that it would shadow the duplicate element
-	 * in the list. */
-	c_list_link_front (&self->data_lst_head, &chain_data->data_lst);
 }
 
 /*****************************************************************************/
@@ -494,7 +488,8 @@ nm_auth_chain_add_call_unsafe (NMAuthChain *self,
 	/* we track auth-calls in a linked list. If we end up requesting too many permissions this
 	 * becomes inefficient. If that ever happens, consider a more efficient data structure for
 	 * a large number of requests. */
-	nm_assert (self->num_pending_auth_calls < 25);
+	nm_assert (c_list_length (&self->auth_call_lst_head) < 25);
+	G_STATIC_ASSERT_EXPR (NM_CLIENT_PERMISSION_LAST < 25);
 }
 
 /*****************************************************************************/
@@ -543,7 +538,6 @@ nm_auth_chain_new_subject (NMAuthSubject *subject,
 		.context            = nm_g_object_ref (context),
 		.subject            = g_object_ref (subject),
 		.parent_lst         = C_LIST_INIT (self->parent_lst),
-		.data_lst_head      = C_LIST_INIT (self->data_lst_head),
 		.auth_call_lst_head = C_LIST_INIT (self->auth_call_lst_head),
 	};
 	return self;
@@ -585,7 +579,6 @@ static void
 _auth_chain_destroy (NMAuthChain *self)
 {
 	AuthCall *call;
-	ChainData *chain_data;
 
 	c_list_unlink (&self->parent_lst);
 
@@ -595,15 +588,20 @@ _auth_chain_destroy (NMAuthChain *self)
 	nm_clear_g_signal_handler (self->cancellable, &self->cancellable_id);
 	nm_clear_g_source_inst (&self->cancellable_idle_source);
 
-	/* we must first destry all AuthCall instances before ChainData. The reason is
+	/* we must first destroy all AuthCall instances before ChainData. The reason is
 	 * that AuthData.permission is not cloned and the lifetime of the string must
 	 * be ensured by the caller. A sensible thing to do for the caller is attach the
 	 * permission string via nm_auth_chain_set_data(). Hence, first free the AuthCall. */
 	while ((call = c_list_first_entry (&self->auth_call_lst_head, AuthCall, auth_call_lst)))
 		auth_call_free (call);
 
-	while ((chain_data = c_list_first_entry (&self->data_lst_head, ChainData, data_lst)))
-		chain_data_free (chain_data);
+	while (self->data_len > 0) {
+		ChainData *chain_data = &self->data_arr[--self->data_len];
+
+		if (chain_data->destroy)
+			chain_data->destroy (chain_data->data);
+	}
+	g_free (self->data_arr);
 
 	nm_g_object_unref (self->cancellable);
 

From b50702775f1b7a56ad81fe9be58294a29e805c8f Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 26 Apr 2020 13:59:13 +0200
Subject: [PATCH 077/222] device: implement "auth-request" as async operation
 nm_manager_device_auth_request()

GObject signals only complicate the code and are less efficient.

Also, NM_DEVICE_AUTH_REQUEST signal really invoked an asynchronous
request. Of course, fundamentally emitting a signal *is* the same as
calling a method. However, implementing this as signal is really not
nice nor best practice. For one, there is a (negligible) overhead emitting
a GObject signal. But what is worse, GObject signals are not as strongly
typed and make it harder to understand what happens.

The signal had the appearance of providing some special decoupling of
NMDevice and NMManager. Of course, in practice, they were not more
decoupled (both forms are the same in nature), but it was harder to
understand how they work together.

Add and call a method nm_manager_device_auth_request() instead. This
has the notion of invoking an asynchronous method. Also, never invoke
the callback synchronously and provide a cancellable. Like every asynchronous
operation, it *must* be cancellable, and callers should make sure to
provide a mechanism to abort.
---
 src/devices/nm-device-private.h   |  11 +++
 src/devices/nm-device.c           | 105 +++++++++++++++------------
 src/devices/nm-device.h           |   7 --
 src/devices/wifi/nm-device-iwd.c  |  16 ++---
 src/devices/wifi/nm-device-wifi.c |  16 ++---
 src/nm-manager.c                  | 115 ++++++++++++++++++++----------
 src/nm-manager.h                  |  12 ++++
 src/nm-types.h                    |   6 ++
 8 files changed, 183 insertions(+), 105 deletions(-)

diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h
index f9bc4125b8..4e260da2f3 100644
--- a/src/devices/nm-device-private.h
+++ b/src/devices/nm-device-private.h
@@ -205,4 +205,15 @@ gboolean nm_device_match_parent_hwaddr (NMDevice *device,
                                         NMConnection *connection,
                                         gboolean fail_if_no_hwaddr);
 
+/*****************************************************************************/
+
+void nm_device_auth_request (NMDevice *self,
+                             GDBusMethodInvocation *context,
+                             NMConnection *connection,
+                             const char *permission,
+                             gboolean allow_interaction,
+                             GCancellable *cancellable,
+                             NMManagerDeviceAuthRequestFunc callback,
+                             gpointer user_data);
+
 #endif /* NM_DEVICE_PRIVATE_H */
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 4a24c40bc5..27b1b600b1 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -192,7 +192,6 @@ typedef struct {
 enum {
 	STATE_CHANGED,
 	AUTOCONNECT_ALLOWED,
-	AUTH_REQUEST,
 	IP4_CONFIG_CHANGED,
 	IP6_CONFIG_CHANGED,
 	IP6_PREFIX_DELEGATED,
@@ -6265,6 +6264,27 @@ dnsmasq_state_changed_cb (NMDnsMasqManager *manager, guint32 status, gpointer us
 	}
 }
 
+void
+nm_device_auth_request (NMDevice *self,
+                        GDBusMethodInvocation *context,
+                        NMConnection *connection,
+                        const char *permission,
+                        gboolean allow_interaction,
+                        GCancellable *cancellable,
+                        NMManagerDeviceAuthRequestFunc callback,
+                        gpointer user_data)
+{
+	nm_manager_device_auth_request (nm_device_get_manager (self),
+	                                self,
+	                                context,
+	                                connection,
+	                                permission,
+	                                allow_interaction,
+	                                cancellable,
+	                                callback,
+	                                user_data);
+}
+
 /*****************************************************************************/
 
 static void
@@ -12303,13 +12323,14 @@ impl_device_reapply (NMDBusObject *obj,
 	} else
 		reapply_data = NULL;
 
-	g_signal_emit (self, signals[AUTH_REQUEST], 0,
-	               invocation,
-	               nm_device_get_applied_connection (self),
-	               NM_AUTH_PERMISSION_NETWORK_CONTROL,
-	               TRUE,
-	               reapply_cb,
-	               reapply_data);
+	nm_device_auth_request (self,
+	                        invocation,
+	                        nm_device_get_applied_connection (self),
+	                        NM_AUTH_PERMISSION_NETWORK_CONTROL,
+	                        TRUE,
+	                        NULL,
+	                        reapply_cb,
+	                        reapply_data);
 }
 
 /*****************************************************************************/
@@ -12346,13 +12367,14 @@ get_applied_connection_cb (NMDevice *self,
 
 	if (applied_connection != user_data) {
 		/* The applied connection changed due to a race. Reauthenticate. */
-		g_signal_emit (self, signals[AUTH_REQUEST], 0,
-		               context,
-		               applied_connection,
-		               NM_AUTH_PERMISSION_NETWORK_CONTROL,
-		               TRUE,
-		               get_applied_connection_cb,
-		               applied_connection /* no need take a ref. We will not dereference this pointer. */);
+		nm_device_auth_request (self,
+		                        context,
+		                        applied_connection,
+		                        NM_AUTH_PERMISSION_NETWORK_CONTROL,
+		                        TRUE,
+		                        NULL,
+		                        get_applied_connection_cb,
+		                        applied_connection /* no need take a ref. We will not dereference this pointer. */);
 		return;
 	}
 
@@ -12399,13 +12421,14 @@ impl_device_get_applied_connection (NMDBusObject *obj,
 		return;
 	}
 
-	g_signal_emit (self, signals[AUTH_REQUEST], 0,
-	               invocation,
-	               applied_connection,
-	               NM_AUTH_PERMISSION_NETWORK_CONTROL,
-	               TRUE,
-	               get_applied_connection_cb,
-	               applied_connection /* no need take a ref. We will not dereference this pointer. */);
+	nm_device_auth_request (self,
+	                        invocation,
+	                        applied_connection,
+	                        NM_AUTH_PERMISSION_NETWORK_CONTROL,
+	                        TRUE,
+	                        NULL,
+	                        get_applied_connection_cb,
+	                        applied_connection /* no need take a ref. We will not dereference this pointer. */);
 }
 
 /*****************************************************************************/
@@ -12573,13 +12596,14 @@ impl_device_disconnect (NMDBusObject *obj,
 	connection = nm_device_get_applied_connection (self);
 	nm_assert (connection);
 
-	g_signal_emit (self, signals[AUTH_REQUEST], 0,
-	               invocation,
-	               connection,
-	               NM_AUTH_PERMISSION_NETWORK_CONTROL,
-	               TRUE,
-	               disconnect_cb,
-	               NULL);
+	nm_device_auth_request (self,
+	                        invocation,
+	                        connection,
+	                        NM_AUTH_PERMISSION_NETWORK_CONTROL,
+	                        TRUE,
+	                        NULL,
+	                        disconnect_cb,
+	                        NULL);
 }
 
 static void
@@ -12625,13 +12649,14 @@ impl_device_delete (NMDBusObject *obj,
 		return;
 	}
 
-	g_signal_emit (self, signals[AUTH_REQUEST], 0,
-	               invocation,
-	               NULL,
-	               NM_AUTH_PERMISSION_NETWORK_CONTROL,
-	               TRUE,
-	               delete_cb,
-	               NULL);
+	nm_device_auth_request (self,
+	                        invocation,
+	                        NULL,
+	                        NM_AUTH_PERMISSION_NETWORK_CONTROL,
+	                        TRUE,
+	                        NULL,
+	                        delete_cb,
+	                        NULL);
 }
 
 static void
@@ -18014,14 +18039,6 @@ nm_device_class_init (NMDeviceClass *klass)
 	                  autoconnect_allowed_accumulator, NULL, NULL,
 	                  G_TYPE_BOOLEAN, 0);
 
-	signals[AUTH_REQUEST] =
-	    g_signal_new (NM_DEVICE_AUTH_REQUEST,
-	                  G_OBJECT_CLASS_TYPE (object_class),
-	                  G_SIGNAL_RUN_FIRST,
-	                  0, NULL, NULL, NULL,
-	                  /* context, connection, permission, allow_interaction, callback, user_data */
-	                  G_TYPE_NONE, 6, G_TYPE_DBUS_METHOD_INVOCATION, NM_TYPE_CONNECTION, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER, G_TYPE_POINTER);
-
 	signals[IP4_CONFIG_CHANGED] =
 	    g_signal_new (NM_DEVICE_IP4_CONFIG_CHANGED,
 	                  G_OBJECT_CLASS_TYPE (object_class),
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index c18301b275..8d51c707dd 100644
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -115,7 +115,6 @@ nm_device_state_reason_check (NMDeviceStateReason reason)
 #define NM_DEVICE_HAS_PENDING_ACTION "has-pending-action" /* Internal only */
 
 /* Internal signals */
-#define NM_DEVICE_AUTH_REQUEST          "auth-request"
 #define NM_DEVICE_IP4_CONFIG_CHANGED    "ip4-config-changed"
 #define NM_DEVICE_IP6_CONFIG_CHANGED    "ip6-config-changed"
 #define NM_DEVICE_IP6_PREFIX_DELEGATED  "ip6-prefix-delegated"
@@ -455,12 +454,6 @@ typedef struct _NMDeviceClass {
 
 } NMDeviceClass;
 
-typedef void (*NMDeviceAuthRequestFunc) (NMDevice *device,
-                                         GDBusMethodInvocation *context,
-                                         NMAuthSubject *subject,
-                                         GError *error,
-                                         gpointer user_data);
-
 GType nm_device_get_type (void);
 
 struct _NMDedupMultiIndex *nm_device_get_multi_index (NMDevice *self);
diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c
index 3dccd1cb94..e2e705fd2e 100644
--- a/src/devices/wifi/nm-device-iwd.c
+++ b/src/devices/wifi/nm-device-iwd.c
@@ -1061,14 +1061,14 @@ _nm_device_iwd_request_scan (NMDeviceIwd *self,
 		return;
 	}
 
-	g_signal_emit_by_name (device,
-	                       NM_DEVICE_AUTH_REQUEST,
-	                       invocation,
-	                       NULL,
-	                       NM_AUTH_PERMISSION_WIFI_SCAN,
-	                       TRUE,
-	                       dbus_request_scan_cb,
-	                       options ? g_variant_ref (options) : NULL);
+	nm_device_auth_request (device,
+	                        invocation,
+	                        NULL,
+	                        NM_AUTH_PERMISSION_WIFI_SCAN,
+	                        TRUE,
+	                        NULL,
+	                        dbus_request_scan_cb,
+	                        nm_g_variant_ref (options));
 }
 
 static gboolean
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index bf3e6ad27a..8aee27f4ce 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -1323,14 +1323,14 @@ _nm_device_wifi_request_scan (NMDeviceWifi *self,
 		return;
 	}
 
-	g_signal_emit_by_name (device,
-	                       NM_DEVICE_AUTH_REQUEST,
-	                       invocation,
-	                       NULL,
-	                       NM_AUTH_PERMISSION_WIFI_SCAN,
-	                       TRUE,
-	                       dbus_request_scan_cb,
-	                       g_steal_pointer (&ssids));
+	nm_device_auth_request (device,
+	                        invocation,
+	                        NULL,
+	                        NM_AUTH_PERMISSION_WIFI_SCAN,
+	                        TRUE,
+	                        NULL,
+	                        dbus_request_scan_cb,
+	                        g_steal_pointer (&ssids));
 }
 
 static gboolean
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 1f3ba1f661..bbe501259f 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -2375,8 +2375,9 @@ device_auth_done_cb (NMAuthChain *chain,
 	gs_free_error GError *error = NULL;
 	NMAuthCallResult result;
 	NMDevice *device;
+	GCancellable *cancellable;
 	const char *permission;
-	NMDeviceAuthRequestFunc callback;
+	NMManagerDeviceAuthRequestFunc callback;
 	NMAuthSubject *subject;
 
 	nm_assert (G_IS_DBUS_METHOD_INVOCATION (context));
@@ -2390,18 +2391,26 @@ device_auth_done_cb (NMAuthChain *chain,
 	device = nm_auth_chain_get_data (chain, "device");
 	nm_assert (NM_IS_DEVICE (device));
 
+	cancellable = nm_auth_chain_get_cancellable (chain);
+	nm_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
+
 	result = nm_auth_chain_get_result (chain, permission);
 	subject = nm_auth_chain_get_subject (chain);
 
-	if (result != NM_AUTH_CALL_RESULT_YES) {
-		_LOGD (LOGD_CORE, "%s request failed: not authorized", permission);
-		error = g_error_new (NM_MANAGER_ERROR,
-		                     NM_MANAGER_ERROR_PERMISSION_DENIED,
-		                     "%s request failed: not authorized",
-		                     permission);
-	}
+	if (   cancellable
+	    && g_cancellable_set_error_if_cancelled (cancellable, &error)) {
+		/* pass. */
+	} else {
+		if (result != NM_AUTH_CALL_RESULT_YES) {
+			_LOGD (LOGD_CORE, "%s request failed: not authorized", permission);
+			error = g_error_new (NM_MANAGER_ERROR,
+			                     NM_MANAGER_ERROR_PERMISSION_DENIED,
+			                     "%s request failed: not authorized",
+			                     permission);
+		}
 
-	nm_assert (error || (result == NM_AUTH_CALL_RESULT_YES));
+		nm_assert (error || (result == NM_AUTH_CALL_RESULT_YES));
+	}
 
 	callback (device,
 	          context,
@@ -2411,28 +2420,53 @@ device_auth_done_cb (NMAuthChain *chain,
 }
 
 static void
-device_auth_request_cb (NMDevice *device,
-                        GDBusMethodInvocation *context,
-                        NMConnection *connection,
-                        const char *permission,
-                        gboolean allow_interaction,
-                        NMDeviceAuthRequestFunc callback,
-                        gpointer user_data,
-                        NMManager *self)
+_device_auth_done_fail_on_idle (gpointer user_data, GCancellable *cancellable)
+{
+	gs_unref_object NMManager *self = NULL;
+	gs_unref_object NMDevice *device = NULL;
+	gs_unref_object GDBusMethodInvocation *context = NULL;
+	gs_unref_object NMAuthSubject *subject = NULL;
+	gs_free_error GError *error_original = NULL;
+	gs_free_error GError *error_cancelled = NULL;
+	NMManagerDeviceAuthRequestFunc callback;
+	gpointer callback_user_data;
+
+	nm_utils_user_data_unpack (&self, &device, &context, &subject, &error_original, &callback, &callback_user_data);
+
+	g_cancellable_set_error_if_cancelled (cancellable, &error_cancelled);
+
+	callback (device,
+	          context,
+	          subject,
+	          error_cancelled ?: error_original,
+	          callback_user_data);
+}
+
+void
+nm_manager_device_auth_request (NMManager *self,
+                                NMDevice *device,
+                                GDBusMethodInvocation *context,
+                                NMConnection *connection,
+                                const char *permission,
+                                gboolean allow_interaction,
+                                GCancellable *cancellable,
+                                NMManagerDeviceAuthRequestFunc callback,
+                                gpointer user_data)
 {
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-	GError *error = NULL;
-	NMAuthSubject *subject = NULL;
+	gs_free_error GError *error = NULL;
+	gs_unref_object NMAuthSubject *subject = NULL;
 	NMAuthChain *chain;
 	char *permission_dup;
 
 	/* Validate the caller */
 	subject = nm_dbus_manager_new_auth_subject_from_context (context);
 	if (!subject) {
-		error = g_error_new_literal (NM_MANAGER_ERROR,
-		                             NM_MANAGER_ERROR_PERMISSION_DENIED,
-		                             NM_UTILS_ERROR_MSG_REQ_UID_UKNOWN);
-		goto done;
+		g_set_error_literal (&error,
+		                     NM_MANAGER_ERROR,
+		                     NM_MANAGER_ERROR_PERMISSION_DENIED,
+		                     NM_UTILS_ERROR_MSG_REQ_UID_UKNOWN);
+		goto fail_on_idle;
 	}
 
 	/* Ensure the subject has permissions for this connection */
@@ -2442,17 +2476,21 @@ device_auth_request_cb (NMDevice *device,
 	                                             NM_MANAGER_ERROR,
 	                                             NM_MANAGER_ERROR_PERMISSION_DENIED,
 	                                             &error))
-		goto done;
+		goto fail_on_idle;
 
 	/* Validate the request */
 	chain = nm_auth_chain_new_subject (subject, context, device_auth_done_cb, self);
 	if (!chain) {
-		error = g_error_new_literal (NM_MANAGER_ERROR,
-		                             NM_MANAGER_ERROR_PERMISSION_DENIED,
-		                             NM_UTILS_ERROR_MSG_REQ_AUTH_FAILED);
-		goto done;
+		g_set_error (&error,
+		             NM_MANAGER_ERROR,
+		             NM_MANAGER_ERROR_PERMISSION_DENIED,
+		             NM_UTILS_ERROR_MSG_REQ_AUTH_FAILED);
+		goto fail_on_idle;
 	}
 
+	if (cancellable)
+		nm_auth_chain_set_cancellable (chain, cancellable);
+
 	permission_dup = g_strdup (permission);
 
 	c_list_link_tail (&priv->auth_lst_head, nm_auth_chain_parent_lst_list (chain));
@@ -2461,13 +2499,18 @@ device_auth_request_cb (NMDevice *device,
 	nm_auth_chain_set_data (chain, "user-data", user_data, NULL);
 	nm_auth_chain_set_data (chain, "perm", permission_dup /* transfer ownership */, g_free);
 	nm_auth_chain_add_call_unsafe (chain, permission_dup, allow_interaction);
+	return;
 
-done:
-	if (error)
-		callback (device, context, subject, error, user_data);
-
-	g_clear_object (&subject);
-	g_clear_error (&error);
+fail_on_idle:
+	nm_utils_invoke_on_idle (cancellable,
+	                         _device_auth_done_fail_on_idle,
+	                         nm_utils_user_data_pack (g_object_ref (self),
+	                                                  g_object_ref (device),
+	                                                  g_object_ref (context),
+	                                                  g_steal_pointer (&subject),
+	                                                  g_steal_pointer (&error),
+	                                                  callback,
+	                                                  user_data));
 }
 
 static gboolean
@@ -3130,10 +3173,6 @@ add_device (NMManager *self, NMDevice *device, GError **error)
 	                  G_CALLBACK (manager_device_state_changed),
 	                  self);
 
-	g_signal_connect (device, NM_DEVICE_AUTH_REQUEST,
-	                  G_CALLBACK (device_auth_request_cb),
-	                  self);
-
 	g_signal_connect (device, NM_DEVICE_REMOVED,
 	                  G_CALLBACK (device_removed_cb),
 	                  self);
diff --git a/src/nm-manager.h b/src/nm-manager.h
index 5873abd24b..ab08eaa839 100644
--- a/src/nm-manager.h
+++ b/src/nm-manager.h
@@ -193,4 +193,16 @@ NMMetered nm_manager_get_metered (NMManager *self);
 
 void nm_manager_notify_device_availibility_maybe_changed (NMManager *self);
 
+/*****************************************************************************/
+
+void nm_manager_device_auth_request (NMManager *self,
+                                     NMDevice *device,
+                                     GDBusMethodInvocation *context,
+                                     NMConnection *connection,
+                                     const char *permission,
+                                     gboolean allow_interaction,
+                                     GCancellable *cancellable,
+                                     NMManagerDeviceAuthRequestFunc callback,
+                                     gpointer user_data);
+
 #endif /* __NETWORKMANAGER_MANAGER_H__ */
diff --git a/src/nm-types.h b/src/nm-types.h
index d2f6fb4093..d2c999fada 100644
--- a/src/nm-types.h
+++ b/src/nm-types.h
@@ -40,6 +40,12 @@ typedef struct _NMSleepMonitor       NMSleepMonitor;
 typedef struct _NMLldpListener       NMLldpListener;
 typedef struct _NMConfigDeviceStateData NMConfigDeviceStateData;
 
+typedef void (*NMManagerDeviceAuthRequestFunc) (NMDevice *device,
+                                                GDBusMethodInvocation *context,
+                                                NMAuthSubject *subject,
+                                                GError *error,
+                                                gpointer user_data);
+
 struct _NMDedupMultiIndex;
 
 typedef struct _NMRefString NMRefString;

From a7476ff082c6f1c13c46447b61360093f4aa82d1 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 27 Apr 2020 08:03:38 +0200
Subject: [PATCH 078/222] supplicant: log changes to max-scan-ssids of
 NMSupplicantInterface

---
 src/supplicant/nm-supplicant-interface.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index 099c3bf2ca..700563624a 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -1204,13 +1204,18 @@ parse_capabilities (NMSupplicantInterface *self, GVariant *capabilities)
 
 	if (g_variant_lookup (capabilities, "MaxScanSSID", "i", &max_scan_ssids)) {
 		/* We need active scan and SSID probe capabilities to care about MaxScanSSIDs */
-		if (max_scan_ssids > 0 && have_active && have_ssid) {
+		if (   max_scan_ssids > 0
+		    && have_active
+		    && have_ssid) {
 			/* wpa_supplicant's NM_WPAS_MAX_SCAN_SSIDS value is 16, but for speed
 			 * and to ensure we don't disclose too many SSIDs from the hidden
 			 * list, we'll limit to 5.
 			 */
-			priv->max_scan_ssids = CLAMP (max_scan_ssids, 0, 5);
-			_LOGD ("supports %d scan SSIDs", priv->max_scan_ssids);
+			max_scan_ssids = CLAMP (max_scan_ssids, 0, 5);
+			if (max_scan_ssids != priv->max_scan_ssids) {
+				priv->max_scan_ssids = max_scan_ssids;
+				_LOGD ("supports %d scan SSIDs", priv->max_scan_ssids);
+			}
 		}
 	}
 }

From f6e438860bdb03166bbf38d61e115e960e5c60c7 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 28 Apr 2020 14:56:06 +0200
Subject: [PATCH 079/222] wifi: express SCAN_RAND_MAC_ADDRESS_EXPIRE time in
 seconds

We commonly use already seconds and milliseconds scales for computing timeouts.
Reduce the number of difference scales and don't also use minutes.
---
 src/devices/wifi/nm-device-wifi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 8aee27f4ce..f14e2b25e7 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -48,7 +48,7 @@ _LOG_DECLARE_SELF(NMDeviceWifi);
 #define SCAN_INTERVAL_SEC_STEP 20
 #define SCAN_INTERVAL_SEC_MAX 120
 
-#define SCAN_RAND_MAC_ADDRESS_EXPIRE_MIN 5
+#define SCAN_RAND_MAC_ADDRESS_EXPIRE_SEC (5*60)
 
 /*****************************************************************************/
 
@@ -1169,7 +1169,7 @@ _hw_addr_set_scanning (NMDeviceWifi *self, gboolean do_reset)
 		 * We don't bother with to update the MAC address exactly when
 		 * it expires, instead on the next scan request, we will generate
 		 * a new one.*/
-		priv->hw_addr_scan_expire = now + (SCAN_RAND_MAC_ADDRESS_EXPIRE_MIN * 60);
+		priv->hw_addr_scan_expire = now + SCAN_RAND_MAC_ADDRESS_EXPIRE_SEC;
 
 		generate_mac_address_mask = nm_config_data_get_device_config (NM_CONFIG_GET_DATA,
 		                                                              "wifi.scan-generate-mac-address-mask",

From c8a97031308f3308f7983eabce390e758f9cf11d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 27 Apr 2020 15:54:49 +0200
Subject: [PATCH 080/222] libnm/doc: fix spelling in
 nm_client_add_and_activate_connection2() documentation

---
 libnm/nm-client.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 68a1836dc8..ed8b69ca27 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -5214,7 +5214,7 @@ nm_client_add_and_activate_connection_finish (NMClient *client,
  * @specific_object: (allow-none): the object path of a connection-type-specific
  *   object this activation should use. This parameter is currently ignored for
  *   wired and mobile broadband connections, and the value of %NULL should be used
- *   (ie, no specific object).  For Wi-Fi or WiMAX connections, pass the object
+ *   (i.e., no specific object).  For Wi-Fi or WiMAX connections, pass the object
  *   path of a #NMAccessPoint or #NMWimaxNsp owned by @device, which you can
  *   get using nm_object_get_path(), and which will be used to complete the
  *   details of the newly added connection.
@@ -5234,7 +5234,7 @@ nm_client_add_and_activate_connection_finish (NMClient *client,
  * #NMActiveConnection object (in particular, #NMActiveConnection:state) to
  * track the activation to its completion.
  *
- * This is identitcal to nm_client_add_and_activate_connection_async() but takes
+ * This is identical to nm_client_add_and_activate_connection_async() but takes
  * a further @options parameter. Currently the following options are supported
  * by the daemon:
  *  * "persist": A string describing how the connection should be stored.
@@ -5243,7 +5243,7 @@ nm_client_add_and_activate_connection_finish (NMClient *client,
  *  * "bind-activation": Bind the connection lifetime to something. The default is "none",
  *            meaning an explicit disconnect is needed. The value "dbus-client"
  *            means the connection will automatically be deactivated when the calling
- *            DBus client disappears from the system bus.
+ *            D-Bus client disappears from the system bus.
  *
  * Since: 1.16
  **/

From cd095f49dce262a5107be3005f0ee7ae9720cacd Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas@fatal.se>
Date: Mon, 23 Sep 2019 16:02:32 +0200
Subject: [PATCH 081/222] iwd: support connecting to hidden networks

Newer versions of iwd has supported connecting to hidden networks for a
while now. There's a separate "connect-hidden" command in iwctl that
needs to be used instead of the regular "connect" command.
The equivalent on dbus is to use ConnectHiddenNetwork instead of
Connect on the Station interface. NetworkManager however uses the
Network interface and given we the explicit SSID usage we can connect
to hidden networks with that.

This change disabled the explicit check that disallows even attempting
hidden networks when using iwd.

This has been tested to work with a previously known hidden network.
Tests connecting to a previously unknown network has failed.
---
 src/devices/wifi/nm-device-iwd.c | 34 ++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c
index e2e705fd2e..1dc2728afb 100644
--- a/src/devices/wifi/nm-device-iwd.c
+++ b/src/devices/wifi/nm-device-iwd.c
@@ -615,13 +615,6 @@ check_connection_compatible (NMDevice *device, NMConnection *connection, GError
 		return FALSE;
 	}
 
-	/* Hidden SSIDs not supported in any mode (client or AP) */
-	if (nm_setting_wireless_get_hidden (s_wireless)) {
-		nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
-		                            "hidden networks not supported by the IWD backend");
-		return FALSE;
-	}
-
 	security = nm_wifi_connection_get_iwd_security (connection, &mapped);
 	if (!mapped) {
 		nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
@@ -630,6 +623,15 @@ check_connection_compatible (NMDevice *device, NMConnection *connection, GError
 	}
 
 	mode = nm_setting_wireless_get_mode (s_wireless);
+
+	/* Hidden SSIDs only supported in client mode */
+	if (   nm_setting_wireless_get_hidden (s_wireless)
+	    && !NM_IN_STRSET (mode, NULL, NM_SETTING_WIRELESS_MODE_INFRA)) {
+		nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
+		                            "non-infrastructure hidden networks not supported by the IWD backend");
+		return FALSE;
+	}
+
 	if (NM_IN_STRSET (mode, NULL, NM_SETTING_WIRELESS_MODE_INFRA)) {
 		/* 8021x networks can only be used if they've been provisioned on the IWD side and
 		 * thus are Known Networks.
@@ -757,6 +759,7 @@ complete_connection (NMDevice *device,
 	NMWifiAP *ap;
 	GBytes *ssid;
 	GBytes *setting_ssid = NULL;
+	gboolean hidden = FALSE;
 	const char *mode;
 
 	s_wifi = nm_connection_get_setting_wireless (connection);
@@ -789,16 +792,14 @@ complete_connection (NMDevice *device,
 		/* Find a compatible AP in the scan list */
 		ap = nm_wifi_aps_find_first_compatible (&priv->aps_lst_head, connection);
 		if (!ap) {
-			if (!nm_streq0 (mode, NM_SETTING_WIRELESS_MODE_ADHOC)) {
-				g_set_error_literal (error,
-				                     NM_DEVICE_ERROR,
-				                     NM_DEVICE_ERROR_INVALID_CONNECTION,
-				                     "No compatible AP in the scan list and hidden SSIDs not supported.");
-				return FALSE;
-			}
-
+			/* If we still don't have an AP, then the WiFI settings needs to be
+			 * fully specified by the client.  Might not be able to find an AP
+			 * if the network isn't broadcasting the SSID for example.
+			 */
 			if (!nm_setting_verify (NM_SETTING (s_wifi), connection, error))
 				return FALSE;
+
+			hidden = TRUE;
 		}
 	} else {
 		ap = nm_wifi_ap_lookup_for_device (NM_DEVICE (self), specific_object);
@@ -849,6 +850,9 @@ complete_connection (NMDevice *device,
 	                           nm_setting_wireless_get_mac_address (s_wifi) ? NULL : nm_device_get_iface (device),
 	                           TRUE);
 
+	if (hidden)
+		g_object_set (s_wifi, NM_SETTING_WIRELESS_HIDDEN, TRUE, NULL);
+
 	return TRUE;
 }
 

From 69aeed4bdc1de85a8e0a42f6d40bd0b9175c8c83 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas@fatal.se>
Date: Mon, 11 Nov 2019 00:36:36 +0100
Subject: [PATCH 082/222] iwd: use ConnectHiddenNetwork to provision hidden
 network

The Station.ConnectHiddenNetwork will provision a network in the iwd
known-networks list. This should allow us to later use the
Network.Connect interface to connect in the future.
(Note: Attempts to use Station.ConnectHiddenNetwork on already provisioned
networks, i.e. networks iwd knows about, will fail.)

This commit squashed several fixups made by thaller.
---
 src/devices/wifi/nm-device-iwd.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c
index 1dc2728afb..4b57fa380b 100644
--- a/src/devices/wifi/nm-device-iwd.c
+++ b/src/devices/wifi/nm-device-iwd.c
@@ -1790,11 +1790,34 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *out_failure_reason)
 			goto out_fail;
 		}
 
+		if (   !is_connection_known_network (connection)
+		    && nm_setting_wireless_get_hidden (s_wireless)) {
+			gs_free char *ssid_str = NULL;
+
+			/* Use Station.ConnectHiddenNetwork method instead of Network proxy. */
+			ssid_str = _nm_utils_ssid_to_utf8 (nm_setting_wireless_get_ssid (s_wireless));
+			g_dbus_proxy_call (priv->dbus_station_proxy,
+			                   "ConnectHiddenNetwork",
+			                   g_variant_new ("(s)", ssid_str),
+			                   G_DBUS_CALL_FLAGS_NONE, G_MAXINT,
+			                   priv->cancellable,
+			                   network_connect_cb,
+			                   self);
+			return NM_ACT_STAGE_RETURN_POSTPONE;
+		}
+
+		if (!nm_wifi_ap_get_supplicant_path (ap)) {
+			_LOGW (LOGD_DEVICE | LOGD_WIFI,
+			       "Activation: (wifi) network is provisioned but dbus supplicant path for AP unknown");
+			NM_SET_OUT (out_failure_reason, NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED);
+			goto out_fail;
+		}
+
 		network_proxy = nm_iwd_manager_get_dbus_interface (nm_iwd_manager_get (),
 		                                                   nm_ref_string_get_str (nm_wifi_ap_get_supplicant_path (ap)),
 		                                                   NM_IWD_NETWORK_INTERFACE);
 		if (!network_proxy) {
-			_LOGE (LOGD_DEVICE | LOGD_WIFI,
+			_LOGW (LOGD_DEVICE | LOGD_WIFI,
 			       "Activation: (wifi) could not get Network interface proxy for %s",
 			       nm_ref_string_get_str (nm_wifi_ap_get_supplicant_path (ap)));
 			NM_SET_OUT (out_failure_reason, NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED);

From e07fc217ecd7ac3afec4060ea8edffbca0ceac67 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 24 Apr 2020 16:54:35 +0200
Subject: [PATCH 083/222] wifi: rework scanning of Wi-Fi device

Handling the scanning is complicated.

- we want to have periodic scans. But only at certain times,
and with an increasing back off timeout.

- the user can initiate explicit scans via D-Bus. Thereby a list
of SSIDs scan be provided.

- if there are any hidden Wi-Fi profiles configured, we want
to explicitly scan for their SSIDs.

- explicit scans are not possible at any time. But we should not reject
the scan request, but instead remember to scan later, when possible.

This is a heavy rework. It also aims to fix issues of scanning since
the recent rework of supplicant handling in commit b83f07916a54
('supplicant: large rework of wpa_supplicant handling') that can render
Wi-Fi scanning broken.

Fixes: b83f07916a54 ('supplicant: large rework of wpa_supplicant handling'):
---
 src/devices/wifi/nm-device-wifi.c | 888 +++++++++++++++++++-----------
 1 file changed, 554 insertions(+), 334 deletions(-)

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index f14e2b25e7..e145a5c5f5 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -48,8 +48,17 @@ _LOG_DECLARE_SELF(NMDeviceWifi);
 #define SCAN_INTERVAL_SEC_STEP 20
 #define SCAN_INTERVAL_SEC_MAX 120
 
+#define SCAN_RATE_LIMIT_SEC 8
+
+#define SCAN_EXTRA_DELAY_MSEC 500
+
 #define SCAN_RAND_MAC_ADDRESS_EXPIRE_SEC (5*60)
 
+#define SCAN_REQUEST_SSIDS_MAX_NUM      32u
+#define SCAN_REQUEST_SSIDS_MAX_AGE_MSEC (3 * 60 * NM_UTILS_MSEC_PER_SEC)
+
+#define _LOGT_scan(...) _LOGT (LOGD_WIFI_SCAN, "wifi-scan: " __VA_ARGS__)
+
 /*****************************************************************************/
 
 NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceWifi,
@@ -76,44 +85,58 @@ typedef struct {
 
 	CList             scanning_prohibited_lst_head;
 
+	GCancellable     *scan_request_cancellable;
+
+	GSource          *scan_request_delay_source;
+
 	NMWifiAP *        current_ap;
-	guint32           rate;
-	bool              enabled:1; /* rfkilled or not */
-	bool              requested_scan:1;
-	bool              ssid_found:1;
-	bool              is_scanning:1;
-	bool              hidden_probe_scan_warn:1;
 
-	gint64            last_scan_msec;
-
-	gint32            scheduled_scan_time; /* seconds */
-	guint8            scan_interval_sec;
-	guint             pending_scan_id;
-	guint             ap_dump_id;
-
-	NMSupplicantManager   *sup_mgr;
-	NMSupplMgrCreateIfaceHandle *sup_create_handle;
-	NMSupplicantInterface *sup_iface;
-	guint                  sup_timeout_id; /* supplicant association timeout */
-
-	NM80211Mode       mode;
+	GHashTable       *scan_request_ssids_hash;
+	CList             scan_request_ssids_lst_head;
 
 	NMActRequestGetSecretsCallId *wifi_secrets_id;
 
+	NMSupplicantManager *sup_mgr;
+	NMSupplMgrCreateIfaceHandle *sup_create_handle;
+	NMSupplicantInterface *sup_iface;
+
+	gint64            scan_last_complete_msec;
+	gint64            scan_periodic_next_msec;
+
+	gint64            scan_ratelimited_until_msec;
+
+	guint             scan_kickoff_timeout_id;
+
+	guint             ap_dump_id;
+
 	guint             periodic_update_id;
+
 	guint             link_timeout_id;
-	guint32           failed_iface_count;
 	guint             reacquire_iface_id;
+	guint             wps_timeout_id;
+	guint             sup_timeout_id; /* supplicant association timeout */
 
 	NMDeviceWifiCapabilities capabilities;
-
-	gint32 hw_addr_scan_expire;
-
-	guint             wps_timeout_id;
-
 	NMSettingWirelessWakeOnWLan wowlan_restore;
 
 	NMDeviceWifiP2P  *p2p_device;
+	NM80211Mode       mode;
+
+	guint32           failed_iface_count;
+	gint32            hw_addr_scan_expire;
+
+	guint32           rate;
+
+	guint8            scan_periodic_interval_sec;
+
+	bool              enabled:1; /* rfkilled or not */
+	bool              scan_is_scanning:1;
+	bool              scan_periodic_allowed:1;
+	bool              scan_explicit_allowed:1;
+	bool              scan_explicit_requested:1;
+	bool              ssid_found:1;
+	bool              hidden_probe_scan_warn:1;
+
 } NMDeviceWifiPrivate;
 
 struct _NMDeviceWifi
@@ -135,12 +158,8 @@ G_DEFINE_TYPE (NMDeviceWifi, nm_device_wifi, NM_TYPE_DEVICE)
 
 /*****************************************************************************/
 
-static gboolean check_scanning_prohibited (NMDeviceWifi *self, gboolean periodic);
-
 static void supplicant_iface_state_down (NMDeviceWifi *self);
 
-static void schedule_scan (NMDeviceWifi *self, gboolean backoff);
-
 static void cleanup_association_attempt (NMDeviceWifi * self,
                                          gboolean disconnect);
 
@@ -173,15 +192,8 @@ static void supplicant_iface_notify_p2p_available (NMSupplicantInterface *iface,
                                                    GParamSpec *pspec,
                                                    NMDeviceWifi *self);
 
-static void _requested_scan_set (NMDeviceWifi *self, gboolean value);
-
 static void periodic_update (NMDeviceWifi *self);
 
-static void request_wireless_scan (NMDeviceWifi *self,
-                                   gboolean periodic,
-                                   gboolean force_if_scanning,
-                                   const GPtrArray *ssids);
-
 static void ap_add_remove (NMDeviceWifi *self,
                            gboolean is_adding,
                            NMWifiAP *ap,
@@ -191,6 +203,147 @@ static void _hw_addr_set_scanning (NMDeviceWifi *self, gboolean do_reset);
 
 static void recheck_p2p_availability (NMDeviceWifi *self);
 
+static void _scan_kickoff (NMDeviceWifi *self);
+
+static gboolean _scan_notify_allowed (NMDeviceWifi *self, NMTernary do_kickoff);
+
+/*****************************************************************************/
+
+typedef struct {
+	GBytes *ssid;
+	CList lst;
+	gint64 timestamp_msec;
+} ScanRequestSsidData;
+
+static void
+_scan_request_ssids_remove (NMDeviceWifiPrivate *priv,
+                            ScanRequestSsidData *srs_data,
+                            GBytes **out_ssid)
+{
+	nm_assert (priv->scan_request_ssids_hash);
+	nm_assert (g_hash_table_lookup (priv->scan_request_ssids_hash, srs_data) == srs_data);
+
+	if (!g_hash_table_remove (priv->scan_request_ssids_hash, srs_data))
+		nm_assert_not_reached ();
+	c_list_unlink_stale (&srs_data->lst);
+	if (out_ssid)
+		*out_ssid = srs_data->ssid;
+	else
+		g_bytes_unref (srs_data->ssid);
+	nm_g_slice_free (srs_data);
+}
+
+static void
+_scan_request_ssids_remove_all (NMDeviceWifiPrivate *priv,
+                                gint64 cutoff_with_now_msec,
+                                guint cutoff_at_len)
+{
+	ScanRequestSsidData *srs_data;
+
+	if (cutoff_with_now_msec != 0) {
+		gint64 cutoff_time_msec;
+
+		/* remove all entries that are older than a max-age. */
+		nm_assert (cutoff_with_now_msec > 0);
+		cutoff_time_msec = cutoff_with_now_msec - SCAN_REQUEST_SSIDS_MAX_AGE_MSEC;
+		while ((srs_data = c_list_last_entry (&priv->scan_request_ssids_lst_head, ScanRequestSsidData, lst))) {
+			if (srs_data->timestamp_msec > cutoff_time_msec)
+				return;
+			_scan_request_ssids_remove (priv, srs_data, NULL);
+		}
+	}
+
+	if (cutoff_at_len != G_MAXUINT) {
+		guint i;
+
+		/* trim the list to cutoff_at_len elements. */
+		i = nm_g_hash_table_size (priv->scan_request_ssids_hash);
+		for (; i > cutoff_at_len; i--) {
+			ScanRequestSsidData *d;
+
+			d = c_list_last_entry (&priv->scan_request_ssids_lst_head, ScanRequestSsidData, lst);
+			_scan_request_ssids_remove (priv, d, NULL);
+		}
+		nm_assert (i == nm_g_hash_table_size (priv->scan_request_ssids_hash));
+		nm_assert (i == c_list_length (&priv->scan_request_ssids_lst_head));
+		nm_assert (i <= cutoff_at_len);
+	}
+}
+
+static GPtrArray *
+_scan_request_ssids_fetch (NMDeviceWifiPrivate *priv)
+{
+	ScanRequestSsidData *srs_data;
+	GPtrArray *ssids;
+	guint len;
+
+	_scan_request_ssids_remove_all (priv, nm_utils_get_monotonic_timestamp_msec (), SCAN_REQUEST_SSIDS_MAX_NUM);
+
+	len = nm_g_hash_table_size (priv->scan_request_ssids_hash);
+	nm_assert (len == c_list_length (&priv->scan_request_ssids_lst_head));
+
+	if (len == 0)
+		return NULL;
+
+	ssids = g_ptr_array_new_full (len, (GDestroyNotify) g_bytes_unref);
+	while ((srs_data = c_list_first_entry (&priv->scan_request_ssids_lst_head, ScanRequestSsidData, lst))) {
+		GBytes *ssid;
+
+		_scan_request_ssids_remove (priv, srs_data, &ssid);
+		g_ptr_array_add (ssids, ssid);
+	}
+	return ssids;
+}
+
+static void
+_scan_request_ssids_track (NMDeviceWifiPrivate *priv,
+                           const GPtrArray *ssids)
+{
+	CList old_lst_head;
+	gint64 now_msec;
+	guint i;
+
+	if (   !ssids
+	    || ssids->len == 0)
+		return;
+
+	now_msec = nm_utils_get_monotonic_timestamp_msec ();
+
+	if (!priv->scan_request_ssids_hash)
+		priv->scan_request_ssids_hash = g_hash_table_new (nm_pgbytes_hash, nm_pgbytes_equal);
+
+	/* Do a little dance. New elements shall keep their order as in @ssids, but all
+	 * new elements should be sorted in the list preexisting elements of the list.
+	 * First move the old elements away, and splice them back afterwards. */
+	c_list_init (&old_lst_head);
+	c_list_splice (&old_lst_head, &priv->scan_request_ssids_lst_head);
+
+	for (i = 0; i < ssids->len; i++) {
+		GBytes *ssid = ssids->pdata[i];
+		ScanRequestSsidData *d;
+
+		G_STATIC_ASSERT_EXPR (G_STRUCT_OFFSET (ScanRequestSsidData, ssid) == 0);
+		d = g_hash_table_lookup (priv->scan_request_ssids_hash, &ssid);
+		if (!d) {
+			d = g_slice_new (ScanRequestSsidData);
+			*d = (ScanRequestSsidData) {
+				.lst            = C_LIST_INIT (d->lst),
+				.timestamp_msec = now_msec,
+				.ssid           = g_bytes_ref (ssid),
+			};
+			g_hash_table_add (priv->scan_request_ssids_hash, d);
+		} else
+			d->timestamp_msec = now_msec;
+		c_list_link_tail (&priv->scan_request_ssids_lst_head, &d->lst);
+	}
+
+	c_list_splice (&priv->scan_request_ssids_lst_head, &old_lst_head);
+
+	/* Trim the excess. After our splice with old_lst_head, the list contains the new
+	 * elements (from @ssids) at the front (in there original order), followed by older elements. */
+	_scan_request_ssids_remove_all (priv, now_msec, SCAN_REQUEST_SSIDS_MAX_NUM);
+}
+
 /*****************************************************************************/
 
 void
@@ -218,16 +371,15 @@ nm_device_wifi_scanning_prohibited_track (NMDeviceWifi *self,
 	if (!temporarily_prohibited) {
 		if (!elem)
 			return;
-
 		nm_c_list_elem_free (elem);
-		return;
+	} else {
+		if (elem)
+			return;
+		c_list_link_tail (&priv->scanning_prohibited_lst_head,
+		                  &nm_c_list_elem_new_stale (tag)->lst);
 	}
 
-	if (elem)
-		return;
-
-	c_list_link_tail (&priv->scanning_prohibited_lst_head,
-	                  &nm_c_list_elem_new_stale (tag)->lst);
+	_scan_notify_allowed (self, NM_TERNARY_DEFAULT);
 }
 
 /*****************************************************************************/
@@ -252,28 +404,36 @@ nm_device_wifi_get_scanning (NMDeviceWifi *self)
 {
 	g_return_val_if_fail (NM_IS_DEVICE_WIFI (self), FALSE);
 
-	return NM_DEVICE_WIFI_GET_PRIVATE (self)->is_scanning;
+	return NM_DEVICE_WIFI_GET_PRIVATE (self)->scan_is_scanning;
 }
 
-static void
-_notify_scanning (NMDeviceWifi *self)
+static gboolean
+_scan_is_scanning_eval (NMDeviceWifiPrivate *priv)
+{
+	return    priv->scan_request_cancellable
+	       || priv->scan_request_delay_source
+	       || (    priv->sup_iface
+	           && nm_supplicant_interface_get_scanning (priv->sup_iface));
+}
+
+static gboolean
+_scan_notify_is_scanning (NMDeviceWifi *self)
 {
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
-	gboolean scanning;
 	gboolean last_scan_changed = FALSE;
+	NMDeviceState state;
+	gboolean scanning;
 
-	scanning =    priv->sup_iface
-	           && nm_supplicant_interface_get_scanning (priv->sup_iface);
+	scanning = _scan_is_scanning_eval (priv);
+	if (scanning == priv->scan_is_scanning)
+		return FALSE;
 
-	if (scanning == priv->is_scanning)
-		return;
-
-	priv->is_scanning = scanning;
+	priv->scan_is_scanning = scanning;
 
 	if (   !scanning
-	    || priv->last_scan_msec == 0) {
+	    || priv->scan_last_complete_msec == 0) {
 		last_scan_changed = TRUE;
-		priv->last_scan_msec = nm_utils_get_monotonic_timestamp_msec ();
+		priv->scan_last_complete_msec = nm_utils_get_monotonic_timestamp_msec ();
 	}
 
 	_LOGD (LOGD_WIFI,
@@ -281,7 +441,16 @@ _notify_scanning (NMDeviceWifi *self)
 	       scanning ? "scanning" : "idle",
 	       last_scan_changed ? " (notify last-scan)" : "");
 
-	schedule_scan (self, TRUE);
+	state = nm_device_get_state (NM_DEVICE (self));
+
+	if (scanning) {
+		/* while the device is activating/activated, we don't need the pending
+		 * action. The pending action exists to delay startup complete, while
+		 * activating that is already achieved via other means. */
+		if (   state <= NM_DEVICE_STATE_DISCONNECTED
+		    || state > NM_DEVICE_STATE_ACTIVATED)
+			nm_device_add_pending_action (NM_DEVICE (self), NM_PENDING_ACTION_WIFI_SCAN, FALSE);
+	}
 
 	nm_gobject_notify_together (self,
 	                            PROP_SCANNING,
@@ -289,13 +458,73 @@ _notify_scanning (NMDeviceWifi *self)
 	                            ? PROP_LAST_SCAN
 	                            : PROP_0);
 
-	if (!priv->is_scanning) {
-		_requested_scan_set (self, FALSE);
-		if (nm_device_get_state (NM_DEVICE (self)) == NM_DEVICE_STATE_ACTIVATED) {
-			/* Run a quick update of current AP when coming out of a scan */
-			periodic_update (self);
-		}
+	_scan_kickoff (self);
+
+	if (!_scan_is_scanning_eval (priv)) {
+		if (   state <= NM_DEVICE_STATE_DISCONNECTED
+		    || state > NM_DEVICE_STATE_ACTIVATED)
+			nm_device_emit_recheck_auto_activate (NM_DEVICE (self));
+		nm_device_remove_pending_action (NM_DEVICE (self), NM_PENDING_ACTION_WIFI_SCAN, FALSE);
 	}
+
+	return TRUE;
+}
+
+static gboolean
+_scan_notify_allowed (NMDeviceWifi *self, NMTernary do_kickoff)
+{
+	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
+	gboolean explicit_allowed;
+	gboolean periodic_allowed;
+	NMDeviceState state;
+	gboolean changed = FALSE;
+
+	state = nm_device_get_state (NM_DEVICE (self));
+
+	explicit_allowed = FALSE;
+	periodic_allowed = FALSE;
+
+	if (!c_list_is_empty (&priv->scanning_prohibited_lst_head)) {
+		/* something prohibits scanning. */
+	} else if (NM_IN_SET (priv->mode, NM_802_11_MODE_ADHOC,
+	                                  NM_802_11_MODE_AP)) {
+		/* Don't scan when a an AP or Ad-Hoc connection is active as it will
+		 * disrupt connected clients or peers. */
+	} else if (NM_IN_SET (state, NM_DEVICE_STATE_DISCONNECTED,
+	                             NM_DEVICE_STATE_FAILED)) {
+		/* Can always scan when disconnected */
+		explicit_allowed = TRUE;
+		periodic_allowed = TRUE;
+	} else if (NM_IN_SET (state, NM_DEVICE_STATE_ACTIVATED)) {
+		/* Prohibit periodic scans when connected; we ask the supplicant to
+		 * background scan for us, unless the connection is locked to a specific
+		 * BSSID (in which case scanning is effectively disabled). */
+		periodic_allowed = FALSE;
+
+		/* Prohibit scans if the supplicant is busy */
+		explicit_allowed = !NM_IN_SET (nm_supplicant_interface_get_state (priv->sup_iface),
+		                               NM_SUPPLICANT_INTERFACE_STATE_ASSOCIATING,
+		                               NM_SUPPLICANT_INTERFACE_STATE_ASSOCIATED,
+		                               NM_SUPPLICANT_INTERFACE_STATE_4WAY_HANDSHAKE,
+		                               NM_SUPPLICANT_INTERFACE_STATE_GROUP_HANDSHAKE);
+	}
+
+	if (   explicit_allowed != priv->scan_explicit_allowed
+	    || periodic_allowed != priv->scan_periodic_allowed) {
+		priv->scan_periodic_allowed = periodic_allowed;
+		priv->scan_explicit_allowed = explicit_allowed;
+		_LOGT_scan ("scan-periodic-allowed=%d, scan-explicit-allowed=%d",
+		            periodic_allowed,
+		            explicit_allowed);
+		changed = TRUE;
+	}
+
+	if (   do_kickoff == NM_TERNARY_TRUE
+	    || (   do_kickoff == NM_TERNARY_DEFAULT
+	        && changed))
+		_scan_kickoff (self);
+
+	return changed;
 }
 
 static void
@@ -303,7 +532,7 @@ supplicant_iface_notify_scanning_cb (NMSupplicantInterface *iface,
                                      GParamSpec *pspec,
                                      NMDeviceWifi *self)
 {
-	_notify_scanning (self);
+	_scan_notify_is_scanning (self);
 }
 
 static gboolean
@@ -370,7 +599,7 @@ supplicant_interface_acquire_cb (NMSupplicantManager *supplicant_manager,
 	                  G_CALLBACK (supplicant_iface_notify_p2p_available),
 	                  self);
 
-	_notify_scanning (self);
+	_scan_notify_is_scanning (self);
 
 	if (nm_supplicant_interface_get_state (priv->sup_iface) != NM_SUPPLICANT_INTERFACE_STATE_STARTING) {
 		/* fake an initial state change. */
@@ -398,26 +627,6 @@ supplicant_interface_acquire (NMDeviceWifi *self)
 	nm_device_add_pending_action (NM_DEVICE (self), NM_PENDING_ACTION_WAITING_FOR_SUPPLICANT, TRUE);
 }
 
-static void
-_requested_scan_set (NMDeviceWifi *self, gboolean value)
-{
-	NMDeviceWifiPrivate *priv;
-
-	value = !!value;
-
-	priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
-	if (priv->requested_scan == value)
-		return;
-
-	priv->requested_scan = value;
-	if (value)
-		nm_device_add_pending_action ((NMDevice *) self, NM_PENDING_ACTION_WIFI_SCAN, TRUE);
-	else {
-		nm_device_emit_recheck_auto_activate (NM_DEVICE (self));
-		nm_device_remove_pending_action (NM_DEVICE (self), NM_PENDING_ACTION_WIFI_SCAN, TRUE);
-	}
-}
-
 static void
 supplicant_interface_release (NMDeviceWifi *self)
 {
@@ -426,14 +635,14 @@ supplicant_interface_release (NMDeviceWifi *self)
 	if (nm_clear_pointer (&priv->sup_create_handle, nm_supplicant_manager_create_interface_cancel))
 		nm_device_remove_pending_action (NM_DEVICE (self), NM_PENDING_ACTION_WAITING_FOR_SUPPLICANT, TRUE);
 
-	_requested_scan_set (self, FALSE);
+	nm_clear_g_source (&priv->scan_kickoff_timeout_id);
+	nm_clear_g_source_inst (&priv->scan_request_delay_source);
+	nm_clear_g_cancellable (&priv->scan_request_cancellable);
 
-	nm_clear_g_source (&priv->pending_scan_id);
+	_scan_request_ssids_remove_all (priv, 0, 0);
 
-	/* Reset the scan interval to be pretty frequent when disconnected */
-	priv->scan_interval_sec = SCAN_INTERVAL_SEC_MIN + SCAN_INTERVAL_SEC_STEP;
-	_LOGD (LOGD_WIFI, "wifi-scan: reset interval to %u seconds",
-	       (unsigned) priv->scan_interval_sec);
+	priv->scan_periodic_interval_sec = 0;
+	priv->scan_periodic_next_msec = 0;
 
 	nm_clear_g_source (&priv->ap_dump_id);
 
@@ -452,7 +661,7 @@ supplicant_interface_release (NMDeviceWifi *self)
 		nm_device_wifi_p2p_set_mgmt_iface (priv->p2p_device, NULL);
 	}
 
-	_notify_scanning (self);
+	_scan_notify_is_scanning (self);
 }
 
 static void
@@ -702,7 +911,6 @@ deactivate (NMDevice *device)
 	NMDeviceWifi *self = NM_DEVICE_WIFI (device);
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 	int ifindex = nm_device_get_ifindex (device);
-	NM80211Mode old_mode = priv->mode;
 
 	nm_clear_g_source (&priv->periodic_update_id);
 
@@ -732,9 +940,7 @@ deactivate (NMDevice *device)
 		_notify (self, PROP_MODE);
 	}
 
-	/* Ensure we trigger a scan after deactivating a Hotspot */
-	if (old_mode == NM_802_11_MODE_AP)
-		request_wireless_scan (self, FALSE, FALSE, NULL);
+	_scan_notify_allowed (self, NM_TERNARY_TRUE);
 }
 
 static void
@@ -1057,10 +1263,7 @@ is_available (NMDevice *device, NMDeviceCheckDevAvailableFlags flags)
 static gboolean
 get_autoconnect_allowed (NMDevice *device)
 {
-	NMDeviceWifiPrivate *priv;
-
-	priv = NM_DEVICE_WIFI_GET_PRIVATE (NM_DEVICE_WIFI (device));
-	return !priv->requested_scan;
+	return !NM_DEVICE_WIFI_GET_PRIVATE (NM_DEVICE_WIFI (device))->scan_is_scanning;
 }
 
 static gboolean
@@ -1238,6 +1441,7 @@ dbus_request_scan_cb (NMDevice *device,
                       gpointer user_data)
 {
 	NMDeviceWifi *self = NM_DEVICE_WIFI (device);
+	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 	gs_unref_ptrarray GPtrArray *ssids = user_data;
 
 	if (error) {
@@ -1245,15 +1449,9 @@ dbus_request_scan_cb (NMDevice *device,
 		return;
 	}
 
-	if (check_scanning_prohibited (self, FALSE)) {
-		g_dbus_method_invocation_return_error_literal (context,
-		                                               NM_DEVICE_ERROR,
-		                                               NM_DEVICE_ERROR_NOT_ALLOWED,
-		                                               "Scanning not allowed at this time");
-		return;
-	}
-
-	request_wireless_scan (self, FALSE, FALSE, ssids);
+	_scan_request_ssids_track (priv, ssids);
+	priv->scan_explicit_requested = TRUE;
+	_scan_kickoff (self);
 	g_dbus_method_invocation_return_value (context, NULL);
 }
 
@@ -1264,7 +1462,6 @@ _nm_device_wifi_request_scan (NMDeviceWifi *self,
 {
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 	NMDevice *device = NM_DEVICE (self);
-	gint64 last_scan;
 	gs_unref_ptrarray GPtrArray *ssids = NULL;
 
 	if (options) {
@@ -1291,35 +1488,11 @@ _nm_device_wifi_request_scan (NMDeviceWifi *self,
 
 	if (   !priv->enabled
 	    || !priv->sup_iface
-	    || nm_device_get_state (device) < NM_DEVICE_STATE_DISCONNECTED
-	    || nm_device_is_activating (device)) {
+	    || nm_device_get_state (device) < NM_DEVICE_STATE_DISCONNECTED) {
 		g_dbus_method_invocation_return_error_literal (invocation,
 		                                               NM_DEVICE_ERROR,
 		                                               NM_DEVICE_ERROR_NOT_ALLOWED,
-		                                               "Scanning not allowed while unavailable or activating");
-		return;
-	}
-
-	if (nm_supplicant_interface_get_scanning (priv->sup_iface)) {
-		g_dbus_method_invocation_return_error_literal (invocation,
-		                                               NM_DEVICE_ERROR,
-		                                               NM_DEVICE_ERROR_NOT_ALLOWED,
-		                                               "Scanning not allowed while already scanning");
-		return;
-	}
-
-	last_scan = nm_supplicant_interface_get_last_scan (priv->sup_iface);
-	if (   last_scan > 0
-	    && nm_utils_get_monotonic_timestamp_msec () < last_scan + (10 * NM_UTILS_MSEC_PER_SEC)) {
-		/* FIXME: we really should not outright reject a scan request in this case. We should
-		 * ensure to start a scan request soon, possibly with rate limiting. And there is no
-		 * need to tell the caller that we aren't going to scan...
-		 *
-		 * Same above, if we are currently scanning... */
-		g_dbus_method_invocation_return_error_literal (invocation,
-		                                               NM_DEVICE_ERROR,
-		                                               NM_DEVICE_ERROR_NOT_ALLOWED,
-		                                               "Scanning not allowed immediately following previous scan");
+		                                               "Scanning not allowed while unavailable");
 		return;
 	}
 
@@ -1333,64 +1506,6 @@ _nm_device_wifi_request_scan (NMDeviceWifi *self,
 	                        g_steal_pointer (&ssids));
 }
 
-static gboolean
-check_scanning_prohibited (NMDeviceWifi *self,
-                           gboolean periodic)
-{
-	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
-
-	nm_assert (NM_IS_SUPPLICANT_INTERFACE (priv->sup_iface));
-
-	if (!c_list_is_empty (&priv->scanning_prohibited_lst_head))
-		return TRUE;
-
-	/* Don't scan when a an AP or Ad-Hoc connection is active as it will
-	 * disrupt connected clients or peers.
-	 */
-	if (NM_IN_SET (priv->mode, NM_802_11_MODE_ADHOC,
-	                           NM_802_11_MODE_AP))
-		return TRUE;
-
-	switch (nm_device_get_state (NM_DEVICE (self))) {
-	case NM_DEVICE_STATE_UNKNOWN:
-	case NM_DEVICE_STATE_UNMANAGED:
-	case NM_DEVICE_STATE_UNAVAILABLE:
-	case NM_DEVICE_STATE_PREPARE:
-	case NM_DEVICE_STATE_CONFIG:
-	case NM_DEVICE_STATE_NEED_AUTH:
-	case NM_DEVICE_STATE_IP_CONFIG:
-	case NM_DEVICE_STATE_IP_CHECK:
-	case NM_DEVICE_STATE_SECONDARIES:
-	case NM_DEVICE_STATE_DEACTIVATING:
-		/* Prohibit scans when unusable or activating */
-		return TRUE;
-	case NM_DEVICE_STATE_DISCONNECTED:
-	case NM_DEVICE_STATE_FAILED:
-		/* Can always scan when disconnected */
-		return FALSE;
-	case NM_DEVICE_STATE_ACTIVATED:
-		/* Prohibit periodic scans when connected; we ask the supplicant to
-		 * background scan for us, unless the connection is locked to a specific
-		 * BSSID.
-		 */
-		if (periodic)
-			return TRUE;
-		break;
-	}
-
-	/* Prohibit scans if the supplicant is busy */
-	if (   NM_IN_SET (nm_supplicant_interface_get_state (priv->sup_iface),
-	                  NM_SUPPLICANT_INTERFACE_STATE_ASSOCIATING,
-	                  NM_SUPPLICANT_INTERFACE_STATE_ASSOCIATED,
-	                  NM_SUPPLICANT_INTERFACE_STATE_4WAY_HANDSHAKE,
-	                  NM_SUPPLICANT_INTERFACE_STATE_GROUP_HANDSHAKE)
-	    || nm_supplicant_interface_get_scanning (priv->sup_iface))
-		return TRUE;
-
-	/* Allow the scan */
-	return FALSE;
-}
-
 static gboolean
 hidden_filter_func (NMSettings *settings,
                     NMSettingsConnection *set_con,
@@ -1410,177 +1525,277 @@ hidden_filter_func (NMSettings *settings,
 }
 
 static GPtrArray *
-build_hidden_probe_list (NMDeviceWifi *self)
+_scan_request_ssids_build_hidden (NMDeviceWifi *self,
+                                  gboolean *out_has_hidden_profiles)
 {
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 	guint max_scan_ssids = nm_supplicant_interface_get_max_scan_ssids (priv->sup_iface);
 	gs_free NMSettingsConnection **connections = NULL;
+	gs_unref_ptrarray GPtrArray *ssids = NULL;
+	gs_unref_hashtable GHashTable *unique_ssids = NULL;
 	guint i, len;
-	GPtrArray *ssids = NULL;
-	static GBytes *nullssid = NULL;
 
-	/* Need at least two: wildcard SSID and one or more hidden SSIDs */
-	if (max_scan_ssids < 2)
+	NM_SET_OUT (out_has_hidden_profiles, FALSE);
+
+	/* collect all pending explicit SSIDs. */
+	ssids = _scan_request_ssids_fetch (priv);
+
+	if (max_scan_ssids == 0) {
+		/* no space. @ssids will be ignored. */
 		return NULL;
+	}
+
+	if (ssids) {
+		if (ssids->len < max_scan_ssids) {
+			/* Add wildcard SSID using a static wildcard SSID used for every scan */
+			g_ptr_array_insert (ssids, 0, g_bytes_ref (nm_gbytes_get_empty ()));
+		}
+		if (ssids->len >= max_scan_ssids) {
+			/* there is no more space. Use what we have. */
+			g_ptr_array_set_size (ssids, max_scan_ssids);
+			return g_steal_pointer (&ssids);
+		}
+	}
 
 	connections = nm_settings_get_connections_clone (nm_device_get_settings ((NMDevice *) self),
 	                                                 &len,
-	                                                 hidden_filter_func, NULL,
-	                                                 NULL, NULL);
+	                                                 hidden_filter_func,
+	                                                 NULL,
+	                                                 NULL,
+	                                                 NULL);
 	if (!connections[0])
-		return NULL;
+		return g_steal_pointer (&ssids);
 
-	g_qsort_with_data (connections, len, sizeof (NMSettingsConnection *), nm_settings_connection_cmp_timestamp_p_with_data, NULL);
+	if (!ssids) {
+		ssids = g_ptr_array_new_full (max_scan_ssids, (GDestroyNotify) g_bytes_unref);
+		/* Add wildcard SSID using a static wildcard SSID used for every scan */
+		g_ptr_array_insert (ssids, 0, g_bytes_ref (nm_gbytes_get_empty ()));
+	}
 
-	ssids = g_ptr_array_new_full (max_scan_ssids, (GDestroyNotify) g_bytes_unref);
+	unique_ssids = g_hash_table_new (nm_gbytes_hash, nm_gbytes_equal);
+	for (i = 1; i < ssids->len; i++) {
+		if (!g_hash_table_add (unique_ssids, ssids->pdata[i]))
+			nm_assert_not_reached ();
+	}
 
-	/* Add wildcard SSID using a static wildcard SSID used for every scan */
-	if (G_UNLIKELY (nullssid == NULL))
-		nullssid = g_bytes_new_static ("", 0);
-	g_ptr_array_add (ssids, g_bytes_ref (nullssid));
+	g_qsort_with_data (connections,
+	                   len,
+	                   sizeof (NMSettingsConnection *),
+	                   nm_settings_connection_cmp_timestamp_p_with_data,
+	                   NULL);
 
 	for (i = 0; connections[i]; i++) {
 		NMSettingWireless *s_wifi;
 		GBytes *ssid;
 
-		if (i >= max_scan_ssids - 1)
+		if (ssids->len >= max_scan_ssids)
 			break;
 
-		s_wifi = (NMSettingWireless *) nm_connection_get_setting_wireless (nm_settings_connection_get_connection (connections[i]));
+		s_wifi = nm_connection_get_setting_wireless (nm_settings_connection_get_connection (connections[i]));
 		ssid = nm_setting_wireless_get_ssid (s_wifi);
+
+		if (!g_hash_table_add (unique_ssids, ssid))
+			continue;
+
+		NM_SET_OUT (out_has_hidden_profiles, TRUE);
 		g_ptr_array_add (ssids, g_bytes_ref (ssid));
 	}
 
-	return ssids;
-}
-
-static void
-request_wireless_scan (NMDeviceWifi *self,
-                       gboolean periodic,
-                       gboolean force_if_scanning,
-                       const GPtrArray *ssids)
-{
-	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
-	gboolean request_started = FALSE;
-
-	nm_clear_g_source (&priv->pending_scan_id);
-
-	if (!force_if_scanning && priv->requested_scan) {
-		/* There's already a scan in progress */
-		return;
-	}
-
-	if (!check_scanning_prohibited (self, periodic)) {
-		gs_unref_ptrarray GPtrArray *hidden_ssids = NULL;
-
-		_LOGD (LOGD_WIFI, "wifi-scan: scanning requested");
-
-		if (!ssids) {
-			hidden_ssids = build_hidden_probe_list (self);
-			if (hidden_ssids) {
-				if (priv->hidden_probe_scan_warn) {
-					priv->hidden_probe_scan_warn = FALSE;
-					_LOGW (LOGD_WIFI, "wifi-scan: active scanning for networks due to profiles with wifi.hidden=yes. This makes you trackable");
-				}
-				ssids = hidden_ssids;
-			} else
-				priv->hidden_probe_scan_warn = TRUE;
-		}
-
-		if (_LOGD_ENABLED (LOGD_WIFI)) {
-			if (ssids) {
-				guint i;
-
-				for (i = 0; i < ssids->len; i++) {
-					gs_free char *ssid_str = NULL;
-					GBytes *ssid = ssids->pdata[i];
-
-					ssid_str = g_bytes_get_size (ssid) > 0
-					           ? _nm_utils_ssid_to_string (ssid)
-					           : NULL;
-					_LOGD (LOGD_WIFI, "wifi-scan: (%u) probe scanning SSID %s",
-					       i, ssid_str ?: "*any*");
-				}
-			} else
-				_LOGD (LOGD_WIFI, "wifi-scan: no SSIDs to probe scan");
-		}
-
-		_hw_addr_set_scanning (self, FALSE);
-
-		nm_supplicant_interface_request_scan (priv->sup_iface,
-		                                      ssids ? (GBytes *const*) ssids->pdata : NULL,
-		                                      ssids ? ssids->len : 0u,
-		                                      NULL,
-		                                      NULL,
-		                                      NULL);
-
-		request_started = TRUE;
-	} else
-		_LOGD (LOGD_WIFI, "wifi-scan: scanning requested but not allowed at this time");
-
-	_requested_scan_set (self, request_started);
-
-	schedule_scan (self, request_started);
+	return g_steal_pointer (&ssids);
 }
 
 static gboolean
-request_wireless_scan_periodic (gpointer user_data)
+_scan_request_delay_cb (gpointer user_data)
 {
 	NMDeviceWifi *self = user_data;
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 
-	priv->pending_scan_id = 0;
-	request_wireless_scan (self, TRUE, FALSE, NULL);
+	nm_clear_g_source_inst (&priv->scan_request_delay_source);
+
+	_LOGT_scan ("scan request completed (after extra delay)");
+
+	_scan_notify_is_scanning (self);
 	return G_SOURCE_REMOVE;
 }
 
-/*
- * schedule_scan
- *
- * Schedule a wireless scan.
- *
- */
 static void
-schedule_scan (NMDeviceWifi *self, gboolean backoff)
+_scan_supplicant_request_scan_cb (NMSupplicantInterface *supp_iface,
+                                  GCancellable *cancellable,
+                                  gpointer user_data)
+{
+	NMDeviceWifi *self;
+	NMDeviceWifiPrivate *priv;
+
+	if (g_cancellable_is_cancelled (cancellable))
+		return;
+
+	self = user_data;
+	priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
+
+	_LOGT_scan ("scan request completed (D-Bus request)");
+
+	/* we just completed a scan request, but possibly the supplicant's state is not yet toggled
+	 * to "scanning". That means, our internal scanning state "priv->scan_is_scanning" would already
+	 * flip to idle, while in a moment the supplicant would toggle the state again.
+	 *
+	 * Artificially keep the scanning state on, for another SCAN_EXTRA_DELAY_MSEC msec. */
+	nm_clear_g_source_inst (&priv->scan_request_delay_source);
+	priv->scan_request_delay_source = nm_g_source_attach (nm_g_timeout_source_new (SCAN_EXTRA_DELAY_MSEC,
+	                                                                               G_PRIORITY_DEFAULT,
+	                                                                               _scan_request_delay_cb,
+	                                                                               self,
+	                                                                               NULL),
+	                                                      NULL);
+
+	g_clear_object (&priv->scan_request_cancellable);
+	_scan_notify_is_scanning (self);
+}
+
+static gboolean
+_scan_kickoff_timeout_cb (gpointer user_data)
+{
+	NMDeviceWifi *self = user_data;
+	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
+
+	priv->scan_kickoff_timeout_id = 0;
+	_scan_kickoff (self);
+	return G_SOURCE_REMOVE;
+}
+
+static void
+_scan_kickoff (NMDeviceWifi *self)
 {
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
-	gint32 now = nm_utils_get_monotonic_timestamp_sec ();
+	gs_unref_ptrarray GPtrArray *ssids = NULL;
+	gboolean is_explict = FALSE;
+	gboolean has_hidden_profiles;
+	gint64 now_msec;
 
-	/* Cancel the pending scan if it would happen later than (now + the scan_interval_sec) */
-	if (priv->pending_scan_id) {
-		if (now + priv->scan_interval_sec < priv->scheduled_scan_time)
-			nm_clear_g_source (&priv->pending_scan_id);
+	if (priv->scan_request_cancellable) {
+		_LOGT_scan ("kickoff: don't scan (has scan_request_cancellable)");
+		/* We are currently waiting for a scan request to complete. Wait longer. */
+		return;
 	}
 
-	if (!priv->pending_scan_id) {
-		guint factor = 2;
-		guint next_scan = priv->scan_interval_sec;
+	now_msec = nm_utils_get_monotonic_timestamp_msec ();
 
-		if (    nm_device_is_activating (NM_DEVICE (self))
-		    || (nm_device_get_state (NM_DEVICE (self)) == NM_DEVICE_STATE_ACTIVATED))
-			factor = 1;
+	_scan_request_ssids_remove_all (priv, now_msec, SCAN_REQUEST_SSIDS_MAX_NUM);
 
-		priv->pending_scan_id = g_timeout_add_seconds (next_scan,
-		                                               request_wireless_scan_periodic,
-		                                               self);
+	if (now_msec < priv->scan_ratelimited_until_msec) {
+		_LOGT_scan ("kickoff: don't scan (rate limited for another %d.%03d msec%s)",
+		            (int) ((priv->scan_ratelimited_until_msec - now_msec) / 1000),
+		            (int) ((priv->scan_ratelimited_until_msec - now_msec) % 1000),
+		            !priv->scan_kickoff_timeout_id ? ", schedule timeout" : "");
+		if (   !priv->scan_kickoff_timeout_id
+		    && (   priv->scan_explicit_allowed
+		        || priv->scan_periodic_allowed)) {
+			priv->scan_kickoff_timeout_id = g_timeout_add_seconds ((priv->scan_ratelimited_until_msec - now_msec + 999) / 1000,
+			                                                       _scan_kickoff_timeout_cb,
+			                                                       self);
+		}
+		return;
+	}
 
-		priv->scheduled_scan_time = now + priv->scan_interval_sec;
-		if (backoff && (priv->scan_interval_sec < (SCAN_INTERVAL_SEC_MAX / factor))) {
-				priv->scan_interval_sec += (SCAN_INTERVAL_SEC_STEP / factor);
-				/* Ensure the scan interval will never be less than 20s... */
-				priv->scan_interval_sec = MAX(priv->scan_interval_sec, SCAN_INTERVAL_SEC_MIN + SCAN_INTERVAL_SEC_STEP);
-				/* ... or more than 120s */
-				priv->scan_interval_sec = MIN(priv->scan_interval_sec, SCAN_INTERVAL_SEC_MAX);
-		} else if (!backoff && (priv->scan_interval_sec == 0)) {
-			/* Invalid combination; would cause continual rescheduling of
-			 * the scan and hog CPU.  Reset to something minimally sane.
-			 */
-			priv->scan_interval_sec = 5;
+	if (priv->scan_explicit_requested) {
+		if (!priv->scan_explicit_allowed) {
+			_LOGT_scan ("kickoff: don't scan (explicit scan requested but not allowed)");
+			return;
+		}
+		priv->scan_explicit_requested = FALSE;
+		is_explict = TRUE;
+	} else {
+
+		if (!priv->scan_periodic_allowed) {
+			_LOGT_scan ("kickoff: don't scan (periodic scan currently not allowed)");
+			priv->scan_periodic_next_msec = 0;
+			priv->scan_periodic_interval_sec = 0;
+			nm_clear_g_source (&priv->scan_kickoff_timeout_id);
+			return;
 		}
 
-		_LOGD (LOGD_WIFI, "wifi-scan: scheduled in %d seconds (interval now %d seconds)",
-		       next_scan, priv->scan_interval_sec);
+		nm_assert (priv->scan_explicit_allowed);
+
+		if (now_msec < priv->scan_periodic_next_msec) {
+			_LOGT_scan ("kickoff: don't scan (periodic scan waiting for another %d.%03d msec%s)",
+			            (int) ((priv->scan_periodic_next_msec - now_msec) / 1000),
+			            (int) ((priv->scan_periodic_next_msec - now_msec) % 1000),
+			            !priv->scan_kickoff_timeout_id ? ", schedule timeout" : "");
+			if (!priv->scan_kickoff_timeout_id) {
+				priv->scan_kickoff_timeout_id = g_timeout_add_seconds ((priv->scan_periodic_next_msec - now_msec + 999) / 1000,
+				                                                       _scan_kickoff_timeout_cb,
+				                                                       self);
+			}
+			return;
+		}
+
+		priv->scan_periodic_interval_sec = NM_CLAMP (((int) priv->scan_periodic_interval_sec) * 3 / 2,
+		                                             SCAN_INTERVAL_SEC_MIN,
+		                                             SCAN_INTERVAL_SEC_MAX);
+		priv->scan_periodic_next_msec = now_msec + 1000 * priv->scan_periodic_interval_sec;
 	}
+
+	ssids = _scan_request_ssids_build_hidden (self, &has_hidden_profiles);
+	if (has_hidden_profiles) {
+		if (priv->hidden_probe_scan_warn) {
+			priv->hidden_probe_scan_warn = FALSE;
+			_LOGW (LOGD_WIFI, "wifi-scan: active scanning for networks due to profiles with wifi.hidden=yes. This makes you trackable");
+		}
+	} else if (!is_explict)
+		priv->hidden_probe_scan_warn = TRUE;
+
+	if (_LOGD_ENABLED (LOGD_WIFI)) {
+		gs_free char *ssids_str = NULL;
+		guint ssids_len = 0;
+
+		if (ssids) {
+			gs_strfreev char **strv = NULL;
+			guint i;
+
+			strv = g_new (char *, ssids->len + 1u);
+			for (i = 0; i < ssids->len; i++)
+				strv[i] = _nm_utils_ssid_to_string (ssids->pdata[i]);
+			strv[i] = NULL;
+
+			nm_assert (ssids->len > 0);
+			nm_assert (ssids->len == NM_PTRARRAY_LEN (strv));
+
+			ssids_str = g_strjoinv (", ", strv);
+			ssids_len = ssids->len;
+		}
+		_LOGD (LOGD_WIFI, "wifi-scan: start %s scan (%u SSIDs to probe scan%s%s%s)",
+		       is_explict ? "explicit" : "periodic",
+		       ssids_len,
+		       NM_PRINT_FMT_QUOTED (ssids_str, " [", ssids_str, "]", ""));
+	}
+
+	priv->scan_ratelimited_until_msec = now_msec + (1000 * SCAN_RATE_LIMIT_SEC);
+
+	if (is_explict)
+		_LOGT_scan ("kickoff: explicit scan (ratelimited for %d.%03d msec)",
+		            (int) ((priv->scan_ratelimited_until_msec - now_msec) / 1000),
+		            (int) ((priv->scan_ratelimited_until_msec - now_msec) % 1000));
+	else {
+		_LOGT_scan ("kickoff: periodic scan (next scan is scheduled in %d.%03d msec, ratelimited for %d.%03d msec)",
+		            (int) ((priv->scan_periodic_next_msec - now_msec) / 1000),
+		            (int) ((priv->scan_periodic_next_msec - now_msec) % 1000),
+		            (int) ((priv->scan_ratelimited_until_msec - now_msec) / 1000),
+		            (int) ((priv->scan_ratelimited_until_msec - now_msec) % 1000));
+	}
+
+	_hw_addr_set_scanning (self, FALSE);
+
+	priv->scan_request_cancellable = g_cancellable_new ();
+	nm_supplicant_interface_request_scan (priv->sup_iface,
+	                                      ssids ? (GBytes *const*) ssids->pdata : NULL,
+	                                      ssids ? ssids->len : 0u,
+	                                      priv->scan_request_cancellable,
+	                                      _scan_supplicant_request_scan_cb,
+	                                      self);
+
+	/* It's OK to call _scan_notify_is_scanning() again. They mutually call each other,
+	 * but _scan_kickoff() sets "priv->scan_request_cancellable" which will stop
+	 * them from recursing indefinitely. */
+	_scan_notify_is_scanning (self);
 }
 
 /****************************************************************************
@@ -1601,16 +1816,15 @@ ap_list_dump (gpointer user_data)
 		gint64 now_msec = nm_utils_get_monotonic_timestamp_msec ();
 		char str_buf[100];
 
-		_LOGD (LOGD_WIFI_SCAN, "APs: [now:%u.%03u, last:%s, next:%u]",
+		_LOGD (LOGD_WIFI_SCAN, "APs: [now:%u.%03u, last:%s]",
 		       (guint) (now_msec / NM_UTILS_MSEC_PER_SEC),
 		       (guint) (now_msec % NM_UTILS_MSEC_PER_SEC),
-		         priv->last_scan_msec > 0
+		         priv->scan_last_complete_msec > 0
 		       ? nm_sprintf_buf (str_buf,
 		                         "%u.%03u",
-		                         (guint) (priv->last_scan_msec / NM_UTILS_MSEC_PER_SEC),
-		                         (guint) (priv->last_scan_msec % NM_UTILS_MSEC_PER_SEC))
-		       : "-1",
-		       priv->scheduled_scan_time);
+		                         (guint) (priv->scan_last_complete_msec / NM_UTILS_MSEC_PER_SEC),
+		                         (guint) (priv->scan_last_complete_msec % NM_UTILS_MSEC_PER_SEC))
+		       : "-1");
 		c_list_for_each_entry (ap, &priv->aps_lst_head, aps_lst)
 			_ap_dump (self, LOGL_DEBUG, ap, "dump", now_msec);
 	}
@@ -2142,6 +2356,7 @@ supplicant_iface_state (NMDeviceWifi *self,
 	NMDevice *device = NM_DEVICE (self);
 	NMDeviceState devstate;
 	gboolean scanning;
+	gboolean scan_changed;
 
 	_LOGI (LOGD_DEVICE | LOGD_WIFI,
 	       "supplicant interface state: %s -> %s%s",
@@ -2162,7 +2377,8 @@ supplicant_iface_state (NMDeviceWifi *self,
 		nm_device_queue_recheck_available (NM_DEVICE (device),
 		                                   NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE,
 		                                   NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED);
-		priv->scan_interval_sec = SCAN_INTERVAL_SEC_MIN;
+		priv->scan_periodic_interval_sec = 0;
+		priv->scan_periodic_next_msec = 0;
 	}
 
 	/* In these states we know the supplicant is actually talking to something */
@@ -2229,17 +2445,19 @@ supplicant_iface_state (NMDeviceWifi *self,
 		}
 		break;
 	case NM_SUPPLICANT_INTERFACE_STATE_INACTIVE:
-		/* we would clear _requested_scan_set() and trigger a new scan.
+		/* we would clear _scan_has_pending_action_set() and trigger a new scan.
 		 * However, we don't want to cancel the current pending action, so force
 		 * a new scan request. */
-		request_wireless_scan (self, FALSE, TRUE, NULL);
 		break;
 	default:
 		break;
 	}
 
 out:
-	_notify_scanning (self);
+	scan_changed  = _scan_notify_allowed (self, NM_TERNARY_FALSE);
+	scan_changed |= _scan_notify_is_scanning (self);
+	if (scan_changed)
+		_scan_kickoff (self);
 
 	if (old_state == NM_SUPPLICANT_INTERFACE_STATE_STARTING)
 		nm_device_remove_pending_action (device, NM_PENDING_ACTION_WAITING_FOR_SUPPLICANT, TRUE);
@@ -2768,6 +2986,8 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason)
 		ap = ap_fake;
 	}
 
+	_scan_notify_allowed (self, NM_TERNARY_DEFAULT);
+
 	set_current_ap (self, ap, FALSE);
 	nm_active_connection_set_specific_object (NM_ACTIVE_CONNECTION (req),
 	                                          nm_dbus_object_get_path (NM_DBUS_OBJECT (ap)));
@@ -3107,8 +3327,8 @@ activation_success_handler (NMDevice *device)
 
 	update_seen_bssids_cache (self, priv->current_ap);
 
-	/* Reset scan interval to something reasonable */
-	priv->scan_interval_sec = SCAN_INTERVAL_SEC_MIN + (SCAN_INTERVAL_SEC_STEP * 2);
+	priv->scan_periodic_interval_sec = 0;
+	priv->scan_periodic_next_msec = 0;
 }
 
 static void
@@ -3168,9 +3388,6 @@ device_state_changed (NMDevice *device,
 		nm_platform_wifi_indicate_addressing_running (nm_device_get_platform (device), nm_device_get_ifindex (device), FALSE);
 		break;
 	case NM_DEVICE_STATE_DISCONNECTED:
-		/* Kick off a scan to get latest results */
-		priv->scan_interval_sec = SCAN_INTERVAL_SEC_MIN;
-		request_wireless_scan (self, FALSE, FALSE, NULL);
 		break;
 	default:
 		break;
@@ -3178,6 +3395,8 @@ device_state_changed (NMDevice *device,
 
 	if (clear_aps)
 		remove_all_aps (self);
+
+	_scan_notify_allowed (self, NM_TERNARY_DEFAULT);
 }
 
 static gboolean
@@ -3328,8 +3547,8 @@ get_property (GObject *object, guint prop_id,
 		break;
 	case PROP_LAST_SCAN:
 		g_value_set_int64 (value,
-		                     priv->last_scan_msec > 0
-		                   ? nm_utils_monotonic_timestamp_as_boottime (priv->last_scan_msec, NM_UTILS_NSEC_PER_MSEC)
+		                     priv->scan_last_complete_msec > 0
+		                   ? nm_utils_monotonic_timestamp_as_boottime (priv->scan_last_complete_msec, NM_UTILS_NSEC_PER_MSEC)
 		                   : (gint64) -1);
 		break;
 	default:
@@ -3365,6 +3584,7 @@ nm_device_wifi_init (NMDeviceWifi *self)
 
 	c_list_init (&priv->aps_lst_head);
 	c_list_init (&priv->scanning_prohibited_lst_head);
+	c_list_init (&priv->scan_request_ssids_lst_head);
 	priv->aps_idx_by_supplicant_path = g_hash_table_new (nm_direct_hash, NULL);
 
 	priv->hidden_probe_scan_warn = TRUE;

From c9ae23af5e1fdf85e3fc34b29440b4de1d67a2ab Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 29 Apr 2020 10:50:13 +0200
Subject: [PATCH 084/222] wifi: don't limit active scans for SSIDs to 5

As far as NMSupplicantInterface is concerned, don't clamp the
max-scan-ssids to 5. We should track the real value that wpa_supplicant
announces, and it's up to the caller to provide fewer SSIDs.

In particular, we want to limit the number of hidden SSIDs that we
accept from connection profiles, but we don't want to limit the number
of active scans via `nmcli device wifi rescan ssid $SSID [...]`.
---
 src/devices/wifi/nm-device-wifi.c        | 20 ++++++--
 src/supplicant/nm-supplicant-interface.c | 62 +++++++++++++++---------
 2 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index e145a5c5f5..b9e71d94f1 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -1533,7 +1533,9 @@ _scan_request_ssids_build_hidden (NMDeviceWifi *self,
 	gs_free NMSettingsConnection **connections = NULL;
 	gs_unref_ptrarray GPtrArray *ssids = NULL;
 	gs_unref_hashtable GHashTable *unique_ssids = NULL;
-	guint i, len;
+	guint connections_len;
+	guint n_hidden;
+	guint i;
 
 	NM_SET_OUT (out_has_hidden_profiles, FALSE);
 
@@ -1558,7 +1560,7 @@ _scan_request_ssids_build_hidden (NMDeviceWifi *self,
 	}
 
 	connections = nm_settings_get_connections_clone (nm_device_get_settings ((NMDevice *) self),
-	                                                 &len,
+	                                                 &connections_len,
 	                                                 hidden_filter_func,
 	                                                 NULL,
 	                                                 NULL,
@@ -1579,28 +1581,36 @@ _scan_request_ssids_build_hidden (NMDeviceWifi *self,
 	}
 
 	g_qsort_with_data (connections,
-	                   len,
+	                   connections_len,
 	                   sizeof (NMSettingsConnection *),
 	                   nm_settings_connection_cmp_timestamp_p_with_data,
 	                   NULL);
 
-	for (i = 0; connections[i]; i++) {
+	n_hidden = 0;
+	for (i = 0; i < connections_len; i++) {
 		NMSettingWireless *s_wifi;
 		GBytes *ssid;
 
 		if (ssids->len >= max_scan_ssids)
 			break;
 
+		if (n_hidden > 4) {
+			/* we allow at most 4 hidden profiles to be actively scanned. The
+			 * reason is speed and to not disclose too many SSIDs. */
+			break;
+		}
+
 		s_wifi = nm_connection_get_setting_wireless (nm_settings_connection_get_connection (connections[i]));
 		ssid = nm_setting_wireless_get_ssid (s_wifi);
 
 		if (!g_hash_table_add (unique_ssids, ssid))
 			continue;
 
-		NM_SET_OUT (out_has_hidden_profiles, TRUE);
 		g_ptr_array_add (ssids, g_bytes_ref (ssid));
+		n_hidden++;
 	}
 
+	NM_SET_OUT (out_has_hidden_profiles, n_hidden > 0);
 	return g_steal_pointer (&ssids);
 }
 
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index 700563624a..1c7b9a4213 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -154,6 +154,9 @@ typedef struct _NMSupplicantInterfacePrivate {
 	bool           is_ready_main:1;
 	bool           is_ready_p2p_device:1;
 
+	bool           prop_scan_active:1;
+	bool           prop_scan_ssid:1;
+
 } NMSupplicantInterfacePrivate;
 
 struct _NMSupplicantInterfaceClass {
@@ -1167,10 +1170,11 @@ static void
 parse_capabilities (NMSupplicantInterface *self, GVariant *capabilities)
 {
 	NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
-	gboolean have_active = FALSE;
-	gboolean have_ssid = FALSE;
+	const gboolean old_prop_scan_active = priv->prop_scan_active;
+	const gboolean old_prop_scan_ssid = priv->prop_scan_ssid;
+	const guint32 old_max_scan_ssids = priv->max_scan_ssids;
 	gboolean have_ft = FALSE;
-	gint32 max_scan_ssids = -1;
+	gint32 max_scan_ssids;
 	const char **array;
 
 	nm_assert (capabilities && g_variant_is_of_type (capabilities, G_VARIANT_TYPE_VARDICT));
@@ -1195,28 +1199,37 @@ parse_capabilities (NMSupplicantInterface *self, GVariant *capabilities)
 	}
 
 	if (g_variant_lookup (capabilities, "Scan", "^a&s", &array)) {
-		if (g_strv_contains (array, "active"))
-			have_active = TRUE;
-		if (g_strv_contains (array, "ssid"))
-			have_ssid = TRUE;
+		const char **a;
+
+		priv->prop_scan_active = FALSE;
+		priv->prop_scan_ssid = FALSE;
+		for (a = array; *a; a++) {
+			if (nm_streq (*a, "active"))
+				priv->prop_scan_active = TRUE;
+			else if (nm_streq (*a, "ssid"))
+				priv->prop_scan_ssid = TRUE;
+		}
 		g_free (array);
 	}
 
 	if (g_variant_lookup (capabilities, "MaxScanSSID", "i", &max_scan_ssids)) {
-		/* We need active scan and SSID probe capabilities to care about MaxScanSSIDs */
-		if (   max_scan_ssids > 0
-		    && have_active
-		    && have_ssid) {
-			/* wpa_supplicant's NM_WPAS_MAX_SCAN_SSIDS value is 16, but for speed
-			 * and to ensure we don't disclose too many SSIDs from the hidden
-			 * list, we'll limit to 5.
-			 */
-			max_scan_ssids = CLAMP (max_scan_ssids, 0, 5);
-			if (max_scan_ssids != priv->max_scan_ssids) {
-				priv->max_scan_ssids = max_scan_ssids;
-				_LOGD ("supports %d scan SSIDs", priv->max_scan_ssids);
-			}
-		}
+		const gint32 WPAS_MAX_SCAN_SSIDS = 16;
+
+		/* Even if supplicant claims that 20 SSIDs are supported, the Scan request
+		 * still only accepts WPAS_MAX_SCAN_SSIDS SSIDs. Otherwise the D-Bus
+		 * request will be rejected with "fi.w1.wpa_supplicant1.InvalidArgs"
+		 * Body: ('Did not receive correct message arguments.', 'Too many ssids specified. Specify at most four')
+		 * */
+		priv->max_scan_ssids = CLAMP (max_scan_ssids, 0, WPAS_MAX_SCAN_SSIDS);
+	}
+
+	if (   old_max_scan_ssids != priv->max_scan_ssids
+	    || old_prop_scan_active != priv->prop_scan_active
+	    || old_prop_scan_ssid != priv->prop_scan_ssid) {
+		_LOGD ("supports %u scan SSIDs (scan: %cactive %cssid)",
+		       (guint32) priv->max_scan_ssids,
+		       priv->prop_scan_active ? '+' : '-',
+		       priv->prop_scan_ssid ? '+' : '-');
 	}
 }
 
@@ -2514,9 +2527,14 @@ nm_supplicant_interface_get_ifname (NMSupplicantInterface *self)
 guint
 nm_supplicant_interface_get_max_scan_ssids (NMSupplicantInterface *self)
 {
+	NMSupplicantInterfacePrivate *priv;
+
 	g_return_val_if_fail (NM_IS_SUPPLICANT_INTERFACE (self), 0);
 
-	return NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self)->max_scan_ssids;
+	priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
+	return   priv->prop_scan_active && priv->prop_scan_ssid
+	       ? priv->max_scan_ssids
+	       : 0u;
 }
 
 /*****************************************************************************/

From 12a54a44f8f2d81ea43e765ff3dc04ad64c9eb78 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 29 Apr 2020 13:21:36 +0200
Subject: [PATCH 085/222] wifi: reduce scan rate limiting while not being
 activated

While we are not activated, there is less need to rate limit the scan
requests to 8 seconds. Only rate limit the requests for 1.5 seconds
in that case.

Also, when changing the MAC address, supplicant flushes the AP list.
We should be able to scan right away. Reset the counters for the rate
limiting and periodic scanning.
---
 src/devices/wifi/nm-device-wifi.c | 52 +++++++++++++++++++------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index b9e71d94f1..d53f59a272 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -48,8 +48,6 @@ _LOG_DECLARE_SELF(NMDeviceWifi);
 #define SCAN_INTERVAL_SEC_STEP 20
 #define SCAN_INTERVAL_SEC_MAX 120
 
-#define SCAN_RATE_LIMIT_SEC 8
-
 #define SCAN_EXTRA_DELAY_MSEC 500
 
 #define SCAN_RAND_MAC_ADDRESS_EXPIRE_SEC (5*60)
@@ -103,7 +101,7 @@ typedef struct {
 	gint64            scan_last_complete_msec;
 	gint64            scan_periodic_next_msec;
 
-	gint64            scan_ratelimited_until_msec;
+	gint64            scan_last_request_started_at_msec;
 
 	guint             scan_kickoff_timeout_id;
 
@@ -1356,8 +1354,12 @@ _hw_addr_set_scanning (NMDeviceWifi *self, gboolean do_reset)
 		/* expire the temporary MAC address used during scanning */
 		priv->hw_addr_scan_expire = 0;
 
-		if (do_reset)
+		if (do_reset) {
+			priv->scan_last_request_started_at_msec = G_MININT64;
+			priv->scan_periodic_next_msec = 0;
+			priv->scan_periodic_interval_sec = 0;
 			nm_device_hw_addr_reset (device, "scanning");
+		}
 		return;
 	}
 
@@ -1379,6 +1381,9 @@ _hw_addr_set_scanning (NMDeviceWifi *self, gboolean do_reset)
 		                                                              device,
 		                                                              NULL);
 
+		priv->scan_last_request_started_at_msec = G_MININT64;
+		priv->scan_periodic_next_msec = 0;
+		priv->scan_periodic_interval_sec = 0;
 		hw_addr_scan = nm_utils_hw_addr_gen_random_eth (nm_device_get_initial_hw_address (device),
 		                                                generate_mac_address_mask);
 		nm_device_hw_addr_set (device, hw_addr_scan, "scanning", TRUE);
@@ -1678,8 +1683,10 @@ _scan_kickoff (NMDeviceWifi *self)
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 	gs_unref_ptrarray GPtrArray *ssids = NULL;
 	gboolean is_explict = FALSE;
+	NMDeviceState device_state;
 	gboolean has_hidden_profiles;
 	gint64 now_msec;
+	gint64 ratelimit_duration_msec;
 
 	if (priv->scan_request_cancellable) {
 		_LOGT_scan ("kickoff: don't scan (has scan_request_cancellable)");
@@ -1691,17 +1698,25 @@ _scan_kickoff (NMDeviceWifi *self)
 
 	_scan_request_ssids_remove_all (priv, now_msec, SCAN_REQUEST_SSIDS_MAX_NUM);
 
-	if (now_msec < priv->scan_ratelimited_until_msec) {
-		_LOGT_scan ("kickoff: don't scan (rate limited for another %d.%03d msec%s)",
-		            (int) ((priv->scan_ratelimited_until_msec - now_msec) / 1000),
-		            (int) ((priv->scan_ratelimited_until_msec - now_msec) % 1000),
+	device_state = nm_device_get_state (NM_DEVICE (self));
+	if (   device_state > NM_DEVICE_STATE_DISCONNECTED
+	    && device_state <= NM_DEVICE_STATE_ACTIVATED) {
+		/* while we are activated, we rate limit more. */
+		ratelimit_duration_msec = 8000;
+	} else
+		ratelimit_duration_msec = 1500;
+
+	if (priv->scan_last_request_started_at_msec + ratelimit_duration_msec > now_msec) {
+		_LOGT_scan ("kickoff: don't scan (rate limited for another %d.%03d sec%s)",
+		            (int) ((priv->scan_last_request_started_at_msec + ratelimit_duration_msec - now_msec) / 1000),
+		            (int) ((priv->scan_last_request_started_at_msec + ratelimit_duration_msec - now_msec) % 1000),
 		            !priv->scan_kickoff_timeout_id ? ", schedule timeout" : "");
 		if (   !priv->scan_kickoff_timeout_id
 		    && (   priv->scan_explicit_allowed
 		        || priv->scan_periodic_allowed)) {
-			priv->scan_kickoff_timeout_id = g_timeout_add_seconds ((priv->scan_ratelimited_until_msec - now_msec + 999) / 1000,
-			                                                       _scan_kickoff_timeout_cb,
-			                                                       self);
+			priv->scan_kickoff_timeout_id = g_timeout_add (priv->scan_last_request_started_at_msec + ratelimit_duration_msec - now_msec,
+			                                               _scan_kickoff_timeout_cb,
+			                                               self);
 		}
 		return;
 	}
@@ -1726,7 +1741,7 @@ _scan_kickoff (NMDeviceWifi *self)
 		nm_assert (priv->scan_explicit_allowed);
 
 		if (now_msec < priv->scan_periodic_next_msec) {
-			_LOGT_scan ("kickoff: don't scan (periodic scan waiting for another %d.%03d msec%s)",
+			_LOGT_scan ("kickoff: don't scan (periodic scan waiting for another %d.%03d sec%s)",
 			            (int) ((priv->scan_periodic_next_msec - now_msec) / 1000),
 			            (int) ((priv->scan_periodic_next_msec - now_msec) % 1000),
 			            !priv->scan_kickoff_timeout_id ? ", schedule timeout" : "");
@@ -1778,18 +1793,14 @@ _scan_kickoff (NMDeviceWifi *self)
 		       NM_PRINT_FMT_QUOTED (ssids_str, " [", ssids_str, "]", ""));
 	}
 
-	priv->scan_ratelimited_until_msec = now_msec + (1000 * SCAN_RATE_LIMIT_SEC);
+	priv->scan_last_request_started_at_msec = now_msec;
 
 	if (is_explict)
-		_LOGT_scan ("kickoff: explicit scan (ratelimited for %d.%03d msec)",
-		            (int) ((priv->scan_ratelimited_until_msec - now_msec) / 1000),
-		            (int) ((priv->scan_ratelimited_until_msec - now_msec) % 1000));
+		_LOGT_scan ("kickoff: explicit scan starting");
 	else {
-		_LOGT_scan ("kickoff: periodic scan (next scan is scheduled in %d.%03d msec, ratelimited for %d.%03d msec)",
+		_LOGT_scan ("kickoff: periodic scan starting (next scan is scheduled in %d.%03d sec)",
 		            (int) ((priv->scan_periodic_next_msec - now_msec) / 1000),
-		            (int) ((priv->scan_periodic_next_msec - now_msec) % 1000),
-		            (int) ((priv->scan_ratelimited_until_msec - now_msec) / 1000),
-		            (int) ((priv->scan_ratelimited_until_msec - now_msec) % 1000));
+		            (int) ((priv->scan_periodic_next_msec - now_msec) % 1000));
 	}
 
 	_hw_addr_set_scanning (self, FALSE);
@@ -3597,6 +3608,7 @@ nm_device_wifi_init (NMDeviceWifi *self)
 	c_list_init (&priv->scan_request_ssids_lst_head);
 	priv->aps_idx_by_supplicant_path = g_hash_table_new (nm_direct_hash, NULL);
 
+	priv->scan_last_request_started_at_msec = G_MININT64;
 	priv->hidden_probe_scan_warn = TRUE;
 	priv->mode = NM_802_11_MODE_INFRA;
 	priv->wowlan_restore = NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE;

From 5238b8dde7633a40ec955962a636b8cc9dd2476e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 29 Apr 2020 15:55:53 +0200
Subject: [PATCH 086/222] clients: cleanup nm_vpn_get_secret_names() to use
 NM_IN_STRSET()

---
 clients/common/nm-vpn-helpers.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index 35ed445187..5c3b9fa4e7 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -137,28 +137,28 @@ nm_vpn_get_secret_names (const char *service_type)
 	if (!service_type)
 		return NULL;
 
-	if (   !g_str_has_prefix (service_type, NM_DBUS_INTERFACE)
+	if (   !NM_STR_HAS_PREFIX (service_type, NM_DBUS_INTERFACE)
 	    || service_type[NM_STRLEN (NM_DBUS_INTERFACE)] != '.') {
 		/* all our well-known, hard-coded vpn-types start with NM_DBUS_INTERFACE. */
 		return NULL;
 	}
 
 	type = service_type + (NM_STRLEN (NM_DBUS_INTERFACE) + 1);
-	if (   !g_strcmp0 (type, "pptp")
-	    || !g_strcmp0 (type, "iodine")
-	    || !g_strcmp0 (type, "ssh")
-	    || !g_strcmp0 (type, "l2tp")
-	    || !g_strcmp0 (type, "fortisslvpn"))
+	if (NM_IN_STRSET (type, "pptp",
+	                        "iodine",
+	                        "ssh",
+	                        "l2tp",
+	                        "fortisslvpn"))
 		 return generic_vpn_secrets;
-	else if (!g_strcmp0 (type, "openvpn"))
+	if (NM_IN_STRSET (type, "openvpn"))
 		return openvpn_secrets;
-	else if (!g_strcmp0 (type, "vpnc"))
+	if (NM_IN_STRSET (type, "vpnc"))
 		return vpnc_secrets;
-	else if (   !g_strcmp0 (type, "openswan")
-	         || !g_strcmp0 (type, "libreswan")
-	         || !g_strcmp0 (type, "strongswan"))
+	if (NM_IN_STRSET (type, "openswan",
+	                        "libreswan",
+	                        "strongswan"))
 		return swan_secrets;
-	else if (!g_strcmp0 (type, "openconnect"))
+	if (NM_IN_STRSET (type, "openconnect"))
 		return openconnect_secrets;
 	return NULL;
 }

From 4a3339d37c7a8dd614db03ea52237d39b65d4096 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 29 Apr 2020 16:14:09 +0200
Subject: [PATCH 087/222] clients: define VPN password list closer to where it
 is used in nm_vpn_get_secret_names()

---
 clients/common/nm-secret-agent-simple.c |  4 +-
 clients/common/nm-vpn-helpers.c         | 82 ++++++++++++++-----------
 clients/common/nm-vpn-helpers.h         |  2 +-
 3 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index ca9250ca6f..4e027584c8 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/clients/common/nm-secret-agent-simple.c
@@ -422,7 +422,7 @@ add_vpn_secrets (RequestData *request,
                  char **msg)
 {
 	NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (request->connection);
-	const VpnPasswordName *secret_names, *p;
+	const VpnPasswordName *p;
 	const char *vpn_msg = NULL;
 	char **iter;
 
@@ -439,7 +439,7 @@ add_vpn_secrets (RequestData *request,
 	NM_SET_OUT (msg, g_strdup (vpn_msg));
 
 	/* Now add what client thinks might be required, because hints may be empty or incomplete */
-	p = secret_names = nm_vpn_get_secret_names (nm_setting_vpn_get_service_type (s_vpn));
+	p = nm_vpn_get_secret_names (nm_setting_vpn_get_service_type (s_vpn));
 	while (p && p->name) {
 		add_vpn_secret_helper (secrets, s_vpn, p->name, _(p->ui_name));
 		p++;
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index 5c3b9fa4e7..a7740d0735 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -106,32 +106,6 @@ nm_vpn_supports_ipv6 (NMConnection *connection)
 const VpnPasswordName *
 nm_vpn_get_secret_names (const char *service_type)
 {
-	static const VpnPasswordName generic_vpn_secrets[] = {
-		{ "password", N_("Password") },
-		{ 0 }
-	};
-	static const VpnPasswordName openvpn_secrets[] = {
-		{ "password", N_("Password") },
-		{ "cert-pass", N_("Certificate password") },
-		{ "http-proxy-password", N_("HTTP proxy password") },
-		{ 0 }
-	};
-	static const VpnPasswordName vpnc_secrets[] = {
-		{ "Xauth password", N_("Password") },
-		{ "IPSec secret", N_("Group password") },
-		{ 0 }
-	};
-	static const VpnPasswordName swan_secrets[] = {
-		{ "xauthpassword", N_("Password") },
-		{ "pskvalue", N_("Group password") },
-		{ 0 }
-	};
-	static const VpnPasswordName openconnect_secrets[] = {
-		{ "gateway", N_("Gateway") },
-		{ "cookie", N_("Cookie") },
-		{ "gwcert", N_("Gateway certificate hash") },
-		{ 0 }
-	};
 	const char *type;
 
 	if (!service_type)
@@ -144,22 +118,58 @@ nm_vpn_get_secret_names (const char *service_type)
 	}
 
 	type = service_type + (NM_STRLEN (NM_DBUS_INTERFACE) + 1);
+
+#define _VPN_PASSWORD_LIST(...) \
+	({ \
+		static const VpnPasswordName _arr[] = { \
+			__VA_ARGS__ \
+			{ .name = NULL, .ui_name = NULL }, \
+		}; \
+		_arr; \
+	})
+
 	if (NM_IN_STRSET (type, "pptp",
 	                        "iodine",
 	                        "ssh",
 	                        "l2tp",
-	                        "fortisslvpn"))
-		 return generic_vpn_secrets;
-	if (NM_IN_STRSET (type, "openvpn"))
-		return openvpn_secrets;
-	if (NM_IN_STRSET (type, "vpnc"))
-		return vpnc_secrets;
+	                        "fortisslvpn")) {
+		return _VPN_PASSWORD_LIST (
+			{ "password", N_("Password") },
+		);
+	}
+
+	if (NM_IN_STRSET (type, "openvpn")) {
+		return _VPN_PASSWORD_LIST (
+			{ "password",            N_("Password") },
+			{ "cert-pass",           N_("Certificate password") },
+			{ "http-proxy-password", N_("HTTP proxy password") },
+		);
+	}
+
+	if (NM_IN_STRSET (type, "vpnc")) {
+		return _VPN_PASSWORD_LIST (
+			{ "Xauth password", N_("Password") },
+			{ "IPSec secret",   N_("Group password") },
+		);
+	};
+
 	if (NM_IN_STRSET (type, "openswan",
 	                        "libreswan",
-	                        "strongswan"))
-		return swan_secrets;
-	if (NM_IN_STRSET (type, "openconnect"))
-		return openconnect_secrets;
+	                        "strongswan")) {
+		return _VPN_PASSWORD_LIST (
+			{ "xauthpassword", N_("Password") },
+			{ "pskvalue",      N_("Group password") },
+		);
+	};
+
+	if (NM_IN_STRSET (type, "openconnect")) {
+		return _VPN_PASSWORD_LIST (
+			{ "gateway", N_("Gateway") },
+			{ "cookie",  N_("Cookie") },
+			{ "gwcert",  N_("Gateway certificate hash") },
+		);
+	};
+
 	return NULL;
 }
 
diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h
index 611f09dd41..dc7c0c9f69 100644
--- a/clients/common/nm-vpn-helpers.h
+++ b/clients/common/nm-vpn-helpers.h
@@ -17,7 +17,7 @@ NMVpnEditorPlugin *nm_vpn_get_editor_plugin (const char *service_type, GError **
 
 gboolean nm_vpn_supports_ipv6 (NMConnection *connection);
 
-const VpnPasswordName * nm_vpn_get_secret_names (const char *service_type);
+const VpnPasswordName *nm_vpn_get_secret_names (const char *service_type);
 
 gboolean nm_vpn_openconnect_authenticate_helper (const char *host,
                                                  char **cookie,

From 4940cfcd7ec3db3c4503f6e749b5754ae47009cb Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 29 Apr 2020 16:17:06 +0200
Subject: [PATCH 088/222] clients/trivial: rename VpnPasswordName struct to
 have NM prefix

---
 clients/common/nm-secret-agent-simple.c | 2 +-
 clients/common/nm-vpn-helpers.c         | 6 +++---
 clients/common/nm-vpn-helpers.h         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index 4e027584c8..53217e6f33 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/clients/common/nm-secret-agent-simple.c
@@ -422,7 +422,7 @@ add_vpn_secrets (RequestData *request,
                  char **msg)
 {
 	NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (request->connection);
-	const VpnPasswordName *p;
+	const NmcVpnPasswordName *p;
 	const char *vpn_msg = NULL;
 	char **iter;
 
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index a7740d0735..fbcb06479d 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -103,7 +103,7 @@ nm_vpn_supports_ipv6 (NMConnection *connection)
 	return NM_FLAGS_HAS (capabilities, NM_VPN_EDITOR_PLUGIN_CAPABILITY_IPV6);
 }
 
-const VpnPasswordName *
+const NmcVpnPasswordName *
 nm_vpn_get_secret_names (const char *service_type)
 {
 	const char *type;
@@ -121,9 +121,9 @@ nm_vpn_get_secret_names (const char *service_type)
 
 #define _VPN_PASSWORD_LIST(...) \
 	({ \
-		static const VpnPasswordName _arr[] = { \
+		static const NmcVpnPasswordName _arr[] = { \
 			__VA_ARGS__ \
-			{ .name = NULL, .ui_name = NULL }, \
+			{ 0 }, \
 		}; \
 		_arr; \
 	})
diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h
index dc7c0c9f69..f401c6341d 100644
--- a/clients/common/nm-vpn-helpers.h
+++ b/clients/common/nm-vpn-helpers.h
@@ -9,7 +9,7 @@
 typedef struct {
 	const char *name;
 	const char *ui_name;
-} VpnPasswordName;
+} NmcVpnPasswordName;
 
 GSList *nm_vpn_get_plugin_infos (void);
 
@@ -17,7 +17,7 @@ NMVpnEditorPlugin *nm_vpn_get_editor_plugin (const char *service_type, GError **
 
 gboolean nm_vpn_supports_ipv6 (NMConnection *connection);
 
-const VpnPasswordName *nm_vpn_get_secret_names (const char *service_type);
+const NmcVpnPasswordName *nm_vpn_get_secret_names (const char *service_type);
 
 gboolean nm_vpn_openconnect_authenticate_helper (const char *host,
                                                  char **cookie,

From a2deb0da5ef9b1d9313b068c7e4cc340419aaa65 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 29 Apr 2020 21:14:29 +0200
Subject: [PATCH 089/222] wifi: fix crash during dispose of NMDeviceWifi

Backtrace:

  #0  0x00007f520eeb2002 g_logv (libglib-2.0.so.0 + 0x5a002)
  #1  0x00007f520eeb2273 g_log (libglib-2.0.so.0 + 0x5a273)
  #2  0x000056026929b25a nm_supplicant_interface_get_max_scan_ssids (NetworkManager + 0x27e25a)
  #3  0x00007f520c238bb1 _scan_request_ssids_build_hidden (libnm-device-plugin-wifi.so + 0x15bb1)
  #4  0x00007f520c23a2d5 _scan_notify_is_scanning (libnm-device-plugin-wifi.so + 0x172d5)
  #5  0x00007f520c2433d3 dispose (libnm-device-plugin-wifi.so + 0x203d3)
  #6  0x00007f520efa3c78 g_object_unref (libgobject-2.0.so.0 + 0x18c78)
  #7  0x00005602690ada1a remove_device (NetworkManager + 0x90a1a)
  #8  0x00005602690be428 nm_manager_stop (NetworkManager + 0xa1428)
  #9  0x0000560269064adb main (NetworkManager + 0x47adb)
  #10 0x00007f520ec70042 __libc_start_main (libc.so.6 + 0x27042)
  #11 0x0000560269064efe _start (NetworkManager + 0x47efe)

Fixes: e07fc217ecd7 ('wifi: rework scanning of Wi-Fi device')
---
 src/devices/wifi/nm-device-wifi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index d53f59a272..320058475e 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -1534,7 +1534,7 @@ _scan_request_ssids_build_hidden (NMDeviceWifi *self,
                                   gboolean *out_has_hidden_profiles)
 {
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
-	guint max_scan_ssids = nm_supplicant_interface_get_max_scan_ssids (priv->sup_iface);
+	guint max_scan_ssids = priv->sup_iface ? nm_supplicant_interface_get_max_scan_ssids (priv->sup_iface) : 0u;
 	gs_free NMSettingsConnection **connections = NULL;
 	gs_unref_ptrarray GPtrArray *ssids = NULL;
 	gs_unref_hashtable GHashTable *unique_ssids = NULL;

From 2794f3cff87028bbbfae6b5107b2d70b345a26bd Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 30 Apr 2020 09:52:17 +0200
Subject: [PATCH 090/222] wifi: really fix crash during dispose of NMDeviceWifi

The right fix is to return from _scan_kickoff() right away.

Backtrace:

  #0  0x00007f520eeb2002 g_logv (libglib-2.0.so.0 + 0x5a002)
  #1  0x00007f520eeb2273 g_log (libglib-2.0.so.0 + 0x5a273)
  #2  0x000056026929b25a nm_supplicant_interface_get_max_scan_ssids (NetworkManager + 0x27e25a)
  #3  0x00007f520c238bb1 _scan_request_ssids_build_hidden (libnm-device-plugin-wifi.so + 0x15bb1)
  #4  0x00007f520c23a2d5 _scan_notify_is_scanning (libnm-device-plugin-wifi.so + 0x172d5)
  #5  0x00007f520c2433d3 dispose (libnm-device-plugin-wifi.so + 0x203d3)
  #6  0x00007f520efa3c78 g_object_unref (libgobject-2.0.so.0 + 0x18c78)
  #7  0x00005602690ada1a remove_device (NetworkManager + 0x90a1a)
  #8  0x00005602690be428 nm_manager_stop (NetworkManager + 0xa1428)
  #9  0x0000560269064adb main (NetworkManager + 0x47adb)
  #10 0x00007f520ec70042 __libc_start_main (libc.so.6 + 0x27042)
  #11 0x0000560269064efe _start (NetworkManager + 0x47efe)

Fixes: e07fc217ecd7 ('wifi: rework scanning of Wi-Fi device')
Fixes: a2deb0da5ef9 ('wifi: fix crash during dispose of NMDeviceWifi')
---
 src/devices/wifi/nm-device-wifi.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 320058475e..bd5bdd9e7b 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -1534,7 +1534,7 @@ _scan_request_ssids_build_hidden (NMDeviceWifi *self,
                                   gboolean *out_has_hidden_profiles)
 {
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
-	guint max_scan_ssids = priv->sup_iface ? nm_supplicant_interface_get_max_scan_ssids (priv->sup_iface) : 0u;
+	guint max_scan_ssids = nm_supplicant_interface_get_max_scan_ssids (priv->sup_iface);
 	gs_free NMSettingsConnection **connections = NULL;
 	gs_unref_ptrarray GPtrArray *ssids = NULL;
 	gs_unref_hashtable GHashTable *unique_ssids = NULL;
@@ -1688,6 +1688,11 @@ _scan_kickoff (NMDeviceWifi *self)
 	gint64 now_msec;
 	gint64 ratelimit_duration_msec;
 
+	if (!priv->sup_iface) {
+		_LOGT_scan ("kickoff: don't scan (has no supplicant interface)");
+		return;
+	}
+
 	if (priv->scan_request_cancellable) {
 		_LOGT_scan ("kickoff: don't scan (has scan_request_cancellable)");
 		/* We are currently waiting for a scan request to complete. Wait longer. */

From 8fb22411833fb2fbe1e0365a6e69e93d6db3c0ad Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 30 Apr 2020 10:03:05 +0200
Subject: [PATCH 091/222] wifi: fix trimming list of tracked ssids to scan

Fixes: e07fc217ecd7 ('wifi: rework scanning of Wi-Fi device')
---
 src/devices/wifi/nm-device-wifi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index bd5bdd9e7b..6d00e300bf 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -246,7 +246,7 @@ _scan_request_ssids_remove_all (NMDeviceWifiPrivate *priv,
 		cutoff_time_msec = cutoff_with_now_msec - SCAN_REQUEST_SSIDS_MAX_AGE_MSEC;
 		while ((srs_data = c_list_last_entry (&priv->scan_request_ssids_lst_head, ScanRequestSsidData, lst))) {
 			if (srs_data->timestamp_msec > cutoff_time_msec)
-				return;
+				break;
 			_scan_request_ssids_remove (priv, srs_data, NULL);
 		}
 	}

From a0e115cb44cdc4bd7dc0e3c32ccb2d4bb6478d2e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 30 Apr 2020 09:54:23 +0200
Subject: [PATCH 092/222] wifi: pass now_msec to _scan_request_ssids_fetch()

We make decisions based on the timestamp. We should only fetch the timestamp
once, and make consistent decisions about that. Don't read different timestamps.
---
 src/devices/wifi/nm-device-wifi.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 6d00e300bf..af12f6b223 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -269,13 +269,13 @@ _scan_request_ssids_remove_all (NMDeviceWifiPrivate *priv,
 }
 
 static GPtrArray *
-_scan_request_ssids_fetch (NMDeviceWifiPrivate *priv)
+_scan_request_ssids_fetch (NMDeviceWifiPrivate *priv, gint64 now_msec)
 {
 	ScanRequestSsidData *srs_data;
 	GPtrArray *ssids;
 	guint len;
 
-	_scan_request_ssids_remove_all (priv, nm_utils_get_monotonic_timestamp_msec (), SCAN_REQUEST_SSIDS_MAX_NUM);
+	_scan_request_ssids_remove_all (priv, now_msec, SCAN_REQUEST_SSIDS_MAX_NUM);
 
 	len = nm_g_hash_table_size (priv->scan_request_ssids_hash);
 	nm_assert (len == c_list_length (&priv->scan_request_ssids_lst_head));
@@ -1531,6 +1531,7 @@ hidden_filter_func (NMSettings *settings,
 
 static GPtrArray *
 _scan_request_ssids_build_hidden (NMDeviceWifi *self,
+                                  gint64 now_msec,
                                   gboolean *out_has_hidden_profiles)
 {
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
@@ -1545,7 +1546,7 @@ _scan_request_ssids_build_hidden (NMDeviceWifi *self,
 	NM_SET_OUT (out_has_hidden_profiles, FALSE);
 
 	/* collect all pending explicit SSIDs. */
-	ssids = _scan_request_ssids_fetch (priv);
+	ssids = _scan_request_ssids_fetch (priv, now_msec);
 
 	if (max_scan_ssids == 0) {
 		/* no space. @ssids will be ignored. */
@@ -1764,7 +1765,7 @@ _scan_kickoff (NMDeviceWifi *self)
 		priv->scan_periodic_next_msec = now_msec + 1000 * priv->scan_periodic_interval_sec;
 	}
 
-	ssids = _scan_request_ssids_build_hidden (self, &has_hidden_profiles);
+	ssids = _scan_request_ssids_build_hidden (self, now_msec, &has_hidden_profiles);
 	if (has_hidden_profiles) {
 		if (priv->hidden_probe_scan_warn) {
 			priv->hidden_probe_scan_warn = FALSE;

From 3af9209d47bbae7954da9dd5dabe6154fdb9b3c2 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 30 Apr 2020 09:59:04 +0200
Subject: [PATCH 093/222] wifi: don't unnecessarily trim tracked ssid list

Only _scan_request_ssids_track() adds elements to the list, and that already
trims the list to a maxium length. In all other cases, we never expect a need
to trim the list.
---
 src/devices/wifi/nm-device-wifi.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index af12f6b223..5a4672d05a 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -262,10 +262,10 @@ _scan_request_ssids_remove_all (NMDeviceWifiPrivate *priv,
 			d = c_list_last_entry (&priv->scan_request_ssids_lst_head, ScanRequestSsidData, lst);
 			_scan_request_ssids_remove (priv, d, NULL);
 		}
-		nm_assert (i == nm_g_hash_table_size (priv->scan_request_ssids_hash));
-		nm_assert (i == c_list_length (&priv->scan_request_ssids_lst_head));
-		nm_assert (i <= cutoff_at_len);
 	}
+
+	nm_assert (nm_g_hash_table_size (priv->scan_request_ssids_hash) <= SCAN_REQUEST_SSIDS_MAX_NUM);
+	nm_assert (nm_g_hash_table_size (priv->scan_request_ssids_hash) == c_list_length (&priv->scan_request_ssids_lst_head));
 }
 
 static GPtrArray *
@@ -275,11 +275,9 @@ _scan_request_ssids_fetch (NMDeviceWifiPrivate *priv, gint64 now_msec)
 	GPtrArray *ssids;
 	guint len;
 
-	_scan_request_ssids_remove_all (priv, now_msec, SCAN_REQUEST_SSIDS_MAX_NUM);
+	_scan_request_ssids_remove_all (priv, now_msec, G_MAXUINT);
 
 	len = nm_g_hash_table_size (priv->scan_request_ssids_hash);
-	nm_assert (len == c_list_length (&priv->scan_request_ssids_lst_head));
-
 	if (len == 0)
 		return NULL;
 
@@ -1702,7 +1700,7 @@ _scan_kickoff (NMDeviceWifi *self)
 
 	now_msec = nm_utils_get_monotonic_timestamp_msec ();
 
-	_scan_request_ssids_remove_all (priv, now_msec, SCAN_REQUEST_SSIDS_MAX_NUM);
+	_scan_request_ssids_remove_all (priv, now_msec, G_MAXUINT);
 
 	device_state = nm_device_get_state (NM_DEVICE (self));
 	if (   device_state > NM_DEVICE_STATE_DISCONNECTED

From d9740d108d5a06bade9703abdadd010647e47c9e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 30 Apr 2020 10:11:44 +0200
Subject: [PATCH 094/222] wifi: clear scan_request_ssids_hash if not needed

It is very uncommon that a user provides explicit SSIDs to scan.
So, most of the time there is nothing to do here.
---
 src/devices/wifi/nm-device-wifi.c | 47 ++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 5a4672d05a..f5b62989df 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -214,21 +214,22 @@ typedef struct {
 } ScanRequestSsidData;
 
 static void
-_scan_request_ssids_remove (NMDeviceWifiPrivate *priv,
-                            ScanRequestSsidData *srs_data,
-                            GBytes **out_ssid)
+_scan_request_ssids_remove (ScanRequestSsidData *srs_data)
 {
-	nm_assert (priv->scan_request_ssids_hash);
-	nm_assert (g_hash_table_lookup (priv->scan_request_ssids_hash, srs_data) == srs_data);
+	c_list_unlink_stale (&srs_data->lst);
+	g_bytes_unref (srs_data->ssid);
+	nm_g_slice_free (srs_data);
+}
 
+static void
+_scan_request_ssids_remove_with_hash (NMDeviceWifiPrivate *priv,
+                                      ScanRequestSsidData *srs_data)
+{
+	nm_assert (srs_data);
+	nm_assert (nm_g_hash_table_lookup (priv->scan_request_ssids_hash, srs_data) == srs_data);
 	if (!g_hash_table_remove (priv->scan_request_ssids_hash, srs_data))
 		nm_assert_not_reached ();
-	c_list_unlink_stale (&srs_data->lst);
-	if (out_ssid)
-		*out_ssid = srs_data->ssid;
-	else
-		g_bytes_unref (srs_data->ssid);
-	nm_g_slice_free (srs_data);
+	_scan_request_ssids_remove (srs_data);
 }
 
 static void
@@ -238,6 +239,17 @@ _scan_request_ssids_remove_all (NMDeviceWifiPrivate *priv,
 {
 	ScanRequestSsidData *srs_data;
 
+	nm_assert ((!priv->scan_request_ssids_hash) == c_list_is_empty (&priv->scan_request_ssids_lst_head));
+	if (!priv->scan_request_ssids_hash)
+		return;
+
+	if (cutoff_at_len == 0) {
+		nm_clear_pointer (&priv->scan_request_ssids_hash, g_hash_table_destroy);
+		while ((srs_data = c_list_first_entry (&priv->scan_request_ssids_lst_head, ScanRequestSsidData, lst)))
+			_scan_request_ssids_remove (srs_data);
+		return;
+	}
+
 	if (cutoff_with_now_msec != 0) {
 		gint64 cutoff_time_msec;
 
@@ -247,7 +259,7 @@ _scan_request_ssids_remove_all (NMDeviceWifiPrivate *priv,
 		while ((srs_data = c_list_last_entry (&priv->scan_request_ssids_lst_head, ScanRequestSsidData, lst))) {
 			if (srs_data->timestamp_msec > cutoff_time_msec)
 				break;
-			_scan_request_ssids_remove (priv, srs_data, NULL);
+			_scan_request_ssids_remove_with_hash (priv, srs_data);
 		}
 	}
 
@@ -260,12 +272,14 @@ _scan_request_ssids_remove_all (NMDeviceWifiPrivate *priv,
 			ScanRequestSsidData *d;
 
 			d = c_list_last_entry (&priv->scan_request_ssids_lst_head, ScanRequestSsidData, lst);
-			_scan_request_ssids_remove (priv, d, NULL);
+			_scan_request_ssids_remove_with_hash (priv, d);
 		}
 	}
 
 	nm_assert (nm_g_hash_table_size (priv->scan_request_ssids_hash) <= SCAN_REQUEST_SSIDS_MAX_NUM);
 	nm_assert (nm_g_hash_table_size (priv->scan_request_ssids_hash) == c_list_length (&priv->scan_request_ssids_lst_head));
+	if (c_list_is_empty (&priv->scan_request_ssids_lst_head))
+		nm_clear_pointer (&priv->scan_request_ssids_hash, g_hash_table_destroy);
 }
 
 static GPtrArray *
@@ -282,11 +296,10 @@ _scan_request_ssids_fetch (NMDeviceWifiPrivate *priv, gint64 now_msec)
 		return NULL;
 
 	ssids = g_ptr_array_new_full (len, (GDestroyNotify) g_bytes_unref);
+	nm_clear_pointer (&priv->scan_request_ssids_hash, g_hash_table_destroy);
 	while ((srs_data = c_list_first_entry (&priv->scan_request_ssids_lst_head, ScanRequestSsidData, lst))) {
-		GBytes *ssid;
-
-		_scan_request_ssids_remove (priv, srs_data, &ssid);
-		g_ptr_array_add (ssids, ssid);
+		g_ptr_array_add (ssids, g_steal_pointer (&srs_data->ssid));
+		_scan_request_ssids_remove (srs_data);
 	}
 	return ssids;
 }

From ed32651ab88c322124aafac2cd623add6e29255d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 30 Apr 2020 11:11:45 +0200
Subject: [PATCH 095/222] dhcp: cleanup build_signal_parameters() in
 nm-dhcp-helper

Also, silently ignore all environment variables with a name that
is not valid UTF-8. We would hit an assertion trying to put that
in a GVariant (or sending it via D-Bus).
---
 src/dhcp/nm-dhcp-helper.c | 43 +++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/dhcp/nm-dhcp-helper.c b/src/dhcp/nm-dhcp-helper.c
index 365e32e384..071d331b2d 100644
--- a/src/dhcp/nm-dhcp-helper.c
+++ b/src/dhcp/nm-dhcp-helper.c
@@ -46,33 +46,46 @@
 
 /*****************************************************************************/
 
-static const char * ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL};
-
 static GVariant *
 build_signal_parameters (void)
 {
-	char **item;
+	const char *const*environ_iter;
 	GVariantBuilder builder;
 
 	g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
 
 	/* List environment and format for dbus dict */
-	for (item = environ; *item; item++) {
-		char *name, *val, **p;
+	for (environ_iter = (const char *const*) environ; *environ_iter; environ_iter++) {
+		static const char *const ignore_with_prefix_list[] = {
+			"PATH",
+			"SHLVL",
+			"_",
+			"PWD",
+			"dhc_dbus",
+			NULL
+		};
+		const char *item = *environ_iter;
+		gs_free char *name = NULL;
+		const char *val;
+		const char *const*p;
 
-		/* Split on the = */
-		name = g_strdup (*item);
-		val = strchr (name, '=');
-		if (!val || val == name)
-			goto next;
-		*val++ = '\0';
+		val = strchr (item, '=');
+		if (   !val
+		    || item == val)
+			continue;
 
-		/* Ignore non-DCHP-related environment variables */
-		for (p = (char **) ignore; *p; p++) {
+		name = g_strndup (item, val - item);
+		val += 1;
+
+		/* Ignore non-DHCP-related environment variables */
+		for (p = ignore_with_prefix_list; *p; p++) {
 			if (strncmp (name, *p, strlen (*p)) == 0)
 				goto next;
 		}
 
+		if (!g_utf8_validate (name, -1, NULL))
+			continue;
+
 		/* Value passed as a byte array rather than a string, because there are
 		 * no character encoding guarantees with DHCP, and D-Bus requires
 		 * strings to be UTF-8.
@@ -85,8 +98,8 @@ build_signal_parameters (void)
 		                       g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
 		                                                  val, strlen (val), 1));
 
-	next:
-		g_free (name);
+next:
+		;
 	}
 
 	return g_variant_ref_sink (g_variant_new ("(a{sv})", &builder));

From a05dbeb31fca7f2f804583112fd432148c3f737e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 30 Apr 2020 11:44:06 +0200
Subject: [PATCH 096/222] bus-manager/dhcp: don't log pointer values directly

Direct pointer values can be used to circumvent ASLR. Obfuscate
the pointer values.
---
 src/nm-dbus-manager.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c
index 239e06e11a..9849656ddd 100644
--- a/src/nm-dbus-manager.c
+++ b/src/nm-dbus-manager.c
@@ -247,7 +247,9 @@ private_server_closed_connection (GDBusConnection *conn,
 	CloseConnectionInfo *info;
 
 	/* Clean up after the connection */
-	_LOGD ("(%s) closed connection %p on private socket", s->tag, conn);
+	_LOGD ("(%s) closed connection "NM_HASH_OBFUSCATE_PTR_FMT" on private socket",
+	       s->tag,
+	       NM_HASH_OBFUSCATE_PTR (conn));
 
 	info = g_slice_new0 (CloseConnectionInfo);
 	info->connection = conn;
@@ -285,7 +287,9 @@ private_server_new_connection (GDBusServer *server,
 	obj_mgr_data->fake_sender = sender;
 	c_list_link_tail (&s->object_mgr_lst_head, &obj_mgr_data->object_mgr_lst);
 
-	_LOGD ("(%s) accepted connection %p on private socket", s->tag, conn);
+	_LOGD ("(%s) accepted connection "NM_HASH_OBFUSCATE_PTR_FMT" on private socket",
+	       s->tag,
+	       NM_HASH_OBFUSCATE_PTR (conn));
 
 	/* Emit this for the manager.
 	 *

From 7151575920c27cfe70cccedcdf77b2bf88612525 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 28 Apr 2020 16:53:01 +0200
Subject: [PATCH 097/222] keyfile: don't declare keyfile getters/setter
 functions with macro

In general, I like macros. But in this case it seems the make the code harder
to understand than it needs to be. There are repeated patterns in these declarations,
but I feel they are better recognizible by aligning the lines nicely.
---
 shared/nm-keyfile/nm-keyfile-utils.h | 59 ++++++++++------------------
 1 file changed, 20 insertions(+), 39 deletions(-)

diff --git a/shared/nm-keyfile/nm-keyfile-utils.h b/shared/nm-keyfile/nm-keyfile-utils.h
index a351262e7b..98b0129a59 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.h
+++ b/shared/nm-keyfile/nm-keyfile-utils.h
@@ -19,44 +19,25 @@ const char *nm_keyfile_plugin_get_setting_name_for_alias (const char *alias);
 
 /*****************************************************************************/
 
-/* List helpers */
-#define DEFINE_KF_LIST_WRAPPER_PROTO(stype, get_ctype, set_ctype) \
-get_ctype nm_keyfile_plugin_kf_get_##stype##_list (GKeyFile *kf, \
-                                                   const char *group, \
-                                                   const char *key, \
-                                                   gsize *out_length, \
-                                                   GError **error); \
-\
-void nm_keyfile_plugin_kf_set_##stype##_list  (GKeyFile *kf, \
-                                               const char *group, \
-                                               const char *key, \
-                                               set_ctype list[], \
-                                               gsize length);
-DEFINE_KF_LIST_WRAPPER_PROTO(integer, int*, int)
-DEFINE_KF_LIST_WRAPPER_PROTO(string, char**, const char* const)
-
 void nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf,
                                                   const char *group,
                                                   const char *key,
                                                   const guint8 *list,
                                                   gsize length);
 
-/* Single-value helpers */
-#define DEFINE_KF_WRAPPER_PROTO(stype, get_ctype, set_ctype) \
-get_ctype nm_keyfile_plugin_kf_get_##stype (GKeyFile *kf, \
-                                            const char *group, \
-                                            const char *key, \
-                                            GError **error); \
-\
-void nm_keyfile_plugin_kf_set_##stype (GKeyFile *kf, \
-                                       const char *group, \
-                                       const char *key, \
-                                       set_ctype value);
-DEFINE_KF_WRAPPER_PROTO(string, char*, const char*)
-DEFINE_KF_WRAPPER_PROTO(boolean, gboolean, gboolean)
-DEFINE_KF_WRAPPER_PROTO(value, char*, const char*)
+int     *nm_keyfile_plugin_kf_get_integer_list (GKeyFile *kf, const char *group, const char *key, gsize *out_length, GError **error);
+char   **nm_keyfile_plugin_kf_get_string_list  (GKeyFile *kf, const char *group, const char *key, gsize *out_length, GError **error);
+char    *nm_keyfile_plugin_kf_get_string       (GKeyFile *kf, const char *group, const char *key, GError **error);
+gboolean nm_keyfile_plugin_kf_get_boolean      (GKeyFile *kf, const char *group, const char *key, GError **error);
+char    *nm_keyfile_plugin_kf_get_value        (GKeyFile *kf, const char *group, const char *key, GError **error);
+
+void nm_keyfile_plugin_kf_set_integer_list (GKeyFile *kf, const char *group, const char *key, int              *list, gsize length);
+void nm_keyfile_plugin_kf_set_string_list  (GKeyFile *kf, const char *group, const char *key, const char *const*list, gsize length);
+
+void nm_keyfile_plugin_kf_set_string       (GKeyFile *kf, const char *group, const char *key, const char *value);
+void nm_keyfile_plugin_kf_set_boolean      (GKeyFile *kf, const char *group, const char *key, gboolean    value);
+void nm_keyfile_plugin_kf_set_value        (GKeyFile *kf, const char *group, const char *key, const char *value);
 
-/* Misc */
 gint64 nm_keyfile_plugin_kf_get_int64 (GKeyFile *kf,
                                        const char *group,
                                        const char *key,
@@ -66,15 +47,15 @@ gint64 nm_keyfile_plugin_kf_get_int64 (GKeyFile *kf,
                                        gint64 fallback,
                                        GError **error);
 
-char ** nm_keyfile_plugin_kf_get_keys    (GKeyFile *kf,
-                                           const char *group,
-                                           gsize *out_length,
-                                           GError **error);
+char **nm_keyfile_plugin_kf_get_keys (GKeyFile *kf,
+                                      const char *group,
+                                      gsize *out_length,
+                                      GError **error);
 
-gboolean nm_keyfile_plugin_kf_has_key     (GKeyFile *kf,
-                                           const char *group,
-                                           const char *key,
-                                           GError **error);
+gboolean nm_keyfile_plugin_kf_has_key (GKeyFile *kf,
+                                       const char *group,
+                                       const char *key,
+                                       GError **error);
 
 const char *nm_keyfile_key_encode (const char *name,
                                    char **out_to_free);

From c5d1d4c498c50dfc7d2d18b213a117dd1199f1de Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 29 Apr 2020 18:18:28 +0200
Subject: [PATCH 098/222] n-dhcp4: don't fail dispatch in case of receive
 errors

Currently any error encountered in n_dhcp4_c_connection_dispatch_io()
causes a dispatch failure and interrupts the library state
machine. The recvmsg() on the socket can fail for different reasons;
one of these is for example that the UDP request previously sent got a
ICMP port-unreachable response. This can be reproduced in the
following way:

 ip netns add ns1
 ip link add veth0 type veth peer name veth1
 ip link set veth1 netns ns1
 ip link set veth0 up

 cat > dhcpd.conf <<EOF
 server-identifier 172.25.0.1;
 max-lease-time 120;
 default-lease-time 120;
 subnet 172.25.0.0 netmask 255.255.255.0 {
        range 172.25.0.100 172.25.0.200;
 }
 EOF

 ip -n ns1 link set veth1 up
 ip -n ns1 address add dev veth1 172.25.0.1/24
 ip netns exec ns1 iptables -A INPUT -p udp --dport 67 -j REJECT
 ip netns exec ns1 dhcpd -4 -cf dhcpd.conf -pf /tmp/dhcp-server.pid

If a client is started on veth0, it is able to obtain a lease despite
the firewall rule blocking DHCP, because dhcpd uses a packet
socket. Then it fails during the renewal because the recvmsg() fails:

 dhcp4 (veth0): send REQUEST of 172.25.0.178 to 172.25.0.1
 dhcp4 (veth0): error -111 dispatching events
 dhcp4 (veth0): state changed bound -> fail

The client should consider such errors non fatal and keep running.

https://bugzilla.redhat.com/show_bug.cgi?id=1829178
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/486
---
 shared/n-dhcp4/src/n-dhcp4-c-connection.c | 29 ++++++++++++++++-------
 shared/n-dhcp4/src/n-dhcp4-c-probe.c      |  1 +
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/shared/n-dhcp4/src/n-dhcp4-c-connection.c b/shared/n-dhcp4/src/n-dhcp4-c-connection.c
index a5c8ea66fe..30514e286d 100644
--- a/shared/n-dhcp4/src/n-dhcp4-c-connection.c
+++ b/shared/n-dhcp4/src/n-dhcp4-c-connection.c
@@ -1136,6 +1136,13 @@ int n_dhcp4_c_connection_dispatch_timer(NDhcp4CConnection *connection,
         return 0;
 }
 
+/*
+ * Returns:
+ *  0                     on success
+ *  N_DHCP4_E_MALFORMED   if a malformed packet was received
+ *  N_DHCP4_E_UNEXPECTED  if the packet received contains unexpected data
+ *  N_DHCP4_E_AGAIN       if there was another error (non fatal for the client)
+ */
 int n_dhcp4_c_connection_dispatch_io(NDhcp4CConnection *connection,
                                      NDhcp4Incoming **messagep) {
         _c_cleanup_(n_dhcp4_incoming_freep) NDhcp4Incoming *message = NULL;
@@ -1150,10 +1157,11 @@ int n_dhcp4_c_connection_dispatch_io(NDhcp4CConnection *connection,
                                                  connection->scratch_buffer,
                                                  sizeof(connection->scratch_buffer),
                                                  &message);
-                if (r)
+                if (!r)
+                        break;
+                else if (r == N_DHCP4_E_MALFORMED)
                         return r;
-
-                break;
+                return N_DHCP4_E_AGAIN;
         case N_DHCP4_C_CONNECTION_STATE_DRAINING:
                 r = n_dhcp4_c_socket_packet_recv(connection->fd_packet,
                                                  connection->scratch_buffer,
@@ -1161,8 +1169,10 @@ int n_dhcp4_c_connection_dispatch_io(NDhcp4CConnection *connection,
                                                  &message);
                 if (!r)
                         break;
-                else if (r != N_DHCP4_E_AGAIN)
+                else if (r == N_DHCP4_E_MALFORMED)
                         return r;
+                else if (r != N_DHCP4_E_AGAIN)
+                        return N_DHCP4_E_AGAIN;
 
                 /*
                  * The UDP socket is open and the packet socket has been shut down
@@ -1180,18 +1190,21 @@ int n_dhcp4_c_connection_dispatch_io(NDhcp4CConnection *connection,
                                               connection->scratch_buffer,
                                               sizeof(connection->scratch_buffer),
                                               &message);
-                if (r)
+                if (!r)
+                        break;
+                else if (r == N_DHCP4_E_MALFORMED)
                         return r;
-
-                break;
+                return N_DHCP4_E_AGAIN;
         default:
                 abort();
                 return -ENOTRECOVERABLE;
         }
 
         r = n_dhcp4_c_connection_verify_incoming(connection, message, &type);
-        if (r)
+        if (r == N_DHCP4_E_MALFORMED || r == N_DHCP4_E_UNEXPECTED)
                 return r;
+        else if (r != 0)
+                return N_DHCP4_E_AGAIN;
 
         if (type == N_DHCP4_MESSAGE_OFFER || type == N_DHCP4_MESSAGE_ACK) {
                 n_dhcp4_c_log(connection->client_config, LOG_INFO,
diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
index e4477a7c74..5e97129834 100644
--- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c
+++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
@@ -1242,6 +1242,7 @@ int n_dhcp4_client_probe_dispatch_io(NDhcp4ClientProbe *probe, uint32_t events)
                         return 0;
                 }
 
+                abort();
                 return r;
         }
 

From e468b48ab7b8e2ddc8802db4b93e3f13787835e4 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 28 Apr 2020 22:12:21 +0200
Subject: [PATCH 099/222] nm-online: allow configuring timeout via
 NM_ONLINE_TIMEOUT environment

https://bugzilla.redhat.com/show_bug.cgi?id=1828458

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/484
---
 Makefile.am                                |  7 +++++--
 clients/nm-online.c                        |  4 +++-
 data/NetworkManager-wait-online.service.in | 20 +++++++++++++++++++-
 man/nm-online.xml                          |  3 ++-
 po/POTFILES.skip                           |  1 +
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2f15ddbd81..6cb709b8d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4285,9 +4285,12 @@ clients_nm_online_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
 
 clients_nm_online_LDADD = \
-	shared/nm-libnm-aux/libnm-libnm-aux.la \
 	libnm/libnm.la \
-	$(GLIB_LIBS)
+	shared/nm-libnm-aux/libnm-libnm-aux.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 $(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(clients_nm_online_OBJECTS): $(libnm_lib_h_pub_mkenums)
diff --git a/clients/nm-online.c b/clients/nm-online.c
index 5950da568c..8370f96437 100644
--- a/clients/nm-online.c
+++ b/clients/nm-online.c
@@ -233,7 +233,7 @@ main (int argc, char *argv[])
 	OnlineData data = {
 		.retval = EXIT_FAILURE_UNSPECIFIED,
 	};
-	int t_secs = 30;
+	int t_secs;
 	GOptionContext *opt_ctx = NULL;
 	gboolean success;
 	GOptionEntry options[] = {
@@ -251,6 +251,8 @@ main (int argc, char *argv[])
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
+	t_secs = _nm_utils_ascii_str_to_int64 (g_getenv ("NM_ONLINE_TIMEOUT"), 10, 0, G_MAXINT, 30);
+
 	data.start_timestamp_ms = _now_ms ();
 
 	opt_ctx = g_option_context_new (NULL);
diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in
index 8963246850..26a8f25362 100644
--- a/data/NetworkManager-wait-online.service.in
+++ b/data/NetworkManager-wait-online.service.in
@@ -6,9 +6,27 @@ After=NetworkManager.service
 Before=network-online.target
 
 [Service]
+# `nm-online -s` waits until the point when NetworkManager logs
+# "startup complete". That is when startup actions are settled and
+# devices and profiles reached a conclusive activated or deactivated
+# state. It depends on which profiles are configured to autoconnect and
+# also depends on profile settings like ipv4.may-fail/ipv6.may-fail,
+# which affect when a profile is considered fully activated.
+# Check NetworkManager logs to find out why wait-online takes a certain
+# time.
+
 Type=oneshot
-ExecStart=@bindir@/nm-online -s -q --timeout=30
+ExecStart=@bindir@/nm-online -s -q
 RemainAfterExit=yes
 
+# Set $NM_ONLINE_TIMEOUT variable for timeout in seconds.
+# Edit with `systemctl edit NetworkManager-wait-online`.
+#
+# Note, this timeout should commonly not be reached. If your boot
+# gets delayed too long, then the solution is usually not to decrease
+# the timeout, but to fix your setup so that the connected state
+# gets reached earlier.
+Environment=NM_ONLINE_TIMEOUT=30
+
 [Install]
 WantedBy=network-online.target
diff --git a/man/nm-online.xml b/man/nm-online.xml
index c36dda8dd8..a0db6b3d88 100644
--- a/man/nm-online.xml
+++ b/man/nm-online.xml
@@ -145,7 +145,8 @@
 
         <listitem>
           <para>Time to wait for a connection, in seconds. If the option is not provided,
-          the default timeout is 30 seconds.</para>
+          the environment variable <literal>NM_ONLINE_TIMEOUT</literal> is honored.
+          The default timeout is 30 seconds.</para>
         </listitem>
       </varlistentry>
 
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index da2247a0a0..425b100e5c 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,5 +1,6 @@
 clients/cloud-setup/nm-cloud-setup.service.in
 contrib/fedora/rpm/
+data/NetworkManager-wait-online.service.in
 data/NetworkManager.service.in
 data/org.freedesktop.NetworkManager.policy.in
 examples/python/NetworkManager.py

From 0b168f7b995e0eac681a985e69f0f036c8db15c4 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 29 Apr 2020 09:47:06 +0200
Subject: [PATCH 100/222] dispatcher: clarify documentation about first
 argument to dispatcher scripts for "connectivity-change"

The manual page claimed that for "connectivitiy-change" actions, the dispatcher
scripts would get as first argument (the device name) "none". That was not done,
only for "hostname" actions.

For consistency, maybe that should be adjusted to also pass "none" for connectivity
change events. However, "none" is really an odd value, if there is no device. Passing
an empty word is IMO nicer. So stick to that behavior, despite being inconsistent.
Also fix the documentation about that.
---
 dispatcher/nm-dispatcher.c | 6 +++++-
 man/NetworkManager.xml     | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c
index 27647c1b64..55656cf7b5 100644
--- a/dispatcher/nm-dispatcher.c
+++ b/dispatcher/nm-dispatcher.c
@@ -491,8 +491,12 @@ script_dispatch (ScriptInfo *script)
 
 	script->dispatched = TRUE;
 
+	/* Only for "hostname" action we coerce the interface name to "none". We don't
+	 * do so for "connectivity-check" action. */
+
 	argv[0] = script->script;
-	argv[1] = request->iface ?: (!strcmp(request->action, NMD_ACTION_HOSTNAME) ? "none" : "");
+	argv[1] =    request->iface
+	          ?: (nm_streq (request->action, NMD_ACTION_HOSTNAME) ? "none" : "");
 	argv[2] = request->action;
 	argv[3] = NULL;
 
diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml
index 2a13671b06..a04fec8eba 100644
--- a/man/NetworkManager.xml
+++ b/man/NetworkManager.xml
@@ -80,8 +80,8 @@
       device an operation just happened on, and second the action. For device actions,
       the interface is the name of the kernel interface suitable for IP configuration.
       Thus it is either VPN_IP_IFACE, DEVICE_IP_IFACE, or DEVICE_IFACE, as applicable.
-      For the <varname>hostname</varname> and <varname>connectivity-change</varname>
-      actions it is always "none".
+      For the <varname>hostname</varname> action the device name is always <literal>"none"</literal>
+      and for <varname>connectivity-change</varname> it is empty.
     </para>
     <para>The actions are:</para>
     <variablelist class="dispatcher-options">

From 259a07ae4646695d145fa739e843334986b0ce98 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 29 Apr 2020 09:48:52 +0200
Subject: [PATCH 101/222] dispatcher: minor cleanup error paths in
 script_dispatch()

Handle the error case first and return early.
---
 dispatcher/nm-dispatcher.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c
index 55656cf7b5..e1737d85ff 100644
--- a/dispatcher/nm-dispatcher.c
+++ b/dispatcher/nm-dispatcher.c
@@ -482,7 +482,7 @@ check_filename (const char *file_name)
 static gboolean
 script_dispatch (ScriptInfo *script)
 {
-	GError *error = NULL;
+	gs_free_error GError *error = NULL;
 	char *argv[4];
 	Request *request = script->request;
 
@@ -502,20 +502,19 @@ script_dispatch (ScriptInfo *script)
 
 	_LOG_S_T (script, "run script%s", script->wait ? "" : " (no-wait)");
 
-	if (g_spawn_async ("/", argv, request->envp, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &script->pid, &error)) {
-		script->watch_id = g_child_watch_add (script->pid, (GChildWatchFunc) script_watch_cb, script);
-		script->timeout_id = g_timeout_add_seconds (SCRIPT_TIMEOUT, script_timeout_cb, script);
-		if (!script->wait)
-			request->num_scripts_nowait++;
-		return TRUE;
-	} else {
+	if (!g_spawn_async ("/", argv, request->envp, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &script->pid, &error)) {
 		_LOG_S_W (script, "complete: failed to execute script: %s", error->message);
 		script->result = DISPATCH_RESULT_EXEC_FAILED;
 		script->error = g_strdup (error->message);
 		request->num_scripts_done++;
-		g_clear_error (&error);
 		return FALSE;
 	}
+
+	script->watch_id = g_child_watch_add (script->pid, (GChildWatchFunc) script_watch_cb, script);
+	script->timeout_id = g_timeout_add_seconds (SCRIPT_TIMEOUT, script_timeout_cb, script);
+	if (!script->wait)
+		request->num_scripts_nowait++;
+	return TRUE;
 }
 
 static gboolean

From 69798fa6cd841c54915fdbee048ccd5765313a9b Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sat, 2 May 2020 22:39:53 +0200
Subject: [PATCH 102/222] nm-online: fix build of nm-online for missing
 libcsiphash.la

Fixes: e468b48ab7b8 ('nm-online: allow configuring timeout via NM_ONLINE_TIMEOUT environment')
---
 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index 6cb709b8d5..35564aa5c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4289,6 +4289,7 @@ clients_nm_online_LDADD = \
 	shared/nm-libnm-aux/libnm-libnm-aux.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 

From d4615e73ed54ca90db666e4c846635a3e8292994 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 3 May 2020 11:01:31 +0200
Subject: [PATCH 103/222] libnm: avoid compiler warning about uninitalized
 variable in nm_setting_bridge_port_remove_vlan_by_vid()

With LTO, compiler warns:

    libnm-core/nm-setting-bridge-port.c: In function nm_setting_bridge_port_remove_vlan_by_vid:
    libnm-core/nm-setting-bridge-port.c:252:6: error: v_start may be used uninitialized in this function [-Werror=maybe-uninitialized]
      252 |   if (v_start == vid_start && v_end == vid_end) {
          |      ^
    libnm-core/nm-setting-bridge-port.c:239:10: note: v_start was declared here
      239 |  guint16 v_start, v_end;
          |          ^
    libnm-core/nm-setting-bridge-port.c:252:28: error: v_end may be used uninitialized in this function [-Werror=maybe-uninitialized]
      252 |   if (v_start == vid_start && v_end == vid_end) {
          |                            ^
    libnm-core/nm-setting-bridge-port.c:239:19: note: v_end was declared here
      239 |  guint16 v_start, v_end;
          |                   ^

Avoid the (false positive) warning.
---
 libnm-core/nm-setting-bridge-port.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c
index 5fcf1e6027..72f37af572 100644
--- a/libnm-core/nm-setting-bridge-port.c
+++ b/libnm-core/nm-setting-bridge-port.c
@@ -236,18 +236,20 @@ nm_setting_bridge_port_remove_vlan_by_vid (NMSettingBridgePort *setting,
                                            guint16 vid_end)
 {
 	NMSettingBridgePortPrivate *priv;
-	guint16 v_start, v_end;
-	NMBridgeVlan *vlan;
 	guint i;
 
 	if (vid_end == 0)
 		vid_end = vid_start;
 
 	g_return_val_if_fail (NM_IS_SETTING_BRIDGE_PORT (setting), FALSE);
+
 	priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
 
 	for (i = 0; i < priv->vlans->len; i++) {
-		vlan = (NMBridgeVlan *) priv->vlans->pdata[i];
+		NMBridgeVlan *vlan = priv->vlans->pdata[i];
+		guint16 v_start = 0;
+		guint16 v_end = 0;
+
 		nm_bridge_vlan_get_vid_range (vlan, &v_start, &v_end);
 		if (v_start == vid_start && v_end == vid_end) {
 			g_ptr_array_remove_index (priv->vlans, i);

From 867964d7e0fd3efb40bf2ac7f644c82ac997a73e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 28 Apr 2020 16:39:09 +0200
Subject: [PATCH 104/222] keyfile: refactor defining keyfile getter/setter
 functions

Split the macros to define the setter and getter so that setters
and getters are defined by separate macros. This will be used
to define the boolean getter differently, but still using the
macro to define the setter.

Also, don't construct function names in the macro. Instead, pass
the full names as argument to the macro. This helps with the problem
where ctags/cscope is unable to locate the implementation of the
function. Since we define the function with macro, the tools still
don't recognize this as the location of the definition. But at least
when showing all occurrences of the name, it can be found.
---
 shared/nm-keyfile/nm-keyfile-utils.c | 52 +++++++++++++++-------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/shared/nm-keyfile/nm-keyfile-utils.c b/shared/nm-keyfile/nm-keyfile-utils.c
index 041b5eab11..a0965f8481 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.c
+++ b/shared/nm-keyfile/nm-keyfile-utils.c
@@ -172,46 +172,50 @@ nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf,
 	nm_keyfile_plugin_kf_set_value (kf, group, key, value);
 }
 
-/* Single value helpers */
-#define DEFINE_KF_WRAPPER(stype, get_ctype, set_ctype) \
+#define DEFINE_KF_WRAPPER_GET(fcn_name, get_ctype, key_file_get_fcn) \
 get_ctype \
-nm_keyfile_plugin_kf_get_##stype (GKeyFile *kf, \
-                                  const char *group, \
-                                  const char *key, \
-                                  GError **error) \
+fcn_name (GKeyFile *kf, \
+          const char *group, \
+          const char *key, \
+          GError **error) \
 { \
 	get_ctype val; \
 	const char *alias; \
 	GError *local = NULL; \
- \
-	val = g_key_file_get_##stype (kf, group, key, &local); \
+\
+	val = key_file_get_fcn (kf, group, key, &local); \
 	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) { \
 		alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
 		if (alias) { \
 			g_clear_error (&local); \
-			val = g_key_file_get_##stype (kf, alias, key, &local); \
+			val = key_file_get_fcn (kf, alias, key, &local); \
 		} \
 	} \
 	if (local) \
 		g_propagate_error (error, local); \
 	return val; \
-} \
- \
-void \
-nm_keyfile_plugin_kf_set_##stype (GKeyFile *kf, \
-                                  const char *group, \
-                                  const char *key, \
-                                  set_ctype value) \
-{ \
-	const char *alias; \
- \
-	alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
-	g_key_file_set_##stype (kf, alias ?: group, key, value); \
 }
 
-DEFINE_KF_WRAPPER(string, char*, const char*);
-DEFINE_KF_WRAPPER(boolean, gboolean, gboolean);
-DEFINE_KF_WRAPPER(value, char*, const char*);
+DEFINE_KF_WRAPPER_GET (nm_keyfile_plugin_kf_get_string,  char *,   g_key_file_get_string);
+DEFINE_KF_WRAPPER_GET (nm_keyfile_plugin_kf_get_boolean, gboolean, g_key_file_get_boolean);
+DEFINE_KF_WRAPPER_GET (nm_keyfile_plugin_kf_get_value,   char *,   g_key_file_get_value);
+
+#define DEFINE_KF_WRAPPER_SET(fcn_name, set_ctype, key_file_set_fcn) \
+void \
+fcn_name (GKeyFile *kf, \
+          const char *group, \
+          const char *key, \
+          set_ctype value) \
+{ \
+	const char *alias; \
+\
+	alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
+	key_file_set_fcn (kf, alias ?: group, key, value); \
+}
+
+DEFINE_KF_WRAPPER_SET (nm_keyfile_plugin_kf_set_string,  const char *, g_key_file_set_string);
+DEFINE_KF_WRAPPER_SET (nm_keyfile_plugin_kf_set_boolean, gboolean,     g_key_file_set_boolean);
+DEFINE_KF_WRAPPER_SET (nm_keyfile_plugin_kf_set_value,   const char *, g_key_file_set_value);
 
 gint64
 nm_keyfile_plugin_kf_get_int64 (GKeyFile *kf,

From ff84211cf69b52c6afcd8bd176e529a92c3ea65f Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 28 Apr 2020 16:39:09 +0200
Subject: [PATCH 105/222] keyfile: refactor defining keyfile list getter/setter
 functions

---
 shared/nm-keyfile/nm-keyfile-utils.c | 53 +++++++++++++++-------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/shared/nm-keyfile/nm-keyfile-utils.c b/shared/nm-keyfile/nm-keyfile-utils.c
index a0965f8481..6356f8c444 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.c
+++ b/shared/nm-keyfile/nm-keyfile-utils.c
@@ -102,26 +102,25 @@ nm_keyfile_plugin_get_setting_name_for_alias (const char *alias)
 
 /*****************************************************************************/
 
-/* List helpers */
-#define DEFINE_KF_LIST_WRAPPER(stype, get_ctype, set_ctype) \
+#define DEFINE_KF_LIST_WRAPPER_GET(fcn_name, get_ctype, key_file_get_fcn) \
 get_ctype \
-nm_keyfile_plugin_kf_get_##stype##_list (GKeyFile *kf, \
-                                         const char *group, \
-                                         const char *key, \
-                                         gsize *out_length, \
-                                         GError **error) \
+fcn_name (GKeyFile *kf, \
+          const char *group, \
+          const char *key, \
+          gsize *out_length, \
+          GError **error) \
 { \
 	get_ctype list; \
 	const char *alias; \
 	GError *local = NULL; \
 	gsize l; \
- \
-	list = g_key_file_get_##stype##_list (kf, group, key, &l, &local); \
+\
+	list = key_file_get_fcn (kf, group, key, &l, &local); \
 	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) { \
 		alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
 		if (alias) { \
 			g_clear_error (&local); \
-			list = g_key_file_get_##stype##_list (kf, alias, key, &l, &local); \
+			list = key_file_get_fcn (kf, alias, key, &l, &local); \
 		} \
 	} \
 	if (local) \
@@ -130,23 +129,27 @@ nm_keyfile_plugin_kf_get_##stype##_list (GKeyFile *kf, \
 		l = 0; \
 	NM_SET_OUT (out_length, l); \
 	return list; \
-} \
- \
-void \
-nm_keyfile_plugin_kf_set_##stype##_list (GKeyFile *kf, \
-                                         const char *group, \
-                                         const char *key, \
-                                         set_ctype list[], \
-                                         gsize length) \
-{ \
-	const char *alias; \
- \
-	alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
-	g_key_file_set_##stype##_list (kf, alias ?: group, key, list, length); \
 }
 
-DEFINE_KF_LIST_WRAPPER(integer, int*, int);
-DEFINE_KF_LIST_WRAPPER(string, char **, const char* const);
+DEFINE_KF_LIST_WRAPPER_GET (nm_keyfile_plugin_kf_get_integer_list, int *,   g_key_file_get_integer_list);
+DEFINE_KF_LIST_WRAPPER_GET (nm_keyfile_plugin_kf_get_string_list,  char **, g_key_file_get_string_list);
+
+#define DEFINE_KF_LIST_WRAPPER_SET(fcn_name, set_ctype, key_file_set_fcn) \
+void \
+fcn_name (GKeyFile *kf, \
+          const char *group, \
+          const char *key, \
+          set_ctype list, \
+          gsize length) \
+{ \
+	const char *alias; \
+\
+	alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
+	key_file_set_fcn (kf, alias ?: group, key, list, length); \
+}
+
+DEFINE_KF_LIST_WRAPPER_SET (nm_keyfile_plugin_kf_set_integer_list, int *,             g_key_file_set_integer_list);
+DEFINE_KF_LIST_WRAPPER_SET (nm_keyfile_plugin_kf_set_string_list,  const char*const*, g_key_file_set_string_list);
 
 void
 nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf,

From 42aea87d51c09219950c626ddd9a835725886f4d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 28 Apr 2020 17:29:37 +0200
Subject: [PATCH 106/222] keyfile: use NMStrBuf in
 nm_keyfile_plugin_kf_set_integer_list_uint8()

Previously, we were preallocating a string buffer of fixed size. For guint8
we reserved 3 characters per number, which is sufficient. However, it is
not obviously sufficient. NMStrBuf would grow as needed.

Next, I will add nm_keyfile_plugin_kf_set_integer_list_uint(), where it
is more unclear how large the string can be at most. To avoid that question
from the start, it will use NMStrBuf. To keep the implementations similar,
use NMStrBuf also in this case.
---
 shared/nm-keyfile/nm-keyfile-utils.c | 13 ++++++-------
 shared/nm-keyfile/nm-keyfile-utils.h | 11 +++--------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/shared/nm-keyfile/nm-keyfile-utils.c b/shared/nm-keyfile/nm-keyfile-utils.c
index 6356f8c444..627f529978 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.c
+++ b/shared/nm-keyfile/nm-keyfile-utils.c
@@ -9,6 +9,8 @@
 
 #include <stdlib.h>
 
+#include "nm-glib-aux/nm-str-buf.h"
+
 #include "nm-keyfile-internal.h"
 #include "nm-setting-wired.h"
 #include "nm-setting-wireless.h"
@@ -158,21 +160,18 @@ nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf,
                                              const guint8 *data,
                                              gsize length)
 {
+	nm_auto_str_buf NMStrBuf strbuf = { };
 	gsize i;
-	gsize l = length * 4 + 2;
-	gs_free char *value = g_malloc (l);
-	char *s = value;
 
 	g_return_if_fail (kf);
 	g_return_if_fail (!length || data);
 	g_return_if_fail (group && group[0]);
 	g_return_if_fail (key && key[0]);
 
-	value[0] = '\0';
+	nm_str_buf_init (&strbuf, length * 4u + 2u, FALSE);
 	for (i = 0; i < length; i++)
-		nm_utils_strbuf_append (&s, &l, "%d;", (int) data[i]);
-	nm_assert (l > 0);
-	nm_keyfile_plugin_kf_set_value (kf, group, key, value);
+		nm_str_buf_append_printf (&strbuf, "%u;", (guint) data[i]);
+	nm_keyfile_plugin_kf_set_value (kf, group, key, nm_str_buf_get_str (&strbuf));
 }
 
 #define DEFINE_KF_WRAPPER_GET(fcn_name, get_ctype, key_file_get_fcn) \
diff --git a/shared/nm-keyfile/nm-keyfile-utils.h b/shared/nm-keyfile/nm-keyfile-utils.h
index 98b0129a59..719c32c2fc 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.h
+++ b/shared/nm-keyfile/nm-keyfile-utils.h
@@ -19,20 +19,15 @@ const char *nm_keyfile_plugin_get_setting_name_for_alias (const char *alias);
 
 /*****************************************************************************/
 
-void nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf,
-                                                  const char *group,
-                                                  const char *key,
-                                                  const guint8 *list,
-                                                  gsize length);
-
 int     *nm_keyfile_plugin_kf_get_integer_list (GKeyFile *kf, const char *group, const char *key, gsize *out_length, GError **error);
 char   **nm_keyfile_plugin_kf_get_string_list  (GKeyFile *kf, const char *group, const char *key, gsize *out_length, GError **error);
 char    *nm_keyfile_plugin_kf_get_string       (GKeyFile *kf, const char *group, const char *key, GError **error);
 gboolean nm_keyfile_plugin_kf_get_boolean      (GKeyFile *kf, const char *group, const char *key, GError **error);
 char    *nm_keyfile_plugin_kf_get_value        (GKeyFile *kf, const char *group, const char *key, GError **error);
 
-void nm_keyfile_plugin_kf_set_integer_list (GKeyFile *kf, const char *group, const char *key, int              *list, gsize length);
-void nm_keyfile_plugin_kf_set_string_list  (GKeyFile *kf, const char *group, const char *key, const char *const*list, gsize length);
+void nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf, const char *group, const char *key, const guint8     *list, gsize length);
+void nm_keyfile_plugin_kf_set_integer_list       (GKeyFile *kf, const char *group, const char *key, int              *list, gsize length);
+void nm_keyfile_plugin_kf_set_string_list        (GKeyFile *kf, const char *group, const char *key, const char *const*list, gsize length);
 
 void nm_keyfile_plugin_kf_set_string       (GKeyFile *kf, const char *group, const char *key, const char *value);
 void nm_keyfile_plugin_kf_set_boolean      (GKeyFile *kf, const char *group, const char *key, gboolean    value);

From 93285a465fc9caae665974d57fce9b9d80d86ad6 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 28 Apr 2020 17:31:33 +0200
Subject: [PATCH 107/222] keyfile: refactor writing of G_TYPE_ARRAY list of
 unsigned integers

Keyfile handles GObject properties of type G_TYPE_ARRAY as a GArray
of unsigned ints. That is correct, because all our properties of this
GType happen to be of this kind.

However, then the function was using nm_keyfile_plugin_kf_set_integer_list(),
which only can handle signed integers. There was thus an assertion that all
integers were non-negative. Which, probably was also correct, because NMSettingDcb
would validate that all values of such kind are in fact positive. Anyway, that
is an unexpected limitation (if not a bug).

Fix that by handling the array as unsigned list of integers.

Also, since glib doesn't provide an API for storing lists of unsigend
integers, we have to implement our own. but that is no loss. We probably
do it better anyway.
---
 shared/nm-keyfile/nm-keyfile-utils.c | 22 +++++++++++++++++++++-
 shared/nm-keyfile/nm-keyfile-utils.h |  2 +-
 shared/nm-keyfile/nm-keyfile.c       | 24 +++++++++---------------
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/shared/nm-keyfile/nm-keyfile-utils.c b/shared/nm-keyfile/nm-keyfile-utils.c
index 627f529978..751ff23e4b 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.c
+++ b/shared/nm-keyfile/nm-keyfile-utils.c
@@ -150,9 +150,29 @@ fcn_name (GKeyFile *kf, \
 	key_file_set_fcn (kf, alias ?: group, key, list, length); \
 }
 
-DEFINE_KF_LIST_WRAPPER_SET (nm_keyfile_plugin_kf_set_integer_list, int *,             g_key_file_set_integer_list);
 DEFINE_KF_LIST_WRAPPER_SET (nm_keyfile_plugin_kf_set_string_list,  const char*const*, g_key_file_set_string_list);
 
+void
+nm_keyfile_plugin_kf_set_integer_list_uint (GKeyFile *kf,
+                                            const char *group,
+                                            const char *key,
+                                            const guint *data,
+                                            gsize length)
+{
+	nm_auto_str_buf NMStrBuf strbuf = { };
+	gsize i;
+
+	g_return_if_fail (kf);
+	g_return_if_fail (!length || data);
+	g_return_if_fail (group && group[0]);
+	g_return_if_fail (key && key[0]);
+
+	nm_str_buf_init (&strbuf, length * 4u + 2u, FALSE);
+	for (i = 0; i < length; i++)
+		nm_str_buf_append_printf (&strbuf, "%u;", data[i]);
+	nm_keyfile_plugin_kf_set_value (kf, group, key, nm_str_buf_get_str (&strbuf));
+}
+
 void
 nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf,
                                              const char *group,
diff --git a/shared/nm-keyfile/nm-keyfile-utils.h b/shared/nm-keyfile/nm-keyfile-utils.h
index 719c32c2fc..ab9f44dc7f 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.h
+++ b/shared/nm-keyfile/nm-keyfile-utils.h
@@ -26,7 +26,7 @@ gboolean nm_keyfile_plugin_kf_get_boolean      (GKeyFile *kf, const char *group,
 char    *nm_keyfile_plugin_kf_get_value        (GKeyFile *kf, const char *group, const char *key, GError **error);
 
 void nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf, const char *group, const char *key, const guint8     *list, gsize length);
-void nm_keyfile_plugin_kf_set_integer_list       (GKeyFile *kf, const char *group, const char *key, int              *list, gsize length);
+void nm_keyfile_plugin_kf_set_integer_list_uint  (GKeyFile *kf, const char *group, const char *key, const guint      *list, gsize length);
 void nm_keyfile_plugin_kf_set_string_list        (GKeyFile *kf, const char *group, const char *key, const char *const*list, gsize length);
 
 void nm_keyfile_plugin_kf_set_string       (GKeyFile *kf, const char *group, const char *key, const char *value);
diff --git a/shared/nm-keyfile/nm-keyfile.c b/shared/nm-keyfile/nm-keyfile.c
index 879b1b004f..474377bfcf 100644
--- a/shared/nm-keyfile/nm-keyfile.c
+++ b/shared/nm-keyfile/nm-keyfile.c
@@ -1851,25 +1851,19 @@ write_array_of_uint (GKeyFile *file,
                      const GValue *value)
 {
 	GArray *array;
-	guint i;
-	gs_free int *tmp_array = NULL;
 
-	array = (GArray *) g_value_get_boxed (value);
+	array = g_value_get_boxed (value);
+
+	nm_assert (!array || g_array_get_element_size (array) == sizeof (guint));
+
 	if (!array || !array->len)
 		return;
 
-	g_return_if_fail (g_array_get_element_size (array) == sizeof (guint));
-
-	tmp_array = g_new (int, array->len);
-	for (i = 0; i < array->len; i++) {
-		guint v = g_array_index (array, guint, i);
-
-		if (v > G_MAXINT)
-			g_return_if_reached ();
-		tmp_array[i] = (int) v;
-	}
-
-	nm_keyfile_plugin_kf_set_integer_list (file, nm_setting_get_name (setting), key, tmp_array, array->len);
+	nm_keyfile_plugin_kf_set_integer_list_uint (file,
+	                                            nm_setting_get_name (setting),
+	                                            key,
+	                                            (const guint *) array->data,
+	                                            array->len);
 }
 
 static void

From bbdb47adaf3b8c5ea2706421fd7ae744a714087a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 28 Apr 2020 17:44:50 +0200
Subject: [PATCH 108/222] keyfile: implement
 nm_keyfile_plugin_kf_set_string_list() directly without macro

There is only one user of the macro left. Drop it.
---
 shared/nm-keyfile/nm-keyfile-utils.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/shared/nm-keyfile/nm-keyfile-utils.c b/shared/nm-keyfile/nm-keyfile-utils.c
index 751ff23e4b..8ba7613b69 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.c
+++ b/shared/nm-keyfile/nm-keyfile-utils.c
@@ -136,21 +136,18 @@ fcn_name (GKeyFile *kf, \
 DEFINE_KF_LIST_WRAPPER_GET (nm_keyfile_plugin_kf_get_integer_list, int *,   g_key_file_get_integer_list);
 DEFINE_KF_LIST_WRAPPER_GET (nm_keyfile_plugin_kf_get_string_list,  char **, g_key_file_get_string_list);
 
-#define DEFINE_KF_LIST_WRAPPER_SET(fcn_name, set_ctype, key_file_set_fcn) \
-void \
-fcn_name (GKeyFile *kf, \
-          const char *group, \
-          const char *key, \
-          set_ctype list, \
-          gsize length) \
-{ \
-	const char *alias; \
-\
-	alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
-	key_file_set_fcn (kf, alias ?: group, key, list, length); \
-}
+void
+nm_keyfile_plugin_kf_set_string_list (GKeyFile *kf,
+                                      const char *group,
+                                      const char *key,
+                                      const char *const*list,
+                                      gsize length)
+{
+	const char *alias;
 
-DEFINE_KF_LIST_WRAPPER_SET (nm_keyfile_plugin_kf_set_string_list,  const char*const*, g_key_file_set_string_list);
+	alias = nm_keyfile_plugin_get_alias_for_setting_name (group);
+	g_key_file_set_string_list (kf, alias ?: group, key, list, length);
+}
 
 void
 nm_keyfile_plugin_kf_set_integer_list_uint (GKeyFile *kf,

From dade5055fb4d859d69d6f3ec07eff3d0ce27b208 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 28 Apr 2020 18:10:55 +0200
Subject: [PATCH 109/222] keyfile: add
 nm_keyfile_plugin_kf_get_integer_list_uint() to parse a list of integers

We had three callers of nm_keyfile_plugin_kf_get_integer_list(). Two
only wanted to read values in range of guint8. One, wanted to read
unsigned integers (for which nm_keyfile_plugin_kf_get_integer_list()
was not suitable).

Instead, implement a integer list reader ourself.

One change is that g_key_file_get_integer_list() would accept list elements
with a number followed by a white space and garbage ([1]). We don't do that,
so there is a change in behavior here. That seems preferable, we don't
want to accept garbage.

The error reason text from the reader now also changes, and obviously we
no longer fail for integer values larger than G_MAXINT.

[1] https://gitlab.gnome.org/GNOME/glib/-/blob/c9bf247eb90805cc7a0020db20b8808ed42fe61c/glib/gkeyfile.c#L4445
---
 shared/nm-keyfile/nm-keyfile-utils.c | 48 +++++++++++++++++++++++++++-
 shared/nm-keyfile/nm-keyfile-utils.h | 10 +++---
 shared/nm-keyfile/nm-keyfile.c       | 33 ++++++++-----------
 3 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/shared/nm-keyfile/nm-keyfile-utils.c b/shared/nm-keyfile/nm-keyfile-utils.c
index 8ba7613b69..c28af81541 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.c
+++ b/shared/nm-keyfile/nm-keyfile-utils.c
@@ -133,9 +133,55 @@ fcn_name (GKeyFile *kf, \
 	return list; \
 }
 
-DEFINE_KF_LIST_WRAPPER_GET (nm_keyfile_plugin_kf_get_integer_list, int *,   g_key_file_get_integer_list);
 DEFINE_KF_LIST_WRAPPER_GET (nm_keyfile_plugin_kf_get_string_list,  char **, g_key_file_get_string_list);
 
+guint *
+nm_keyfile_plugin_kf_get_integer_list_uint (GKeyFile *key_file,
+                                            const char *group_name,
+                                            const char *key,
+                                            gsize *out_length,
+                                            GError **error)
+{
+	GError *key_file_error = NULL;
+	gs_strfreev char **values = NULL;
+	gs_free guint *int_values = NULL;
+	gsize i, num_ints;
+
+	g_return_val_if_fail (key_file != NULL, NULL);
+	g_return_val_if_fail (group_name != NULL, NULL);
+	g_return_val_if_fail (key != NULL, NULL);
+
+	NM_SET_OUT (out_length, 0);
+
+	values = nm_keyfile_plugin_kf_get_string_list (key_file, group_name, key, &num_ints, &key_file_error);
+
+	if (key_file_error)
+		g_propagate_error (error, key_file_error);
+	if (!values)
+		return NULL;
+
+	int_values = g_new (guint, num_ints);
+
+	for (i = 0; i < num_ints; i++) {
+		gint64 v;
+
+		G_STATIC_ASSERT_EXPR (sizeof (v) > sizeof (guint));
+		v = _nm_utils_ascii_str_to_int64 (values[i], 10, 0, G_MAXUINT, -1);
+		if (v == -1) {
+			g_set_error (error,
+			             G_KEY_FILE_ERROR,
+			             G_KEY_FILE_ERROR_INVALID_VALUE,
+			             _("Value cannot be interpreted as a list of numbers."));
+			return NULL;
+		}
+
+		int_values[i] = v;
+	}
+
+	NM_SET_OUT (out_length, num_ints);
+	return g_steal_pointer (&int_values);
+}
+
 void
 nm_keyfile_plugin_kf_set_string_list (GKeyFile *kf,
                                       const char *group,
diff --git a/shared/nm-keyfile/nm-keyfile-utils.h b/shared/nm-keyfile/nm-keyfile-utils.h
index ab9f44dc7f..9b35e17ed6 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.h
+++ b/shared/nm-keyfile/nm-keyfile-utils.h
@@ -19,11 +19,11 @@ const char *nm_keyfile_plugin_get_setting_name_for_alias (const char *alias);
 
 /*****************************************************************************/
 
-int     *nm_keyfile_plugin_kf_get_integer_list (GKeyFile *kf, const char *group, const char *key, gsize *out_length, GError **error);
-char   **nm_keyfile_plugin_kf_get_string_list  (GKeyFile *kf, const char *group, const char *key, gsize *out_length, GError **error);
-char    *nm_keyfile_plugin_kf_get_string       (GKeyFile *kf, const char *group, const char *key, GError **error);
-gboolean nm_keyfile_plugin_kf_get_boolean      (GKeyFile *kf, const char *group, const char *key, GError **error);
-char    *nm_keyfile_plugin_kf_get_value        (GKeyFile *kf, const char *group, const char *key, GError **error);
+guint   *nm_keyfile_plugin_kf_get_integer_list_uint (GKeyFile *kf, const char *group, const char *key, gsize *out_length, GError **error);
+char   **nm_keyfile_plugin_kf_get_string_list       (GKeyFile *kf, const char *group, const char *key, gsize *out_length, GError **error);
+char    *nm_keyfile_plugin_kf_get_string            (GKeyFile *kf, const char *group, const char *key, GError **error);
+gboolean nm_keyfile_plugin_kf_get_boolean           (GKeyFile *kf, const char *group, const char *key, GError **error);
+char    *nm_keyfile_plugin_kf_get_value             (GKeyFile *kf, const char *group, const char *key, GError **error);
 
 void nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf, const char *group, const char *key, const guint8     *list, gsize length);
 void nm_keyfile_plugin_kf_set_integer_list_uint  (GKeyFile *kf, const char *group, const char *key, const guint      *list, gsize length);
diff --git a/shared/nm-keyfile/nm-keyfile.c b/shared/nm-keyfile/nm-keyfile.c
index 474377bfcf..c98fbdf2bb 100644
--- a/shared/nm-keyfile/nm-keyfile.c
+++ b/shared/nm-keyfile/nm-keyfile.c
@@ -164,23 +164,16 @@ read_array_of_uint (GKeyFile *file,
                     const char *key)
 {
 	gs_unref_array GArray *array = NULL;
-	gsize length;
-	gsize i;
-	gs_free int *tmp = NULL;
 	gs_free_error GError *error = NULL;
+	gs_free guint *tmp = NULL;
+	gsize length;
 
-	tmp = nm_keyfile_plugin_kf_get_integer_list (file, nm_setting_get_name (setting), key, &length, &error);
+	tmp = nm_keyfile_plugin_kf_get_integer_list_uint (file, nm_setting_get_name (setting), key, &length, &error);
 	if (error)
 		return;
 
 	array = g_array_sized_new (FALSE, FALSE, sizeof (guint), length);
-
-	for (i = 0; i < length; i++) {
-		if (tmp[i] < 0)
-			return;
-		g_array_append_val (array, tmp[i]);
-	}
-
+	g_array_append_vals (array, tmp, length);
 	g_object_set (setting, key, array, NULL);
 }
 
@@ -941,7 +934,7 @@ mac_address_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key
 	char addr_str[NM_UTILS_HWADDR_LEN_MAX * 3];
 	guint8 addr_bin[NM_UTILS_HWADDR_LEN_MAX];
 	gs_free char *tmp_string = NULL;
-	gs_free int *int_list = NULL;
+	gs_free guint *int_list = NULL;
 	const char *mac_str;
 	gsize int_list_len;
 	gsize i;
@@ -962,12 +955,12 @@ mac_address_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key
 		goto good_addr_bin;
 
 	/* Old format; list of ints */
-	int_list = nm_keyfile_plugin_kf_get_integer_list (info->keyfile, setting_name, key, &int_list_len, NULL);
+	int_list = nm_keyfile_plugin_kf_get_integer_list_uint (info->keyfile, setting_name, key, &int_list_len, NULL);
 	if (int_list_len == addr_len) {
 		for (i = 0; i < addr_len; i++) {
-			const int val = int_list[i];
+			const guint val = int_list[i];
 
-			if (val < 0 || val > 255)
+			if (val > 255)
 				break;
 			addr_bin[i] = (guint8) val;
 		}
@@ -3095,24 +3088,24 @@ read_one_setting_value (KeyfileReaderInfo *info,
 				nm_g_object_set_property_int64 (G_OBJECT (setting), key, i64, &err);
 		}
 	} else if (type == G_TYPE_BYTES) {
-		gs_free int *tmp = NULL;
+		gs_free guint *tmp = NULL;
 		GByteArray *array;
 		GBytes *bytes;
 		gsize length;
 		int i;
 		gboolean already_warned = FALSE;
 
-		tmp = nm_keyfile_plugin_kf_get_integer_list (keyfile, setting_info->setting_name, key, &length, NULL);
+		tmp = nm_keyfile_plugin_kf_get_integer_list_uint (keyfile, setting_info->setting_name, key, &length, NULL);
 
 		array = g_byte_array_sized_new (length);
 		for (i = 0; i < length; i++) {
-			const int val = tmp[i];
+			const guint val = tmp[i];
 			unsigned char v = (unsigned char) (val & 0xFF);
 
-			if (val < 0 || val > 255) {
+			if (val > 255u) {
 				if (   !already_warned
 				    && !handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-				                     _("ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"),
+				                     _("ignoring invalid byte element '%u' (not between 0 and 255 inclusive)"),
 				                     val)) {
 					g_byte_array_unref (array);
 					return;

From 3ebfb67df4bb7a53fcf0b42fa707b26071670ead Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 30 Apr 2020 15:39:25 +0200
Subject: [PATCH 110/222] keyfile: implement
 nm_keyfile_plugin_kf_get_string_list() directly without macro

There is only one user of the macro left. Drop it.
---
 shared/nm-keyfile/nm-keyfile-utils.c | 55 +++++++++++++---------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/shared/nm-keyfile/nm-keyfile-utils.c b/shared/nm-keyfile/nm-keyfile-utils.c
index c28af81541..45235495a6 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.c
+++ b/shared/nm-keyfile/nm-keyfile-utils.c
@@ -104,36 +104,33 @@ nm_keyfile_plugin_get_setting_name_for_alias (const char *alias)
 
 /*****************************************************************************/
 
-#define DEFINE_KF_LIST_WRAPPER_GET(fcn_name, get_ctype, key_file_get_fcn) \
-get_ctype \
-fcn_name (GKeyFile *kf, \
-          const char *group, \
-          const char *key, \
-          gsize *out_length, \
-          GError **error) \
-{ \
-	get_ctype list; \
-	const char *alias; \
-	GError *local = NULL; \
-	gsize l; \
-\
-	list = key_file_get_fcn (kf, group, key, &l, &local); \
-	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) { \
-		alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
-		if (alias) { \
-			g_clear_error (&local); \
-			list = key_file_get_fcn (kf, alias, key, &l, &local); \
-		} \
-	} \
-	if (local) \
-		g_propagate_error (error, local); \
-	if (!list) \
-		l = 0; \
-	NM_SET_OUT (out_length, l); \
-	return list; \
-}
+char **
+nm_keyfile_plugin_kf_get_string_list (GKeyFile *kf,
+                                      const char *group,
+                                      const char *key,
+                                      gsize *out_length,
+                                      GError **error)
+{
+	char **list;
+	const char *alias;
+	GError *local = NULL;
+	gsize l;
 
-DEFINE_KF_LIST_WRAPPER_GET (nm_keyfile_plugin_kf_get_string_list,  char **, g_key_file_get_string_list);
+	list = g_key_file_get_string_list (kf, group, key, &l, &local);
+	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) {
+		alias = nm_keyfile_plugin_get_alias_for_setting_name (group);
+		if (alias) {
+			g_clear_error (&local);
+			list = g_key_file_get_string_list (kf, alias, key, &l, &local);
+		}
+	}
+	if (local)
+		g_propagate_error (error, local);
+	if (!list)
+		l = 0;
+	NM_SET_OUT (out_length, l);
+	return list;
+}
 
 guint *
 nm_keyfile_plugin_kf_get_integer_list_uint (GKeyFile *key_file,

From 211eb3ff8afe9b2b51785b7d1052125d82242d51 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 30 Apr 2020 17:20:21 +0200
Subject: [PATCH 111/222] platform: fix test failure when /proc is mounted
 read-only

Expect a failure when writing to /proc if the file system is mounted
read-only.
---
 src/platform/tests/test-link.c | 77 +++++++++++++++++++++++-----------
 1 file changed, 53 insertions(+), 24 deletions(-)

diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c
index 2661914b98..ea4a2c5ab9 100644
--- a/src/platform/tests/test-link.c
+++ b/src/platform/tests/test-link.c
@@ -3050,18 +3050,29 @@ test_sysctl_netns_switch (void)
 	nmtstp_link_delete (PL, FALSE, ifindex, NULL, TRUE);
 }
 
-static void
-sysctl_set_async_cb_assert_success (GError *error, gpointer data)
-{
-	g_assert_no_error (error);
-	g_main_loop_quit (data);
-}
+typedef struct {
+	GMainLoop *loop;
+	const char *path;
+	gboolean expected_success;
+	gint32 expected_value;
+} SetAsyncData;
 
 static void
-sysctl_set_async_cb_assert_failure (GError *error, gpointer data)
+sysctl_set_async_cb (GError *error, gpointer user_data)
 {
-	g_assert (error);
-	g_main_loop_quit (data);
+	SetAsyncData *data = user_data;
+
+	if (data->expected_success) {
+		g_assert_no_error (error);
+		g_assert_cmpint (nm_platform_sysctl_get_int32 (NM_PLATFORM_GET,
+		                                               NMP_SYSCTL_PATHID_ABSOLUTE (data->path),
+		                                               -1),
+		                 ==,
+		                 data->expected_value);
+	} else
+		g_assert (error);
+
+	g_main_loop_quit (data->loop);
 }
 
 static void
@@ -3070,43 +3081,53 @@ test_sysctl_set_async (void)
 	NMPlatform *const PL = NM_PLATFORM_GET;
 	const char *const IFNAME = "nm-dummy-0";
 	const char *const PATH = "/proc/sys/net/ipv4/conf/nm-dummy-0/rp_filter";
-	gs_free GMainLoop *loop = NULL;
+	GMainLoop *loop;
 	gs_unref_object GCancellable *cancellable = NULL;
+	gboolean proc_writable;
+	SetAsyncData data;
 	int ifindex;
 
 	ifindex = nmtstp_link_dummy_add (PL, -1, IFNAME)->ifindex;
 	loop = g_main_loop_new (NULL, FALSE);
 	cancellable = g_cancellable_new ();
+	proc_writable = access (PATH, W_OK) == 0;
+
+	data = (SetAsyncData) {
+		.loop = loop,
+		.path = PATH,
+		.expected_success = proc_writable,
+		.expected_value = 2,
+	};
 
 	nm_platform_sysctl_set_async (PL,
 	                              NMP_SYSCTL_PATHID_ABSOLUTE (PATH),
 	                              (const char *[]) { "2", NULL},
-	                              sysctl_set_async_cb_assert_success,
-	                              loop,
+	                              sysctl_set_async_cb,
+	                              &data,
 	                              cancellable);
 
 	if (!nmtst_main_loop_run (loop, 1000))
 		g_assert_not_reached ();
 
-	g_assert_cmpint (nm_platform_sysctl_get_int32 (PL, NMP_SYSCTL_PATHID_ABSOLUTE (PATH), -1),
-	                 ==,
-	                 2);
+	data = (SetAsyncData) {
+		.loop = loop,
+		.path = PATH,
+		.expected_success = proc_writable,
+		.expected_value = 1,
+	};
 
 	nm_platform_sysctl_set_async (PL,
 	                              NMP_SYSCTL_PATHID_ABSOLUTE (PATH),
 	                              (const char *[]) { "2", "0", "1", "0", "1", NULL},
-	                              sysctl_set_async_cb_assert_success,
-	                              loop,
+	                              sysctl_set_async_cb,
+	                              &data,
 	                              cancellable);
 
 	if (!nmtst_main_loop_run (loop, 2000))
 		g_assert_not_reached ();
 
-	g_assert_cmpint (nm_platform_sysctl_get_int32 (PL, NMP_SYSCTL_PATHID_ABSOLUTE (PATH), -1),
-	                 ==,
-	                 1);
-
 	nmtstp_link_delete (NULL, -1, ifindex, IFNAME, TRUE);
+	g_main_loop_unref (loop);
 }
 
 static void
@@ -3115,25 +3136,33 @@ test_sysctl_set_async_fail (void)
 	NMPlatform *const PL = NM_PLATFORM_GET;
 	const char *const IFNAME = "nm-dummy-0";
 	const char *const PATH = "/proc/sys/net/ipv4/conf/nm-dummy-0/does-not-exist";
-	gs_free GMainLoop *loop = NULL;
+	GMainLoop *loop;
 	gs_unref_object GCancellable *cancellable = NULL;
+	SetAsyncData data;
 	int ifindex;
 
 	ifindex = nmtstp_link_dummy_add (PL, -1, IFNAME)->ifindex;
 	loop = g_main_loop_new (NULL, FALSE);
 	cancellable = g_cancellable_new ();
 
+	data = (SetAsyncData) {
+		.loop = loop,
+		.path = PATH,
+		.expected_success = FALSE,
+	};
+
 	nm_platform_sysctl_set_async (PL,
 	                              NMP_SYSCTL_PATHID_ABSOLUTE (PATH),
 	                              (const char *[]) { "2", NULL},
-	                              sysctl_set_async_cb_assert_failure,
-	                              loop,
+	                              sysctl_set_async_cb,
+	                              &data,
 	                              cancellable);
 
 	if (!nmtst_main_loop_run (loop, 1000))
 		g_assert_not_reached ();
 
 	nmtstp_link_delete (NULL, -1, ifindex, IFNAME, TRUE);
+	g_main_loop_unref (loop);
 }
 
 /*****************************************************************************/

From fd7136d80f3c3ae7d27ab886ff00ba1223cfaee6 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Mon, 4 May 2020 14:33:41 +0300
Subject: [PATCH 112/222] po: update Ukrainian (uk) translation

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/489
---
 po/uk.po | 2579 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 1329 insertions(+), 1250 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 961f3c4941..a17fb323d8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/NetworkMan"
 "ager/issues\n"
-"POT-Creation-Date: 2020-04-07 03:31+0000\n"
-"PO-Revision-Date: 2020-04-07 09:33+0300\n"
+"POT-Creation-Date: 2020-05-04 03:36+0000\n"
+"PO-Revision-Date: 2020-05-04 14:31+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../clients/cli/agent.c:24
+#: ../clients/cli/agent.c:22
 #, c-format
 msgid ""
 "Usage: nmcli agent { COMMAND | help }\n"
@@ -35,7 +35,7 @@ msgstr ""
 "КОМАНДА := { secret | polkit | all }\n"
 "\n"
 
-#: ../clients/cli/agent.c:32
+#: ../clients/cli/agent.c:30
 #, c-format
 msgid ""
 "Usage: nmcli agent secret { help }\n"
@@ -54,7 +54,7 @@ msgstr ""
 "знадобиться пароль, запитуватиме про нього у користувача.\n"
 "\n"
 
-#: ../clients/cli/agent.c:42
+#: ../clients/cli/agent.c:40
 #, c-format
 msgid ""
 "Usage: nmcli agent polkit { help }\n"
@@ -73,7 +73,7 @@ msgstr ""
 "запит і передасть відповідь на нього polkit.\n"
 "\n"
 
-#: ../clients/cli/agent.c:52
+#: ../clients/cli/agent.c:50
 #, c-format
 msgid ""
 "Usage: nmcli agent all { help }\n"
@@ -86,22 +86,22 @@ msgstr ""
 "Запустити nmcli як агент паролів NetworkManager та polkit.\n"
 "\n"
 
-#: ../clients/cli/agent.c:144
+#: ../clients/cli/agent.c:142
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr "nmcli успішно зареєстровано як агент паролів NetworkManager.\n"
 
-#: ../clients/cli/agent.c:146
+#: ../clients/cli/agent.c:144
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "Помилка: не вдалося ініціалізувати агент обробки паролів"
 
-#: ../clients/cli/agent.c:157
+#: ../clients/cli/agent.c:153
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli успішно зареєстровано як агент polkit.\n"
 
-#: ../clients/cli/agent.c:180
+#: ../clients/cli/agent.c:176
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "Помилка: не вдалося ініціалізувати агент polkit: %s"
@@ -141,61 +141,61 @@ msgstr ""
 msgid "Error: Could not create NMClient object: %s."
 msgstr "Помилка: не вдалося створити об'єкт NMClient: %s."
 
-#: ../clients/cli/common.c:1264
+#: ../clients/cli/common.c:1265
 msgid "Error: NetworkManager is not running."
 msgstr "Помилка: NetworkManager не працює."
 
-#: ../clients/cli/common.c:1361
+#: ../clients/cli/common.c:1364
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr ""
 "Помилка: параметр «%s» є невідомим. Спробуйте скористатися параметром --help."
 
-#: ../clients/cli/common.c:1369
+#: ../clients/cli/common.c:1372
 msgid "Error: missing argument. Try passing --help."
 msgstr "Помилка: пропущено параметр. Спробуйте скористатися параметром --help."
 
-#: ../clients/cli/common.c:1436
+#: ../clients/cli/common.c:1439
 msgid "access denied"
 msgstr "доступ заборонено"
 
-#: ../clients/cli/common.c:1438
+#: ../clients/cli/common.c:1441
 msgid "NetworkManager is not running"
 msgstr "NetworkManager не запущено"
 
-#: ../clients/cli/common.c:1464
+#: ../clients/cli/common.c:1467
 #, c-format
 msgid "Error: error connecting to system bus: %s"
 msgstr "Помилка: помилка під час спроби з'єднатися із каналом системи: %s"
 
-#: ../clients/cli/common.c:1490 ../clients/cli/connections.c:67
+#: ../clients/cli/common.c:1493 ../clients/cli/connections.c:67
 #: ../clients/cli/connections.c:77 ../clients/cli/devices.c:433
 #: ../clients/cli/devices.c:525 ../clients/cli/devices.c:532
-#: ../clients/cli/general.c:33 ../clients/cli/general.c:88
-#: ../clients/cli/general.c:93 ../clients/common/nm-client-utils.c:250
+#: ../clients/cli/general.c:31 ../clients/cli/general.c:86
+#: ../clients/cli/general.c:91 ../clients/common/nm-client-utils.c:250
 #: ../clients/common/nm-client-utils.c:263
 #: ../clients/common/nm-client-utils.c:267
 #: ../clients/common/nm-client-utils.c:272
-#: ../clients/common/nm-meta-setting-desc.c:1713
-#: ../clients/common/nm-meta-setting-desc.c:1744
-#: ../clients/common/nm-meta-setting-desc.c:2646
-#: ../clients/common/nm-meta-setting-desc.c:2704
+#: ../clients/common/nm-meta-setting-desc.c:1747
+#: ../clients/common/nm-meta-setting-desc.c:1778
+#: ../clients/common/nm-meta-setting-desc.c:2680
+#: ../clients/common/nm-meta-setting-desc.c:2738
 msgid "unknown"
 msgstr "невідомо"
 
-#: ../clients/cli/common.c:1491
+#: ../clients/cli/common.c:1494
 msgid "none"
 msgstr "немає"
 
-#: ../clients/cli/common.c:1492
+#: ../clients/cli/common.c:1495
 msgid "portal"
 msgstr "портал"
 
-#: ../clients/cli/common.c:1493
+#: ../clients/cli/common.c:1496
 msgid "limited"
 msgstr "обмежена"
 
-#: ../clients/cli/common.c:1494
+#: ../clients/cli/common.c:1497
 msgid "full"
 msgstr "повна"
 
@@ -1095,19 +1095,19 @@ msgid "NetworkManager connection profiles"
 msgstr "Профілі з'єднань NetworkManager"
 
 #: ../clients/cli/connections.c:2165 ../clients/cli/connections.c:2911
-#: ../clients/cli/connections.c:2923 ../clients/cli/connections.c:2935
-#: ../clients/cli/connections.c:3165 ../clients/cli/connections.c:9056
-#: ../clients/cli/connections.c:9077 ../clients/cli/devices.c:3057
-#: ../clients/cli/devices.c:3069 ../clients/cli/devices.c:3080
-#: ../clients/cli/devices.c:3368 ../clients/cli/devices.c:3379
-#: ../clients/cli/devices.c:3397 ../clients/cli/devices.c:3406
-#: ../clients/cli/devices.c:3427 ../clients/cli/devices.c:3438
-#: ../clients/cli/devices.c:3456 ../clients/cli/devices.c:3974
-#: ../clients/cli/devices.c:3984 ../clients/cli/devices.c:3992
-#: ../clients/cli/devices.c:4004 ../clients/cli/devices.c:4019
-#: ../clients/cli/devices.c:4027 ../clients/cli/devices.c:4170
-#: ../clients/cli/devices.c:4181 ../clients/cli/devices.c:4398
-#: ../clients/cli/devices.c:4567
+#: ../clients/cli/connections.c:2924 ../clients/cli/connections.c:2937
+#: ../clients/cli/connections.c:3169 ../clients/cli/connections.c:9056
+#: ../clients/cli/connections.c:9078 ../clients/cli/devices.c:3107
+#: ../clients/cli/devices.c:3120 ../clients/cli/devices.c:3132
+#: ../clients/cli/devices.c:3424 ../clients/cli/devices.c:3435
+#: ../clients/cli/devices.c:3453 ../clients/cli/devices.c:3462
+#: ../clients/cli/devices.c:3483 ../clients/cli/devices.c:3494
+#: ../clients/cli/devices.c:3512 ../clients/cli/devices.c:4028
+#: ../clients/cli/devices.c:4039 ../clients/cli/devices.c:4048
+#: ../clients/cli/devices.c:4062 ../clients/cli/devices.c:4079
+#: ../clients/cli/devices.c:4088 ../clients/cli/devices.c:4235
+#: ../clients/cli/devices.c:4246 ../clients/cli/devices.c:4462
+#: ../clients/cli/devices.c:4631
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Помилка: пропущено аргумент %s."
@@ -1117,268 +1117,268 @@ msgstr "Помилка: пропущено аргумент %s."
 msgid "Error: %s - no such connection profile."
 msgstr "Помилка: профілю з'єднання %s не існує."
 
-#: ../clients/cli/connections.c:2284 ../clients/cli/connections.c:2898
-#: ../clients/cli/connections.c:2963 ../clients/cli/connections.c:8593
-#: ../clients/cli/connections.c:8684 ../clients/cli/connections.c:9177
+#: ../clients/cli/connections.c:2284 ../clients/cli/connections.c:2897
+#: ../clients/cli/connections.c:2967 ../clients/cli/connections.c:8597
+#: ../clients/cli/connections.c:8689 ../clients/cli/connections.c:9183
 #: ../clients/cli/devices.c:1785 ../clients/cli/devices.c:2053
-#: ../clients/cli/devices.c:2223 ../clients/cli/devices.c:2331
-#: ../clients/cli/devices.c:2523 ../clients/cli/devices.c:3247
-#: ../clients/cli/devices.c:4133 ../clients/cli/devices.c:4573
-#: ../clients/cli/general.c:1017
+#: ../clients/cli/devices.c:2223 ../clients/cli/devices.c:2336
+#: ../clients/cli/devices.c:2525 ../clients/cli/devices.c:3303
+#: ../clients/cli/devices.c:4199 ../clients/cli/devices.c:4638
+#: ../clients/cli/general.c:993
 #, c-format
 msgid "Error: %s."
 msgstr "Помилка: %s."
 
-#: ../clients/cli/connections.c:2377 ../clients/cli/devices.c:4350
+#: ../clients/cli/connections.c:2376 ../clients/cli/devices.c:4413
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "на пристрої «%s» немає активних з'єднань"
 
-#: ../clients/cli/connections.c:2385
+#: ../clients/cli/connections.c:2384
 msgid "no active connection or device"
 msgstr "немає активних з'єднань або пристроїв"
 
-#: ../clients/cli/connections.c:2405
+#: ../clients/cli/connections.c:2404
 #, c-format
 msgid "device '%s' not compatible with connection '%s': "
 msgstr "пристрій «%s» несумісний зі з'єднанням «%s»: "
 
-#: ../clients/cli/connections.c:2438
+#: ../clients/cli/connections.c:2437
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "пристрій «%s» несумісний зі з'єднанням «%s»"
 
-#: ../clients/cli/connections.c:2441
+#: ../clients/cli/connections.c:2440
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "не виявлено пристрою для з'єднання «%s»"
 
-#: ../clients/cli/connections.c:2492
+#: ../clients/cli/connections.c:2491
 #, c-format
 msgid "Hint: use '%s' to get more details."
 msgstr "Підказка: скористайтеся «%s», щоб ознайомитися із подробицями."
 
-#: ../clients/cli/connections.c:2510
+#: ../clients/cli/connections.c:2509
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
 msgstr "З'єднання успішно задіяно (%s) (активний шлях D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2514 ../clients/cli/connections.c:2664
-#: ../clients/cli/connections.c:6895
+#: ../clients/cli/connections.c:2513 ../clients/cli/connections.c:2663
+#: ../clients/cli/connections.c:6898
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "З'єднання успішно задіяно (активний шлях D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2521 ../clients/cli/connections.c:2643
+#: ../clients/cli/connections.c:2520 ../clients/cli/connections.c:2642
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Помилка: не вдалося активувати з'єднання: %s"
 
-#: ../clients/cli/connections.c:2558
+#: ../clients/cli/connections.c:2557
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr "Помилка: перевищено час очікування (%d секунд)."
 
-#: ../clients/cli/connections.c:2725
+#: ../clients/cli/connections.c:2724
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "не вдалося прочитати файл passwd «%s»: %s"
 
-#: ../clients/cli/connections.c:2738
+#: ../clients/cli/connections.c:2737
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "пропущено двокрапку у записі «password» «%s»"
 
-#: ../clients/cli/connections.c:2746
+#: ../clients/cli/connections.c:2745
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "пропущено крапку у записі «password» «%s»"
 
-#: ../clients/cli/connections.c:2759
+#: ../clients/cli/connections.c:2758
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "некоректна назва параметра у записі «password» «%s»"
 
-#: ../clients/cli/connections.c:2816
+#: ../clients/cli/connections.c:2815
 #, c-format
 msgid "unknown device '%s'."
 msgstr "невідомий пристрій, «%s»."
 
-#: ../clients/cli/connections.c:2821
+#: ../clients/cli/connections.c:2820
 msgid "neither a valid connection nor device given"
 msgstr "не вказано ні коректного з'єднання, ні пристрою"
 
-#: ../clients/cli/connections.c:2945 ../clients/cli/connections.c:9087
-#: ../clients/cli/devices.c:1744 ../clients/cli/devices.c:1790
-#: ../clients/cli/devices.c:2228 ../clients/cli/devices.c:3112
-#: ../clients/cli/devices.c:3469 ../clients/cli/devices.c:4036
-#: ../clients/cli/devices.c:4187 ../clients/cli/devices.c:4407
-#: ../clients/cli/devices.c:4577
+#: ../clients/cli/connections.c:2948 ../clients/cli/connections.c:9089
+#: ../clients/cli/devices.c:1744 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:2229 ../clients/cli/devices.c:3166
+#: ../clients/cli/devices.c:3525 ../clients/cli/devices.c:4098
+#: ../clients/cli/devices.c:4252 ../clients/cli/devices.c:4472
+#: ../clients/cli/devices.c:4643
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Помилка: некоректний додатковий аргумент, «%s»."
 
-#: ../clients/cli/connections.c:2971
+#: ../clients/cli/connections.c:2976
 msgid "preparing"
 msgstr "приготування"
 
-#: ../clients/cli/connections.c:3080
+#: ../clients/cli/connections.c:3083
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "Запис з'єднання «%s» (%s) успішно вилучено.\n"
 
-#: ../clients/cli/connections.c:3096
+#: ../clients/cli/connections.c:3099
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr "З'єднання «%s» успішно вимкнено (активний шлях D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:3147 ../clients/cli/connections.c:8780
-#: ../clients/cli/connections.c:8811 ../clients/cli/connections.c:8977
+#: ../clients/cli/connections.c:3150 ../clients/cli/connections.c:8786
+#: ../clients/cli/connections.c:8817 ../clients/cli/connections.c:8980
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Помилка: не вказано з'єднання."
 
-#: ../clients/cli/connections.c:3177
+#: ../clients/cli/connections.c:3182
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Помилка: «%s» не є активним з'єднанням.\n"
 
-#: ../clients/cli/connections.c:3178
+#: ../clients/cli/connections.c:3183
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Помилка: не усі активні з'єднання знайдено."
 
-#: ../clients/cli/connections.c:3186
+#: ../clients/cli/connections.c:3191
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Помилка: не надано активного з'єднання."
 
-#: ../clients/cli/connections.c:3217
+#: ../clients/cli/connections.c:3223
 #, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
 msgstr "Невдала спроба вимкнути з'єднання «%s»: %s\n"
 
-#: ../clients/cli/connections.c:3477 ../clients/cli/connections.c:3534
+#: ../clients/cli/connections.c:3481 ../clients/cli/connections.c:3538
 #: ../clients/common/nm-client-utils.c:211
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "«%s» немає серед [%s]"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3497 ../clients/cli/connections.c:3557
+#: ../clients/cli/connections.c:3501 ../clients/cli/connections.c:3561
 #: ../clients/common/nm-client-utils.c:279
 #, c-format
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
-#: ../clients/cli/connections.c:3691
+#: ../clients/cli/connections.c:3695
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr ""
 "Попередження: master='%s' не посилається ні на один з наявних профілів.\n"
 
-#: ../clients/cli/connections.c:4054
+#: ../clients/cli/connections.c:4058
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "Помилка: некоректна властивість, «%s»: %s."
 
-#: ../clients/cli/connections.c:4069
+#: ../clients/cli/connections.c:4073
 #, c-format
 msgid "Error: failed to %s %s.%s: %s."
 msgstr "Помилка: не вдалося %s %s.%s: %s."
 
-#: ../clients/cli/connections.c:4111
+#: ../clients/cli/connections.c:4115
 #, c-format
 msgid "Error: '%s' is mandatory."
 msgstr "Помилка: «%s» є обов'язковим."
 
-#: ../clients/cli/connections.c:4138
+#: ../clients/cli/connections.c:4142
 #, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "Помилка: некоректний тип підлеглого; %s."
 
-#: ../clients/cli/connections.c:4146
+#: ../clients/cli/connections.c:4150
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Помилка: некоректний тип з'єднання; %s."
 
-#: ../clients/cli/connections.c:4223
+#: ../clients/cli/connections.c:4227
 #, c-format
 msgid "Error: bad connection type: %s"
 msgstr "Помилка: помилковий тип з'єднання: %s"
 
-#: ../clients/cli/connections.c:4298
+#: ../clients/cli/connections.c:4302
 msgid "Error: master is required"
 msgstr "Помилка: слід вказати значення параметра «master»"
 
-#: ../clients/cli/connections.c:4367
+#: ../clients/cli/connections.c:4371
 #, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "Помилка: помилка під час спроби додавання параметра прив'язки «%s=%s»."
 
-#: ../clients/cli/connections.c:4398
+#: ../clients/cli/connections.c:4402
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 "Помилка: «%s» не є коректним режимом спостереження; скористайтеся «%s» або "
 "«%s».\n"
 
-#: ../clients/cli/connections.c:4429
+#: ../clients/cli/connections.c:4433
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
 msgstr ""
 "Помилка: «bt-type»: «%s» є некоректним; скористайтеся значенням з переліку "
 "[%s, %s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:4723
+#: ../clients/cli/connections.c:4727
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed."
 msgstr "Помилка: параметр «%s» є обов'язковим, його не можна вилучати."
 
-#: ../clients/cli/connections.c:4733
+#: ../clients/cli/connections.c:4737
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "Помилка: не вказано значення «%s»."
 
-#: ../clients/cli/connections.c:4778
+#: ../clients/cli/connections.c:4782
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Помилка: пропущено аргумент <параметр>.<властивість>."
 
-#: ../clients/cli/connections.c:4804
+#: ../clients/cli/connections.c:4808
 msgid "Error: missing setting."
 msgstr "Помилка: пропущено параметр."
 
-#: ../clients/cli/connections.c:4822
+#: ../clients/cli/connections.c:4826
 #, c-format
 msgid "Setting '%s' is not present in the connection."
 msgstr "У з'єднання немає параметра «%s»."
 
-#: ../clients/cli/connections.c:4826
+#: ../clients/cli/connections.c:4830
 #, c-format
 msgid "Error: invalid setting argument '%s'."
 msgstr "Помилка: некоректний аргумент параметра, «%s»."
 
-#: ../clients/cli/connections.c:4850
+#: ../clients/cli/connections.c:4854
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Помилка: некоректний або заборонений параметр, «%s»: %s."
 
-#: ../clients/cli/connections.c:4899 ../clients/cli/connections.c:4915
+#: ../clients/cli/connections.c:4903 ../clients/cli/connections.c:4919
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr "Помилка: «%s» є неоднозначним (%s.%s або %s.%s)."
 
-#: ../clients/cli/connections.c:4935
+#: ../clients/cli/connections.c:4939
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "Помилка: некоректний аргумент <параметр>.<властивість>, «%s»."
 
-#: ../clients/cli/connections.c:4973 ../clients/cli/connections.c:8632
+#: ../clients/cli/connections.c:4977 ../clients/cli/connections.c:8637
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Помилка: не вдалося додати з'єднання «%s»: %s"
 
-#: ../clients/cli/connections.c:4991
+#: ../clients/cli/connections.c:4995
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
@@ -1399,32 +1399,32 @@ msgstr[3] ""
 "Попередження: існує інше з'єднання з назвою «%1$s». Посилайтеся на з'єднання "
 "за його UUID, «%2$s»\n"
 
-#: ../clients/cli/connections.c:5000
+#: ../clients/cli/connections.c:5004
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "Запис з'єднання «%s» (%s) успішно додано.\n"
 
-#: ../clients/cli/connections.c:5062 ../clients/cli/connections.c:7001
-#: ../clients/cli/connections.c:7002 ../clients/cli/devices.c:524
+#: ../clients/cli/connections.c:5066 ../clients/cli/connections.c:7004
+#: ../clients/cli/connections.c:7005 ../clients/cli/devices.c:524
 #: ../clients/cli/devices.c:531 ../clients/cli/devices.c:1248
-#: ../clients/cli/general.c:95 ../clients/cli/utils.h:293
+#: ../clients/cli/general.c:93 ../clients/cli/utils.h:293
 #: ../clients/common/nm-client-utils.c:269
-#: ../clients/common/nm-meta-setting-desc.c:847
-#: ../clients/common/nm-meta-setting-desc.c:2641
+#: ../clients/common/nm-meta-setting-desc.c:871
+#: ../clients/common/nm-meta-setting-desc.c:2675
 msgid "no"
 msgstr "ні"
 
-#: ../clients/cli/connections.c:5063 ../clients/cli/connections.c:7001
-#: ../clients/cli/connections.c:7002 ../clients/cli/devices.c:523
+#: ../clients/cli/connections.c:5067 ../clients/cli/connections.c:7004
+#: ../clients/cli/connections.c:7005 ../clients/cli/devices.c:523
 #: ../clients/cli/devices.c:530 ../clients/cli/devices.c:1248
-#: ../clients/cli/general.c:94 ../clients/cli/utils.h:293
+#: ../clients/cli/general.c:92 ../clients/cli/utils.h:293
 #: ../clients/common/nm-client-utils.c:268
-#: ../clients/common/nm-meta-setting-desc.c:847
-#: ../clients/common/nm-meta-setting-desc.c:2638
+#: ../clients/common/nm-meta-setting-desc.c:871
+#: ../clients/common/nm-meta-setting-desc.c:2672
 msgid "yes"
 msgstr "так"
 
-#: ../clients/cli/connections.c:5149
+#: ../clients/cli/connections.c:5153
 #, c-format
 msgid ""
 "You can specify this option more than once. Press <Enter> when you're done.\n"
@@ -1433,7 +1433,7 @@ msgstr ""
 "завершите.\n"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:5251
+#: ../clients/cli/connections.c:5255
 #, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
@@ -1442,7 +1442,7 @@ msgstr[1] "Для «%2$s» передбачено %1$d додатковий па
 msgstr[2] "Для з'єднань типу «%2$s» передбачено %1$d додаткових аргументів.\n"
 msgstr[3] "Для з'єднань типу «%2$s» передбачено %1$d додатковий аргумент.\n"
 
-#: ../clients/cli/connections.c:5257
+#: ../clients/cli/connections.c:5261
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
@@ -1451,22 +1451,22 @@ msgstr[1] "Хочете вказати їх? %s"
 msgstr[2] "Хочете вказати їх? %s"
 msgstr[3] "Хочете вказати його? %s"
 
-#: ../clients/cli/connections.c:5389 ../clients/cli/utils.c:279
+#: ../clients/cli/connections.c:5393 ../clients/cli/utils.c:279
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "Помилка: слід вказати значення «%s» аргументу."
 
-#: ../clients/cli/connections.c:5396
+#: ../clients/cli/connections.c:5400
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Помилка: «save»: %s."
 
-#: ../clients/cli/connections.c:5481 ../clients/cli/connections.c:5492
+#: ../clients/cli/connections.c:5485 ../clients/cli/connections.c:5496
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr "Помилка: слід вказати параметр «%s»."
 
-#: ../clients/cli/connections.c:6451
+#: ../clients/cli/connections.c:6454
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' значення параметра]\n"
@@ -1474,7 +1474,7 @@ msgstr "['%s' значення параметра]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6560
+#: ../clients/cli/connections.c:6563
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1508,7 +1508,7 @@ msgstr ""
 "nmcli    <параметр-налашт.> <знач.>   :: налаштовування nmcli\n"
 "quit                                  :: завершити роботу nmcli\n"
 
-#: ../clients/cli/connections.c:6587
+#: ../clients/cli/connections.c:6590
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1529,7 +1529,7 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6594
+#: ../clients/cli/connections.c:6597
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -1551,7 +1551,7 @@ msgstr ""
 "Приклади: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6601
+#: ../clients/cli/connections.c:6604
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1567,7 +1567,7 @@ msgstr ""
 "\n"
 "Приклад: nmcli> s con.id My connection\n"
 
-#: ../clients/cli/connections.c:6606
+#: ../clients/cli/connections.c:6609
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -1580,7 +1580,7 @@ msgstr ""
 "Показує опис властивості. Список усіх параметрів і властивостей NM можна "
 "знайти на сторінці довідника (man) nm-settings(5).\n"
 
-#: ../clients/cli/connections.c:6611
+#: ../clients/cli/connections.c:6614
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1595,7 +1595,7 @@ msgstr ""
 "\n"
 "Приклад: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6616
+#: ../clients/cli/connections.c:6619
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -1620,7 +1620,7 @@ msgstr ""
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6625
+#: ../clients/cli/connections.c:6628
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1647,7 +1647,7 @@ msgstr ""
 "потрібно\n"
 "повністю вилучити постійне з'єднання, вам доведеться вилучити його профіль.\n"
 
-#: ../clients/cli/connections.c:6636
+#: ../clients/cli/connections.c:6639
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1668,7 +1668,7 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) або NSP (WiMAX) (додайте на початку «/», якщо не "
 "вказано <інтерфейс>)\n"
 
-#: ../clients/cli/connections.c:6643 ../clients/cli/connections.c:6801
+#: ../clients/cli/connections.c:6646 ../clients/cli/connections.c:6804
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -1677,7 +1677,7 @@ msgstr ""
 "back  :: піднятися у меню на один рівень\n"
 "\n"
 
-#: ../clients/cli/connections.c:6646
+#: ../clients/cli/connections.c:6649
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -1686,7 +1686,7 @@ msgstr ""
 "help/? [<команда>]  :: довідка з команди nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6649
+#: ../clients/cli/connections.c:6652
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1713,7 +1713,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6671 ../clients/cli/connections.c:6807
+#: ../clients/cli/connections.c:6674 ../clients/cli/connections.c:6810
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1727,8 +1727,8 @@ msgstr ""
 "запис з'єднання не було збережено, користувачеві буде запропоновано "
 "підтвердити дію з виходу з програми.\n"
 
-#: ../clients/cli/connections.c:6676 ../clients/cli/connections.c:6812
-#: ../clients/cli/connections.c:7206 ../clients/cli/connections.c:8216
+#: ../clients/cli/connections.c:6679 ../clients/cli/connections.c:6815
+#: ../clients/cli/connections.c:7209 ../clients/cli/connections.c:8219
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Невідома команда «%s».\n"
@@ -1736,7 +1736,7 @@ msgstr "Невідома команда «%s».\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6741
+#: ../clients/cli/connections.c:6744
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1763,7 +1763,7 @@ msgstr ""
 "help/?   [<команда>]             :: вивести цю довідку або опис команди\n"
 "quit                             :: вийти з nmcli\n"
 
-#: ../clients/cli/connections.c:6766
+#: ../clients/cli/connections.c:6769
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1775,7 +1775,7 @@ msgstr ""
 "За допомогою цієї команди можна змінити значення властивості на вказане "
 "<значення>\n"
 
-#: ../clients/cli/connections.c:6770
+#: ../clients/cli/connections.c:6773
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1790,7 +1790,7 @@ msgstr ""
 "якщо властивість належить до типу контейнерів. Якщо властивість складається "
 "лише з одного значення, це значення буде замінено (те саме, що і «set»).\n"
 
-#: ../clients/cli/connections.c:6776
+#: ../clients/cli/connections.c:6779
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1801,7 +1801,7 @@ msgstr ""
 "\n"
 "Показує поточне значення і надає змогу його редагувати.\n"
 
-#: ../clients/cli/connections.c:6780
+#: ../clients/cli/connections.c:6783
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1834,7 +1834,7 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6791
+#: ../clients/cli/connections.c:6794
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -1847,7 +1847,7 @@ msgstr ""
 "Показує опис властивості. Список усіх параметрів і властивостей NM можна "
 "знайти на сторінці довідника (man) nm-settings(5).\n"
 
-#: ../clients/cli/connections.c:6796
+#: ../clients/cli/connections.c:6799
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1862,7 +1862,7 @@ msgstr ""
 "Виводить значення властивості. За допомогою аргументу команди ви можете "
 "виводити значення усього параметра або усього запису з'єднання.\n"
 
-#: ../clients/cli/connections.c:6804
+#: ../clients/cli/connections.c:6807
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -1871,24 +1871,24 @@ msgstr ""
 "help/? [<команда>]  :: довідка з команди nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6901
+#: ../clients/cli/connections.c:6904
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "Помилка: невдала спроба активації з'єднання.\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6999
+#: ../clients/cli/connections.c:7002
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Тип: %s | Назва: %s | UUID: %s | Не збережено: %s | Тимч.: %s ]\n"
 
-#: ../clients/cli/connections.c:7035
+#: ../clients/cli/connections.c:7038
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr ""
 "З'єднання не збережено. Ви справді хочете завершити роботу програми? %s"
 
-#: ../clients/cli/connections.c:7076
+#: ../clients/cli/connections.c:7079
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -1897,60 +1897,60 @@ msgstr ""
 "Профіль з'єднання було вилучено з іншого клієнта. Ви можете ввести «save» у "
 "головному меню, щоб відновити його.\n"
 
-#: ../clients/cli/connections.c:7110 ../clients/cli/connections.c:7504
-#: ../clients/cli/connections.c:7568
+#: ../clients/cli/connections.c:7113 ../clients/cli/connections.c:7507
+#: ../clients/cli/connections.c:7571
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Можливі значення властивості «%s»: %s\n"
 
-#: ../clients/cli/connections.c:7114 ../clients/cli/connections.c:7508
-#: ../clients/cli/connections.c:7572
+#: ../clients/cli/connections.c:7117 ../clients/cli/connections.c:7511
+#: ../clients/cli/connections.c:7575
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Введіть значення «%s»: "
 
-#: ../clients/cli/connections.c:7128 ../clients/cli/connections.c:7146
-#: ../clients/cli/connections.c:7517 ../clients/cli/connections.c:7585
+#: ../clients/cli/connections.c:7131 ../clients/cli/connections.c:7149
+#: ../clients/cli/connections.c:7520 ../clients/cli/connections.c:7588
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Помилка: не вдалося встановити значення властивості «%s»: %s\n"
 
-#: ../clients/cli/connections.c:7137
+#: ../clients/cli/connections.c:7140
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Редагування значення «%s»: "
 
-#: ../clients/cli/connections.c:7160 ../clients/cli/settings.c:400
+#: ../clients/cli/connections.c:7163 ../clients/cli/settings.c:400
 #, c-format
 msgid "Error: %s\n"
 msgstr "Помилка: %s\n"
 
-#: ../clients/cli/connections.c:7179
+#: ../clients/cli/connections.c:7182
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Невідомий аргумент команди: «%s»\n"
 
-#: ../clients/cli/connections.c:7270
+#: ../clients/cli/connections.c:7273
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Доступні параметри: %s\n"
 
-#: ../clients/cli/connections.c:7282
+#: ../clients/cli/connections.c:7285
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Помилка: некоректна назва параметра; %s\n"
 
-#: ../clients/cli/connections.c:7300
+#: ../clients/cli/connections.c:7303
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Доступні властивості: %s\n"
 
-#: ../clients/cli/connections.c:7308
+#: ../clients/cli/connections.c:7311
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Помилка: властивість %s\n"
 
-#: ../clients/cli/connections.c:7353
+#: ../clients/cli/connections.c:7356
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -1961,12 +1961,12 @@ msgstr ""
 "значення параметра може призвести до негайного задіяння з'єднання.\n"
 "Хочете зберегти запис? %s"
 
-#: ../clients/cli/connections.c:7438
+#: ../clients/cli/connections.c:7441
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Можна редагувати такі параметри: %s\n"
 
-#: ../clients/cli/connections.c:7469
+#: ../clients/cli/connections.c:7472
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -1975,234 +1975,234 @@ msgstr ""
 "Профіль з'єднання було вилучено з іншого клієнта. Ви можете ввести «save», "
 "щоб відновити його.\n"
 
-#: ../clients/cli/connections.c:7521 ../clients/cli/connections.c:7796
-#: ../clients/cli/connections.c:7828
+#: ../clients/cli/connections.c:7524 ../clients/cli/connections.c:7799
+#: ../clients/cli/connections.c:7831
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr ""
 "Помилка: не вибрано значення параметра; коректними значеннями є такі: [%s]\n"
 
-#: ../clients/cli/connections.c:7522
+#: ../clients/cli/connections.c:7525
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 "спочатку скористайтеся командою «goto <параметр>» або командою «set "
 "<параметр>.<властивість>»\n"
 
-#: ../clients/cli/connections.c:7537 ../clients/cli/connections.c:7714
-#: ../clients/cli/connections.c:7818
+#: ../clients/cli/connections.c:7540 ../clients/cli/connections.c:7717
+#: ../clients/cli/connections.c:7821
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr ""
 "Помилка: некоректний аргумент параметра, «%s»; коректними є такі ПАРАМЕТРИ: "
 "[%s]\n"
 
-#: ../clients/cli/connections.c:7546
+#: ../clients/cli/connections.c:7549
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Помилка: не вказано параметра для властивості «%s»\n"
 
-#: ../clients/cli/connections.c:7553
+#: ../clients/cli/connections.c:7556
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Помилка: некоректна властивість: %s\n"
 
-#: ../clients/cli/connections.c:7617
+#: ../clients/cli/connections.c:7620
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Помилка: невідоме значення «%s»\n"
 
-#: ../clients/cli/connections.c:7642
+#: ../clients/cli/connections.c:7645
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Можна редагувати значення таких властивостей: %s\n"
 
-#: ../clients/cli/connections.c:7687 ../clients/cli/connections.c:7746
+#: ../clients/cli/connections.c:7690 ../clients/cli/connections.c:7749
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Помилка: не вдалося вилучити значення «%s»: %s\n"
 
-#: ../clients/cli/connections.c:7692
+#: ../clients/cli/connections.c:7695
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Помилка: не вказано аргументу; коректними аргументами є такі: [%s]\n"
 
-#: ../clients/cli/connections.c:7711
+#: ../clients/cli/connections.c:7714
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "У з'єднання немає параметра «%s».\n"
 
-#: ../clients/cli/connections.c:7772
+#: ../clients/cli/connections.c:7775
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Помилка: властивості %s і не є назвою параметра.\n"
 
-#: ../clients/cli/connections.c:7797 ../clients/cli/connections.c:7829
+#: ../clients/cli/connections.c:7800 ../clients/cli/connections.c:7832
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "скористайтеся спочатку командою «goto <параметр> або командою «describe "
 "<параметр>.<властивість>»\n"
 
-#: ../clients/cli/connections.c:7852
+#: ../clients/cli/connections.c:7855
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr ""
 "Помилка: некоректна властивість: %s і не є коректною назвою параметра.\n"
 
-#: ../clients/cli/connections.c:7882
+#: ../clients/cli/connections.c:7885
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Помилка: невідомий параметр: «%s»\n"
 
-#: ../clients/cli/connections.c:7887
+#: ../clients/cli/connections.c:7890
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "Помилка: у з'єднання немає параметра «%s».\n"
 
-#: ../clients/cli/connections.c:7918
+#: ../clients/cli/connections.c:7921
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "Помилка: некоректна властивість: %s%s\n"
 
-#: ../clients/cli/connections.c:7920
+#: ../clients/cli/connections.c:7923
 msgid ", neither a valid setting name"
 msgstr ", і не є коректною назвою параметра"
 
-#: ../clients/cli/connections.c:7936
+#: ../clients/cli/connections.c:7939
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Некоректний параметр verify: %s\n"
 
-#: ../clients/cli/connections.c:7945
+#: ../clients/cli/connections.c:7948
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Перевірка параметра «%s»: %s\n"
 
-#: ../clients/cli/connections.c:7961
+#: ../clients/cli/connections.c:7964
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Перевірка з'єднання: %s\n"
 
-#: ../clients/cli/connections.c:7964
+#: ../clients/cli/connections.c:7967
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "Помилку не можна виправити у автоматичному режимі.\n"
 
-#: ../clients/cli/connections.c:7984
+#: ../clients/cli/connections.c:7987
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "Помилка: некоректний аргумент «%s»\n"
 
-#: ../clients/cli/connections.c:8034
+#: ../clients/cli/connections.c:8037
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "Помилка: не вдалося додати з'єднання «%s» (%s): %s\n"
 
-#: ../clients/cli/connections.c:8040
+#: ../clients/cli/connections.c:8043
 #, c-format
 msgid "Error: Timeout saving '%s' (%s) connection\n"
 msgstr ""
 "Помилка: перевищення часу очікування на збереження з'єднання «%s» (%s)\n"
 
-#: ../clients/cli/connections.c:8045
+#: ../clients/cli/connections.c:8048
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Запис з'єднання «%s» (%s) успішно збережено.\n"
 
-#: ../clients/cli/connections.c:8046
+#: ../clients/cli/connections.c:8049
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "Запис з'єднання «%s» (%s) успішно оновлено.\n"
 
-#: ../clients/cli/connections.c:8079
+#: ../clients/cli/connections.c:8082
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Помилка: з'єднання не пройшло перевірки: %s\n"
 
-#: ../clients/cli/connections.c:8080
+#: ../clients/cli/connections.c:8083
 msgid "(unknown error)"
 msgstr "(невідома помилка)"
 
-#: ../clients/cli/connections.c:8081
+#: ../clients/cli/connections.c:8084
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "Ви можете спробувати запустити «verify fix» для виправлення помилок.\n"
 
 #. TRANSLATORS: do not translate 'save', leave it as it is
-#: ../clients/cli/connections.c:8104
+#: ../clients/cli/connections.c:8107
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "Помилка: з'єднання не збережено. Спочатку введіть «save».\n"
 
-#: ../clients/cli/connections.c:8108
+#: ../clients/cli/connections.c:8111
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Помилка: некоректне з'єднання: %s\n"
 
-#: ../clients/cli/connections.c:8118
+#: ../clients/cli/connections.c:8121
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Помилка: не вдалося задіяти з'єднання: %s.\n"
 
-#: ../clients/cli/connections.c:8127
+#: ../clients/cli/connections.c:8130
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "Помилка: не вдалося задіяти з'єднання «%s» (%s): %s\n"
 
-#: ../clients/cli/connections.c:8134
+#: ../clients/cli/connections.c:8137
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Спостерігаємо за активацією з'єднання (натисніть будь-яку клавішу, щоб "
 "продовжити)\n"
 
-#: ../clients/cli/connections.c:8170
+#: ../clients/cli/connections.c:8173
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Помилка: рядок стану: %s\n"
 
-#: ../clients/cli/connections.c:8178
+#: ../clients/cli/connections.c:8181
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Помилка: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:8186
+#: ../clients/cli/connections.c:8189
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "Помилка: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:8193
+#: ../clients/cli/connections.c:8196
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Поточне налаштування nmcli:\n"
 
-#: ../clients/cli/connections.c:8201
+#: ../clients/cli/connections.c:8204
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr ""
 "Некоректний параметр налаштування, «%s»; можна використовувати лише такі: "
 "[%s]\n"
 
-#: ../clients/cli/connections.c:8422
+#: ../clients/cli/connections.c:8426
 #, c-format
 msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
 msgstr ""
 "Помилка: можна вказувати лише один з параметрів «id», «filename», uuid або "
 "«path»."
 
-#: ../clients/cli/connections.c:8436 ../clients/cli/connections.c:8600
+#: ../clients/cli/connections.c:8441 ../clients/cli/connections.c:8605
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Помилка: невідоме з'єднання, «%s»."
 
-#: ../clients/cli/connections.c:8452
+#: ../clients/cli/connections.c:8458
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 "Попередження: редагування вже створеного запису з'єднання «%s»; аргумент "
 "«type» проігноровано\n"
 
-#: ../clients/cli/connections.c:8455
+#: ../clients/cli/connections.c:8461
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -2210,202 +2210,202 @@ msgstr ""
 "Попередження: редагування вже створеного запису з'єднання «%s»; аргумент "
 "«con-name» проігноровано\n"
 
-#: ../clients/cli/connections.c:8482
+#: ../clients/cli/connections.c:8488
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Коректні типи з'єднань: %s\n"
 
-#: ../clients/cli/connections.c:8484
+#: ../clients/cli/connections.c:8490
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Помилка: некоректний тип з'єднання; %s\n"
 
-#: ../clients/cli/connections.c:8520
+#: ../clients/cli/connections.c:8526
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| Інтерактивний редактор з'єднань nmcli |==="
 
-#: ../clients/cli/connections.c:8523
+#: ../clients/cli/connections.c:8529
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Редагування наявного з'єднання «%s»: «%s»"
 
-#: ../clients/cli/connections.c:8525
+#: ../clients/cli/connections.c:8531
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Додавання нового з'єднання «%s»"
 
 #. TRANSLATORS: do not translate 'help', leave it as it is
-#: ../clients/cli/connections.c:8528
+#: ../clients/cli/connections.c:8534
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Введіть «help» або «?», щоб ознайомитися зі списком доступних команд."
 
 #. TRANSLATORS: do not translate 'print', leave it as it is
-#: ../clients/cli/connections.c:8531
+#: ../clients/cli/connections.c:8537
 #, c-format
 msgid "Type 'print' to show all the connection properties."
 msgstr "Введіть «print», щоб побачити усі властивості з'єднання."
 
 #. TRANSLATORS: do not translate 'describe', leave it as it is
-#: ../clients/cli/connections.c:8534
+#: ../clients/cli/connections.c:8540
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Щоб ознайомитися з докладним описом властивості, скористайтеся командою "
 "«describe [<параметр>.<властивість>]."
 
-#: ../clients/cli/connections.c:8562
+#: ../clients/cli/connections.c:8568
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Помилка: не вдалося внести зміни до запису з'єднання «%s»: %s"
 
-#: ../clients/cli/connections.c:8568
+#: ../clients/cli/connections.c:8574
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "Зміни до з'єднання «%s» (%s) успішно внесено.\n"
 
-#: ../clients/cli/connections.c:8636
+#: ../clients/cli/connections.c:8641
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) клоновано як %s (%s).\n"
 
-#: ../clients/cli/connections.c:8695
+#: ../clients/cli/connections.c:8701
 msgid "New connection name: "
 msgstr "Нова назва з'єднання: "
 
-#: ../clients/cli/connections.c:8697
+#: ../clients/cli/connections.c:8703
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "Помилка: не вказано параметр <нова назва>."
 
-#: ../clients/cli/connections.c:8702 ../clients/cli/connections.c:9188
+#: ../clients/cli/connections.c:8709 ../clients/cli/connections.c:9194
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "Помилка: невідомий зайвий параметр: «%s»."
 
-#: ../clients/cli/connections.c:8735
+#: ../clients/cli/connections.c:8741
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "Помилка: вилучено не усі з'єднання."
 
-#: ../clients/cli/connections.c:8736
+#: ../clients/cli/connections.c:8742
 #, c-format
 msgid "Error: Connection deletion failed: %s\n"
 msgstr "Помилка: не вдалося вилучити з'єднання: %s\n"
 
-#: ../clients/cli/connections.c:8792 ../clients/cli/connections.c:8913
+#: ../clients/cli/connections.c:8798 ../clients/cli/connections.c:8918
 #, c-format
 msgid "Error: %s.\n"
 msgstr "Помилка: %s.\n"
 
-#: ../clients/cli/connections.c:8793 ../clients/cli/connections.c:8914
+#: ../clients/cli/connections.c:8799 ../clients/cli/connections.c:8919
 #, c-format
 msgid "Error: not all connections found."
 msgstr "Помилка: знайдено не усі з'єднання."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8844
+#: ../clients/cli/connections.c:8850
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "Помилка: не можна вилучати невідомі з'єднання: %s."
 
-#: ../clients/cli/connections.c:8854
+#: ../clients/cli/connections.c:8859
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: змінено профіль з'єднання\n"
 
-#: ../clients/cli/connections.c:8880
+#: ../clients/cli/connections.c:8885
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: створено профіль з'єднання\n"
 
-#: ../clients/cli/connections.c:8889
+#: ../clients/cli/connections.c:8894
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: вилучено профіль з'єднання\n"
 
-#: ../clients/cli/connections.c:8960
+#: ../clients/cli/connections.c:8964
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Помилка: не вдалося перезавантажити з'єднання: %s."
 
-#: ../clients/cli/connections.c:8992
+#: ../clients/cli/connections.c:8994
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Помилка: не вдалося завантажити з'єднання: %s."
 
-#: ../clients/cli/connections.c:9000
+#: ../clients/cli/connections.c:9002
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Не вдалося завантажити файл «%s»\n"
 
-#: ../clients/cli/connections.c:9007
+#: ../clients/cli/connections.c:9006
 msgid "File to import: "
 msgstr "Файл для імпортування: "
 
-#: ../clients/cli/connections.c:9040
+#: ../clients/cli/connections.c:9039
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Помилка: не надано аргументів."
 
-#: ../clients/cli/connections.c:9071
+#: ../clients/cli/connections.c:9072
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr ""
 "Попередження: значення «type» вже задано, зайве значення проігноровано.\n"
 
-#: ../clients/cli/connections.c:9085
+#: ../clients/cli/connections.c:9087
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr ""
 "Попередження: значення «file» вже задано, зайве значення проігноровано.\n"
 
-#: ../clients/cli/connections.c:9098
+#: ../clients/cli/connections.c:9101
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Помилка: слід вказати значення «type»."
 
-#: ../clients/cli/connections.c:9102
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "Помилка: слід вказати значення «file»."
 
-#: ../clients/cli/connections.c:9111
+#: ../clients/cli/connections.c:9116
 #, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr "Помилка: не вдалося знайти додаток VPN для %s."
 
-#: ../clients/cli/connections.c:9118 ../clients/cli/connections.c:9209
+#: ../clients/cli/connections.c:9124 ../clients/cli/connections.c:9215
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "Помилка: не вдалося завантажити додаток VPN: %s."
 
-#: ../clients/cli/connections.c:9127
+#: ../clients/cli/connections.c:9134
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "Помилка: не вдалося імпортувати «%s»: %s."
 
-#: ../clients/cli/connections.c:9195
+#: ../clients/cli/connections.c:9201
 msgid "Output file name: "
 msgstr "Назва файла результатів: "
 
-#: ../clients/cli/connections.c:9200
+#: ../clients/cli/connections.c:9206
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "Помилка: з'єднання не належить до типу VPN."
 
-#: ../clients/cli/connections.c:9222
+#: ../clients/cli/connections.c:9228
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "Помилка: не вдалося створити тимчасовий файл %s."
 
-#: ../clients/cli/connections.c:9230
+#: ../clients/cli/connections.c:9236
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "Помилка: не вдалося експортувати «%s»: %s."
 
-#: ../clients/cli/connections.c:9242
+#: ../clients/cli/connections.c:9248
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "Помилка: не вдалося прочитати тимчасовий файл «%s»: %s."
@@ -2935,16 +2935,16 @@ msgstr "Дані щодо пристрою"
 msgid "Error: 'device show': %s"
 msgstr "Помилка: «device show»: %s"
 
-#: ../clients/cli/devices.c:1759
+#: ../clients/cli/devices.c:1760
 msgid "Status of devices"
 msgstr "Стан пристрою"
 
-#: ../clients/cli/devices.c:1763
+#: ../clients/cli/devices.c:1764
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Помилка: «device status»: %s"
 
-#: ../clients/cli/devices.c:1826 ../clients/cli/general.c:514
+#: ../clients/cli/devices.c:1826 ../clients/cli/general.c:511
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Помилка: перевищено час очікування у %d с."
@@ -2987,18 +2987,18 @@ msgstr "Помилка: не вдалося задіяти з'єднання: %s
 msgid "Error: Device activation failed: %s"
 msgstr "Помилка: не вдалося активувати пристрій: %s"
 
-#: ../clients/cli/devices.c:2058
+#: ../clients/cli/devices.c:2059
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Помилка: некоректний додатковий аргумент, «%s»."
 
 #: ../clients/cli/devices.c:2128 ../clients/cli/devices.c:2143
-#: ../clients/cli/devices.c:2380
+#: ../clients/cli/devices.c:2384
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "Пристрій «%s» успішно від'єднано.\n"
 
-#: ../clients/cli/devices.c:2131 ../clients/cli/devices.c:2454
+#: ../clients/cli/devices.c:2131 ../clients/cli/devices.c:2457
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "Пристрій «%s» успішно вилучено.\n"
@@ -3014,101 +3014,101 @@ msgstr ""
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "З'єднання успішно повторно застосовано до пристрою «%s».\n"
 
-#: ../clients/cli/devices.c:2297
+#: ../clients/cli/devices.c:2299
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr ""
 "Помилка: спроба читання застосованого з'єднання з пристрою «%s» (%s) зазнала "
 "невдачі: %s"
 
-#: ../clients/cli/devices.c:2364
+#: ../clients/cli/devices.c:2368
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "Помилка: не усі пристрої від'єднано."
 
-#: ../clients/cli/devices.c:2365
+#: ../clients/cli/devices.c:2369
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "Помилка: невдала спроба від'єднання «%s» (%s): %s\n"
 
-#: ../clients/cli/devices.c:2445
+#: ../clients/cli/devices.c:2448
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "Помилка: вилучено не усі пристрої."
 
-#: ../clients/cli/devices.c:2446
+#: ../clients/cli/devices.c:2449
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "Помилка: помилка під час спроби вилучення пристрою «%s» (%s): %s\n"
 
-#: ../clients/cli/devices.c:2528
+#: ../clients/cli/devices.c:2531
 #, c-format
 msgid "Error: No property specified."
 msgstr "Помилка: не вказано властивості."
 
-#: ../clients/cli/devices.c:2543 ../clients/cli/devices.c:2560
-#: ../clients/cli/general.c:773 ../clients/cli/general.c:785
+#: ../clients/cli/devices.c:2547 ../clients/cli/devices.c:2566
+#: ../clients/cli/general.c:769 ../clients/cli/general.c:782
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Помилка: пропущено параметр %s."
 
-#: ../clients/cli/devices.c:2549
+#: ../clients/cli/devices.c:2554
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "Помилка: «managed»: %s."
 
-#: ../clients/cli/devices.c:2566
+#: ../clients/cli/devices.c:2573
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Помилка: «autoconnect»: %s."
 
-#: ../clients/cli/devices.c:2574 ../clients/cli/general.c:799
+#: ../clients/cli/devices.c:2582 ../clients/cli/general.c:797
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "Помилка: властивість «%s» є невідомою."
 
-#: ../clients/cli/devices.c:2623
+#: ../clients/cli/devices.c:2630
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: використовуємо з'єднання «%s»\n"
 
-#: ../clients/cli/devices.c:2649
+#: ../clients/cli/devices.c:2656
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: створено запис пристрою\n"
 
-#: ../clients/cli/devices.c:2656
+#: ../clients/cli/devices.c:2663
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: пристрій вилучено\n"
 
-#: ../clients/cli/devices.c:2836
+#: ../clients/cli/devices.c:2842
 msgid "Wi-Fi scan list"
 msgstr "Список сканування Wi-Fi"
 
-#: ../clients/cli/devices.c:2954 ../clients/cli/devices.c:3179
+#: ../clients/cli/devices.c:2960 ../clients/cli/devices.c:3236
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Помилка: не знайдено точки доступу з bssid «%s»."
 
-#: ../clients/cli/devices.c:3106
+#: ../clients/cli/devices.c:3159
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Помилка: «device wifi»: %s"
 
-#: ../clients/cli/devices.c:3123
+#: ../clients/cli/devices.c:3178
 #, c-format
 msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
 msgstr ""
 "Помилка: некоректний аргумент rescan: «%s» не належить до набору [auto, no, "
 "yes]"
 
-#: ../clients/cli/devices.c:3161
+#: ../clients/cli/devices.c:3217
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Помилка: не знайдено пристрій «%s»."
 
-#: ../clients/cli/devices.c:3166
+#: ../clients/cli/devices.c:3222
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -3117,28 +3117,28 @@ msgstr ""
 "Помилка: пристрій «%s» не розпізнано як пристрій Wi-Fi, перевірте, чи працює "
 "додаток Wi-Fi NetworkManager."
 
-#: ../clients/cli/devices.c:3170 ../clients/cli/devices.c:3499
-#: ../clients/cli/devices.c:4075 ../clients/cli/devices.c:4203
-#: ../clients/cli/devices.c:4338
+#: ../clients/cli/devices.c:3226 ../clients/cli/devices.c:3555
+#: ../clients/cli/devices.c:4140 ../clients/cli/devices.c:4268
+#: ../clients/cli/devices.c:4401
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Помилка: пристрій «%s» не є пристроєм Wi-Fi."
 
-#: ../clients/cli/devices.c:3346
+#: ../clients/cli/devices.c:3402
 msgid "SSID or BSSID: "
 msgstr "SSID або BSSID: "
 
-#: ../clients/cli/devices.c:3351
+#: ../clients/cli/devices.c:3407
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Помилка: не вистачає SSID або BSSID."
 
-#: ../clients/cli/devices.c:3388
+#: ../clients/cli/devices.c:3444
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Помилка: значення параметра bssid, «%s», не є коректним BSSID."
 
-#: ../clients/cli/devices.c:3418
+#: ../clients/cli/devices.c:3474
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -3146,49 +3146,49 @@ msgstr ""
 "Помилка: значення параметра wep-key-type, «%s», є некоректним, слід "
 "використовувати «key» або «phrase»."
 
-#: ../clients/cli/devices.c:3445 ../clients/cli/devices.c:3463
+#: ../clients/cli/devices.c:3501 ../clients/cli/devices.c:3519
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Помилка: %s: %s."
 
-#: ../clients/cli/devices.c:3482
+#: ../clients/cli/devices.c:3538
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 "Помилка: BSSID для з'єднання з (%s) відрізняється від параметра bssid (%s)."
 
-#: ../clients/cli/devices.c:3488
+#: ../clients/cli/devices.c:3544
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Помилка: параметр «%s» не дорівнює ні SSID, ні BSSID."
 
-#: ../clients/cli/devices.c:3501 ../clients/cli/devices.c:4077
-#: ../clients/cli/devices.c:4205 ../clients/cli/devices.c:4439
+#: ../clients/cli/devices.c:3557 ../clients/cli/devices.c:4142
+#: ../clients/cli/devices.c:4270 ../clients/cli/devices.c:4506
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Помилка: не знайдено жодного пристрою Wi-Fi."
 
-#: ../clients/cli/devices.c:3521
+#: ../clients/cli/devices.c:3577
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "Помилка: неможливо виконати сканування прихованого SSID: %s."
 
-#: ../clients/cli/devices.c:3548
+#: ../clients/cli/devices.c:3604
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Помилка: не знайдено мережі з SSID «%s»."
 
-#: ../clients/cli/devices.c:3550
+#: ../clients/cli/devices.c:3606
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Помилка: не знайдено точки доступу з BSSID «%s»."
 
-#: ../clients/cli/devices.c:3577
+#: ../clients/cli/devices.c:3633
 #, c-format
 msgid "Error: Connection '%s' exists but properties don't match."
 msgstr "Помилка: існує з'єднання «%s», але його властивості є невідповідними."
 
-#: ../clients/cli/devices.c:3620
+#: ../clients/cli/devices.c:3676
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
@@ -3196,159 +3196,159 @@ msgstr ""
 "Попередження: «%s» має бути SSID для прихованих точок доступу; втім, "
 "здається, маємо BSSID.\n"
 
-#: ../clients/cli/devices.c:3657
+#: ../clients/cli/devices.c:3713
 msgid "Password: "
 msgstr "Пароль: "
 
-#: ../clients/cli/devices.c:3798
+#: ../clients/cli/devices.c:3852
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "«%s» не є коректним PSK WPA"
 
-#: ../clients/cli/devices.c:3815
+#: ../clients/cli/devices.c:3869
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr ""
 "«%s» не є коректним ключем WEP (коректний ключ має складатися з 5 або 13 "
 "символів ASCII)"
 
-#: ../clients/cli/devices.c:3831
+#: ../clients/cli/devices.c:3885
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "Пароль до точки доступу: %s\n"
 
-#: ../clients/cli/devices.c:3996
+#: ../clients/cli/devices.c:4053
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "Помилка: SSID є надто довгим."
 
-#: ../clients/cli/devices.c:4011
+#: ../clients/cli/devices.c:4070
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
 "Помилка: значення аргументу «band» «%s» є некоректним; має бути «a» або «bg»."
 
-#: ../clients/cli/devices.c:4058
+#: ../clients/cli/devices.c:4121
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "Помилка: разом із каналом слід вказати смугу."
 
-#: ../clients/cli/devices.c:4063
+#: ../clients/cli/devices.c:4127
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "Помилка: не можна використовувати канал «%s» для смуги «%s»."
 
-#: ../clients/cli/devices.c:4088
+#: ../clients/cli/devices.c:4154
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr ""
 "Помилка: для пристрою «%s» не передбачено ні режиму точки доступу, ні режиму "
 "Ad-Hoc."
 
-#: ../clients/cli/devices.c:4110
+#: ../clients/cli/devices.c:4177
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "Помилка: некоректне значення «password»: %s."
 
-#: ../clients/cli/devices.c:4163 ../clients/cli/devices.c:4390
+#: ../clients/cli/devices.c:4228 ../clients/cli/devices.c:4453
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "Помилка: не можна повторювати «%s»."
 
-#: ../clients/cli/devices.c:4296 ../clients/cli/devices.c:4300
-#: ../clients/cli/devices.c:4305 ../clients/cli/devices.c:4308
+#: ../clients/cli/devices.c:4359 ../clients/cli/devices.c:4363
+#: ../clients/cli/devices.c:4368 ../clients/cli/devices.c:4371
 #: ../clients/tui/nmt-page-wifi.c:250
 msgid "Security"
 msgstr "Захист"
 
-#: ../clients/cli/devices.c:4296
+#: ../clients/cli/devices.c:4359
 msgid "None"
 msgstr "Немає"
 
-#: ../clients/cli/devices.c:4312 ../clients/common/nm-secret-agent-simple.c:273
+#: ../clients/cli/devices.c:4375 ../clients/common/nm-secret-agent-simple.c:273
 #: ../clients/common/nm-secret-agent-simple.c:310
 #: ../clients/common/nm-secret-agent-simple.c:333
 #: ../clients/common/nm-secret-agent-simple.c:366
 #: ../clients/common/nm-secret-agent-simple.c:903
 #: ../clients/common/nm-secret-agent-simple.c:938
 #: ../clients/common/nm-secret-agent-simple.c:961
-#: ../clients/common/nm-vpn-helpers.c:110
-#: ../clients/common/nm-vpn-helpers.c:114
-#: ../clients/common/nm-vpn-helpers.c:120
-#: ../clients/common/nm-vpn-helpers.c:125 ../clients/tui/nmt-page-dsl.c:62
+#: ../clients/common/nm-vpn-helpers.c:137
+#: ../clients/common/nm-vpn-helpers.c:143
+#: ../clients/common/nm-vpn-helpers.c:151
+#: ../clients/common/nm-vpn-helpers.c:160 ../clients/tui/nmt-page-dsl.c:62
 #: ../clients/tui/nmt-page-wifi.c:266 ../clients/tui/nmt-page-wifi.c:298
 #: ../clients/tui/nmt-page-wifi.c:331
 msgid "Password"
 msgstr "Пароль"
 
-#: ../clients/cli/devices.c:4427
+#: ../clients/cli/devices.c:4493
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. Main header name
-#: ../clients/cli/devices.c:4483
+#: ../clients/cli/devices.c:4547
 msgid "Device LLDP neighbors"
 msgstr "LLDP-сусіди пристрою"
 
-#: ../clients/cli/devices.c:4593
+#: ../clients/cli/devices.c:4660
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "Помилка: «device lldp list»: %s"
 
-#: ../clients/cli/general.c:34
+#: ../clients/cli/general.c:32
 msgid "asleep"
 msgstr "приспаний"
 
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:33
 msgid "connecting"
 msgstr "з'єднується"
 
-#: ../clients/cli/general.c:36
+#: ../clients/cli/general.c:34
 msgid "connected (local only)"
 msgstr "з'єднується (локально)"
 
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:35
 msgid "connected (site only)"
 msgstr "з'єднано (на вузлі)"
 
-#: ../clients/cli/general.c:38 ../clients/common/nm-client-utils.c:260
+#: ../clients/cli/general.c:36 ../clients/common/nm-client-utils.c:260
 msgid "connected"
 msgstr "з'єднано"
 
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:37
 msgid "disconnecting"
 msgstr "роз'єднується"
 
-#: ../clients/cli/general.c:40 ../clients/common/nm-client-utils.c:253
+#: ../clients/cli/general.c:38 ../clients/common/nm-client-utils.c:253
 msgid "disconnected"
 msgstr "роз'єднано"
 
-#: ../clients/cli/general.c:96
+#: ../clients/cli/general.c:94
 msgid "auth"
 msgstr "розпізн"
 
-#: ../clients/cli/general.c:125
+#: ../clients/cli/general.c:123
 msgid "running"
 msgstr "виконується"
 
-#: ../clients/cli/general.c:139
+#: ../clients/cli/general.c:137
 msgid "starting"
 msgstr "запуск"
 
-#: ../clients/cli/general.c:139
+#: ../clients/cli/general.c:137
 msgid "started"
 msgstr "запущено"
 
-#: ../clients/cli/general.c:173
+#: ../clients/cli/general.c:171
 msgid "enabled"
 msgstr "увімкнено"
 
-#: ../clients/cli/general.c:173
+#: ../clients/cli/general.c:171
 msgid "disabled"
 msgstr "вимкнено"
 
-#: ../clients/cli/general.c:291
+#: ../clients/cli/general.c:289
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3378,7 +3378,7 @@ msgstr ""
 "журналу>]\n"
 "\n"
 
-#: ../clients/cli/general.c:302
+#: ../clients/cli/general.c:300
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3395,7 +3395,7 @@ msgstr ""
 "status»\n"
 "\n"
 
-#: ../clients/cli/general.c:311
+#: ../clients/cli/general.c:309
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3420,7 +3420,7 @@ msgstr ""
 "назвою вузла системи.\n"
 "\n"
 
-#: ../clients/cli/general.c:323
+#: ../clients/cli/general.c:321
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -3434,7 +3434,7 @@ msgstr ""
 "пройти розпізнавання.\n"
 "\n"
 
-#: ../clients/cli/general.c:331
+#: ../clients/cli/general.c:329
 #, c-format
 msgid ""
 "Usage: nmcli general reload { ARGUMENTS | help }\n"
@@ -3495,7 +3495,7 @@ msgstr ""
 "Якщо прапорців не вказано, буде перезавантажено усі підтримувані дані,\n"
 "тобто виконано усі дії, які буде виконано, якщо надіслано сигнал SIGHUP.\n"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:361
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3522,7 +3522,7 @@ msgstr ""
 "журналювання наведено на сторінці підручника (man).\n"
 "\n"
 
-#: ../clients/cli/general.c:376
+#: ../clients/cli/general.c:374
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3547,7 +3547,7 @@ msgstr ""
 "  connectivity [перевірити]\n"
 "\n"
 
-#: ../clients/cli/general.c:386
+#: ../clients/cli/general.c:384
 #, c-format
 msgid ""
 "Usage: nmcli networking on { help }\n"
@@ -3560,7 +3560,7 @@ msgstr ""
 "Увімкнути роботу у мережі\n"
 "\n"
 
-#: ../clients/cli/general.c:394
+#: ../clients/cli/general.c:392
 #, c-format
 msgid ""
 "Usage: nmcli networking off { help }\n"
@@ -3573,7 +3573,7 @@ msgstr ""
 "Вимкнути роботу у мережі.\n"
 "\n"
 
-#: ../clients/cli/general.c:402
+#: ../clients/cli/general.c:400
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3594,7 +3594,7 @@ msgstr ""
 "виконати повторну перевірку можливості з'єднання.\n"
 "\n"
 
-#: ../clients/cli/general.c:414
+#: ../clients/cli/general.c:412
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3611,7 +3611,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:423
+#: ../clients/cli/general.c:421
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3628,7 +3628,7 @@ msgstr ""
 "Отримати стан усіх перемикачів або перемкнути їх (увімкнути чи вимкнути).\n"
 "\n"
 
-#: ../clients/cli/general.c:433
+#: ../clients/cli/general.c:431
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3645,7 +3645,7 @@ msgstr ""
 "Отримати стан перемикача Wi-Fi або перемкнути його (увімкнути чи вимкнути).\n"
 "\n"
 
-#: ../clients/cli/general.c:443
+#: ../clients/cli/general.c:441
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3663,7 +3663,7 @@ msgstr ""
 "(увімкнути чи вимкнути).\n"
 "\n"
 
-#: ../clients/cli/general.c:453
+#: ../clients/cli/general.c:451
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3679,223 +3679,223 @@ msgstr ""
 "зміни\n"
 "\n"
 
-#: ../clients/cli/general.c:483
+#: ../clients/cli/general.c:481
 msgid "NetworkManager status"
 msgstr "Стан NetworkManager"
 
-#: ../clients/cli/general.c:487
+#: ../clients/cli/general.c:485
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Помилка: можна використовувати лише такі поля: %s"
 
 #. NetworkManager quit while we were waiting.
-#: ../clients/cli/general.c:544 ../clients/tui/nmtui.c:246
+#: ../clients/cli/general.c:541 ../clients/tui/nmtui.c:246
 #, c-format
 msgid "NetworkManager is not running."
 msgstr "NetworkManager не запущено."
 
-#: ../clients/cli/general.c:564
+#: ../clients/cli/general.c:561
 msgid "NetworkManager permissions"
 msgstr "Права доступу NetworkManager"
 
-#: ../clients/cli/general.c:568
+#: ../clients/cli/general.c:565
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Помилка: «general permissions»: %s"
 
-#: ../clients/cli/general.c:645
+#: ../clients/cli/general.c:642
 #, c-format
 msgid "Error: invalid reload flag '%s'. Allowed flags are: %s"
 msgstr ""
 "Помилка: некоректний прапорець перезавантаження «%s». Дозволеними прапорцями "
 "є %s"
 
-#: ../clients/cli/general.c:655
+#: ../clients/cli/general.c:653
 #, c-format
 msgid "Error: extra argument '%s'"
 msgstr "Помилка: зайвий аргумент «%s»"
 
-#: ../clients/cli/general.c:669
+#: ../clients/cli/general.c:668
 #, c-format
 msgid "Error: failed to reload: %s"
 msgstr "Помилка: не вдалося перезавантажити: %s"
 
-#: ../clients/cli/general.c:708
+#: ../clients/cli/general.c:704
 msgid "NetworkManager logging"
 msgstr "Ведення журналу NetworkManager"
 
-#: ../clients/cli/general.c:712
+#: ../clients/cli/general.c:708
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Помилка: «general logging»: %s"
 
-#: ../clients/cli/general.c:744
+#: ../clients/cli/general.c:740
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "Помилка: не вдалося встановити параметри ведення журналу: %s"
 
-#: ../clients/cli/general.c:833
+#: ../clients/cli/general.c:830
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "Помилка: не вдалося встановити назву вузла: %s"
 
-#: ../clients/cli/general.c:903
+#: ../clients/cli/general.c:891
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr ""
 "Помилка: значення «--fields» «%s» не можна використовувати тут (дозволене "
 "поле: %s)"
 
-#: ../clients/cli/general.c:928
+#: ../clients/cli/general.c:916
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Помилка: некоректний аргумент «%s»: «%s» (мало бути on/off)."
 
-#: ../clients/cli/general.c:951
+#: ../clients/cli/general.c:939
 #, c-format
 msgid "Error: failed to set networking: %s"
 msgstr "Помилка: не вдалося встановити параметри роботи у мережі: %s"
 
 #. no arguments -> get current state
-#: ../clients/cli/general.c:1008 ../clients/cli/general.c:1020
+#: ../clients/cli/general.c:984 ../clients/cli/general.c:996
 msgid "Connectivity"
 msgstr "Можливість з'єднання"
 
-#: ../clients/cli/general.c:1023
+#: ../clients/cli/general.c:999
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Помилка: команда «networking» «%s» є некоректною."
 
-#: ../clients/cli/general.c:1037
+#: ../clients/cli/general.c:1011
 msgid "Networking"
 msgstr "Робота у мережі"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:1072
+#: ../clients/cli/general.c:1039
 msgid "Radio switches"
 msgstr "Радіоперемикачі"
 
-#: ../clients/cli/general.c:1099
+#: ../clients/cli/general.c:1064
 #, c-format
 msgid "Error: failed to set Wi-Fi radio: %s"
 msgstr "Помилка: не вдалося налаштувати радіозв'язок Wi-Fi: %s"
 
 #. no argument, show current Wi-Fi state
-#: ../clients/cli/general.c:1117
+#: ../clients/cli/general.c:1082
 msgid "Wi-Fi radio switch"
 msgstr "Перемикач Wi-Fi"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1155
+#: ../clients/cli/general.c:1118
 msgid "WWAN radio switch"
 msgstr "Перемикач WWAN"
 
-#: ../clients/cli/general.c:1203
+#: ../clients/cli/general.c:1158
 msgid "NetworkManager has started"
 msgstr "Запущено NetworkManager"
 
-#: ../clients/cli/general.c:1203
+#: ../clients/cli/general.c:1158
 msgid "NetworkManager has stopped"
 msgstr "Зупинено NetworkManager"
 
-#: ../clients/cli/general.c:1214
+#: ../clients/cli/general.c:1169
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "Встановлено назву вузла «%s»\n"
 
-#: ../clients/cli/general.c:1229
+#: ../clients/cli/general.c:1184
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "«%s» є тепер основним з'єднанням\n"
 
-#: ../clients/cli/general.c:1231
+#: ../clients/cli/general.c:1186
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "Немає основного з'єднання\n"
 
-#: ../clients/cli/general.c:1243
+#: ../clients/cli/general.c:1198
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "Значенням можливості з'єднання тепер є «%s»\n"
 
-#: ../clients/cli/general.c:1257
+#: ../clients/cli/general.c:1212
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "Networkmanager тепер перебуває у стані «%s»\n"
 
-#: ../clients/cli/general.c:1277
+#: ../clients/cli/general.c:1232
 msgid "connection available"
 msgstr "доступне з'єднання"
 
-#: ../clients/cli/general.c:1279
+#: ../clients/cli/general.c:1234
 msgid "connections available"
 msgstr "доступні з'єднання"
 
-#: ../clients/cli/general.c:1297
+#: ../clients/cli/general.c:1252
 msgid "autoconnect"
 msgstr "автоз'єднання"
 
-#: ../clients/cli/general.c:1299
+#: ../clients/cli/general.c:1254
 msgid "fw missing"
 msgstr "пропущено fw"
 
-#: ../clients/cli/general.c:1304
+#: ../clients/cli/general.c:1259
 msgid "plugin missing"
 msgstr "не вказано додатка"
 
-#: ../clients/cli/general.c:1314 ../clients/cli/general.c:1328
+#: ../clients/cli/general.c:1269 ../clients/cli/general.c:1283
 msgid "sw disabled"
 msgstr "sw вимкнено"
 
-#: ../clients/cli/general.c:1319 ../clients/cli/general.c:1333
+#: ../clients/cli/general.c:1274 ../clients/cli/general.c:1288
 msgid "hw disabled"
 msgstr "hw вимкнено"
 
-#: ../clients/cli/general.c:1344
+#: ../clients/cli/general.c:1299
 msgid "sw"
 msgstr "sw"
 
-#: ../clients/cli/general.c:1346
+#: ../clients/cli/general.c:1301
 msgid "hw"
 msgstr "hw"
 
-#: ../clients/cli/general.c:1351
+#: ../clients/cli/general.c:1306
 msgid "iface"
 msgstr "інтерфейс"
 
-#: ../clients/cli/general.c:1354
+#: ../clients/cli/general.c:1309
 msgid "port"
 msgstr "порт"
 
-#: ../clients/cli/general.c:1357
+#: ../clients/cli/general.c:1312
 msgid "mtu"
 msgstr "mtu"
 
-#: ../clients/cli/general.c:1374
+#: ../clients/cli/general.c:1329
 msgid "master"
 msgstr "основний"
 
-#: ../clients/cli/general.c:1378 ../clients/tui/nm-editor-utils.c:230
+#: ../clients/cli/general.c:1333 ../clients/tui/nm-editor-utils.c:230
 #: ../clients/tui/nmt-connect-connection-list.c:394
 msgid "VPN"
 msgstr "VPN"
 
-#: ../clients/cli/general.c:1380
+#: ../clients/cli/general.c:1335
 msgid "ip4 default"
 msgstr "типова ip4"
 
-#: ../clients/cli/general.c:1382
+#: ../clients/cli/general.c:1337
 msgid "ip6 default"
 msgstr "типова ip6"
 
-#: ../clients/cli/general.c:1464
+#: ../clients/cli/general.c:1416
 #, c-format
 msgid "%s VPN connection"
 msgstr "З'єднання VPN %s"
 
 #. TRANSLATORS: prints header line for activated device in plain `nmcli` overview output as
 #. * "<interface-name>: <device-state> to <connection-id>"
-#: ../clients/cli/general.c:1484
+#: ../clients/cli/general.c:1436
 #, c-format
 msgctxt "nmcli-overview"
 msgid "%s: %s to %s"
@@ -3903,13 +3903,13 @@ msgstr "%s: %s до %s"
 
 #. TRANSLATORS: prints header line for not active device in plain `nmcli` overview output as
 #. * "<interface-name>: <device-state>"
-#: ../clients/cli/general.c:1491
+#: ../clients/cli/general.c:1443
 #, c-format
 msgctxt "nmcli-overview"
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../clients/cli/general.c:1541
+#: ../clients/cli/general.c:1493
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3926,16 +3926,16 @@ msgstr ""
 "Докладний опис використання програм можна знайти на сторінках підручника "
 "(man) nmcli(1) та nmcli-examples(7).\n"
 
-#: ../clients/cli/general.c:1562
+#: ../clients/cli/general.c:1509
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "Помилка: команда «monitor» «%s» є некоректною."
 
-#: ../clients/cli/general.c:1574
+#: ../clients/cli/general.c:1521
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "Networkmanager не запущено (очікуємо на запуск)\n"
 
-#: ../clients/cli/nmcli.c:233
+#: ../clients/cli/nmcli.c:231
 #, c-format
 msgid ""
 "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -3998,84 +3998,84 @@ msgstr ""
 "  m[onitor]       стежити за змінами у NetworkManager\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:313
+#: ../clients/cli/nmcli.c:306
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Помилка: не вказано аргумент параметра «%s»."
 
-#: ../clients/cli/nmcli.c:621
+#: ../clients/cli/nmcli.c:617
 #, c-format
 msgid "Unexpected end of file following '%s'\n"
 msgstr "Неочікуваний кінець файла із наступним «%s»\n"
 
-#: ../clients/cli/nmcli.c:629
+#: ../clients/cli/nmcli.c:625
 #, c-format
 msgid "Expected whitespace following '%s'\n"
 msgstr "Мав бути пробіл із наступним «%s»\n"
 
-#: ../clients/cli/nmcli.c:641
+#: ../clients/cli/nmcli.c:637
 #, c-format
 msgid "Expected a value for '%s'\n"
 msgstr "Мало бути значення для «%s»\n"
 
-#: ../clients/cli/nmcli.c:655
+#: ../clients/cli/nmcli.c:651
 #, c-format
 msgid "Expected a line break following '%s'\n"
 msgstr "Мав бути символ розриву рядка із наступним «%s»\n"
 
-#: ../clients/cli/nmcli.c:744
+#: ../clients/cli/nmcli.c:757
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Помилка: параметр «--terse» вказано двічі."
 
-#: ../clients/cli/nmcli.c:749
+#: ../clients/cli/nmcli.c:762
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr ""
 "Помилка: параметр «--terse» і «--pretty» не можна використовувати одночасно."
 
-#: ../clients/cli/nmcli.c:757
+#: ../clients/cli/nmcli.c:770
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Помилка: параметр «--pretty» вказано двічі."
 
-#: ../clients/cli/nmcli.c:762
+#: ../clients/cli/nmcli.c:775
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr ""
 "Помилка: параметр «--pretty» і «--terse» не можна використовувати одночасно"
 
-#: ../clients/cli/nmcli.c:777
+#: ../clients/cli/nmcli.c:790
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
 msgstr "Помилка: «%s» не є коректним аргументом «%s»."
 
-#: ../clients/cli/nmcli.c:791 ../clients/cli/nmcli.c:803
+#: ../clients/cli/nmcli.c:804 ../clients/cli/nmcli.c:816
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Помилка: «%s» не є коректним аргументом «%s»."
 
-#: ../clients/cli/nmcli.c:827
+#: ../clients/cli/nmcli.c:840
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
 msgstr "Помилка: «%s» не є коректним часом очікування."
 
-#: ../clients/cli/nmcli.c:834
+#: ../clients/cli/nmcli.c:847
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "інструмент nmcli, версія %s\n"
 
-#: ../clients/cli/nmcli.c:842
+#: ../clients/cli/nmcli.c:855
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Помилка: невідомий параметр «%s», спробуйте «nmcli -help»."
 
-#: ../clients/cli/nmcli.c:898 ../clients/cli/nmcli.c:905
+#: ../clients/cli/nmcli.c:911 ../clients/cli/nmcli.c:918
 #, c-format
 msgid "Error: nmcli terminated by signal %s (%d)"
 msgstr "Помилка: роботу nmcli перервано сигналом %s (%d)"
 
-#: ../clients/cli/nmcli.c:973
+#: ../clients/cli/nmcli.c:986
 msgid "Success"
 msgstr "Виконано"
 
@@ -4208,11 +4208,11 @@ msgstr "Не вдалося створити відгалуження пейдж
 msgid "Failed to duplicate pager pipe: %s\n"
 msgstr "Не вдалося здублювати конвеєр пейджера: %s\n"
 
-#: ../clients/cli/utils.h:299 ../clients/common/nm-meta-setting-desc.c:4099
+#: ../clients/cli/utils.h:299 ../clients/common/nm-meta-setting-desc.c:4139
 msgid "on"
 msgstr "увімкн."
 
-#: ../clients/cli/utils.h:299 ../clients/common/nm-meta-setting-desc.c:4101
+#: ../clients/cli/utils.h:299 ../clients/common/nm-meta-setting-desc.c:4141
 msgid "off"
 msgstr "вимкн."
 
@@ -4717,138 +4717,138 @@ msgstr "не вдалося прочитати налаштування кома
 msgid "team config file '%s' contains non-valid utf-8"
 msgstr "файл налаштувань команди «%s» містить некоректний код utf-8"
 
-#: ../clients/common/nm-meta-setting-desc.c:1018
+#: ../clients/common/nm-meta-setting-desc.c:1036
 msgid "auto"
 msgstr "авто"
 
-#: ../clients/common/nm-meta-setting-desc.c:1170
+#: ../clients/common/nm-meta-setting-desc.c:1188
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1318
-#: ../clients/common/nm-meta-setting-desc.c:1322
+#: ../clients/common/nm-meta-setting-desc.c:1352
+#: ../clients/common/nm-meta-setting-desc.c:1356
 msgid "'%s' is out of range [%"
 msgstr "«%s» поза діапазоном [%"
 
-#: ../clients/common/nm-meta-setting-desc.c:1327
+#: ../clients/common/nm-meta-setting-desc.c:1361
 #, c-format
 msgid "'%s' is not a valid number"
 msgstr "«%s» не є коректним числом"
 
-#: ../clients/common/nm-meta-setting-desc.c:1384
+#: ../clients/common/nm-meta-setting-desc.c:1418
 #, c-format
 msgid "'%s' is out of range [0, %u]"
 msgstr "«%s» поза діапазоном [0, %u]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1430
+#: ../clients/common/nm-meta-setting-desc.c:1464
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "«%s» не є коректним значенням MAC-адреси Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:1556
+#: ../clients/common/nm-meta-setting-desc.c:1590
 #, c-format
 msgid "invalid option '%s', use a combination of [%s]"
 msgstr "некоректний параметр «%s», скористайтеся комбінацією [%s]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1561
-#: ../shared/nm-keyfile/nm-keyfile.c:926
+#: ../clients/common/nm-meta-setting-desc.c:1595
+#: ../shared/nm-keyfile/nm-keyfile.c:927
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr ""
 "некоректний параметр «%s», скористайтеся одним із таких параметрів [%s]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1680
+#: ../clients/common/nm-meta-setting-desc.c:1714
 #, c-format
 msgid "%d (key)"
 msgstr "%d (ключ)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1682
+#: ../clients/common/nm-meta-setting-desc.c:1716
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (пароль)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1685
+#: ../clients/common/nm-meta-setting-desc.c:1719
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (невідомо)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1698
+#: ../clients/common/nm-meta-setting-desc.c:1732
 msgid "0 (NONE)"
 msgstr "0 (НЕМАЄ)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1704
+#: ../clients/common/nm-meta-setting-desc.c:1738
 msgid "REORDER_HEADERS, "
 msgstr "ПЕРЕВПОРЯДКОВУВАННЯ_ЗАГОЛОВКІВ, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1706
+#: ../clients/common/nm-meta-setting-desc.c:1740
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1708
+#: ../clients/common/nm-meta-setting-desc.c:1742
 msgid "LOOSE_BINDING, "
 msgstr "ШИРОКЕ_ПРИВ'ЯЗУВАННЯ, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1710
+#: ../clients/common/nm-meta-setting-desc.c:1744
 msgid "MVRP, "
 msgstr "MVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1731
+#: ../clients/common/nm-meta-setting-desc.c:1765
 msgid "0 (none)"
 msgstr "0 (немає)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1737
+#: ../clients/common/nm-meta-setting-desc.c:1771
 msgid "agent-owned, "
 msgstr ", власником є агент, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1739
+#: ../clients/common/nm-meta-setting-desc.c:1773
 msgid "not saved, "
 msgstr "не збережено, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1741
+#: ../clients/common/nm-meta-setting-desc.c:1775
 msgid "not required, "
 msgstr "не є обов'язковим, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1941
+#: ../clients/common/nm-meta-setting-desc.c:1975
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr ""
 "Запис «%s» є некоректним; слід використовувати формат <параметр>=<значення>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1951
+#: ../clients/common/nm-meta-setting-desc.c:1985
 #, c-format
 msgid "cannot set empty \"%s\" option"
 msgstr "не можна встановлювати порожнє значення параметра «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:2010
+#: ../clients/common/nm-meta-setting-desc.c:2044
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "прапорці «%u» не є коректними; скористайтеся комбінацією з %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:2027
+#: ../clients/common/nm-meta-setting-desc.c:2061
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr ""
 "«%s» не є коректним значенням номер (або лежить поза діапазоном припустимих "
 "номерів)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2048
-#: ../clients/common/nm-meta-setting-desc.c:4015
+#: ../clients/common/nm-meta-setting-desc.c:2082
+#: ../clients/common/nm-meta-setting-desc.c:4055
 #: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:556
 #, c-format
 msgid "'%s' is not valid"
 msgstr "«%s» не є коректним"
 
-#: ../clients/common/nm-meta-setting-desc.c:2143
+#: ../clients/common/nm-meta-setting-desc.c:2177
 msgid "not a valid hex-string"
 msgstr "не є коректним шістнадцятковим рядком"
 
-#: ../clients/common/nm-meta-setting-desc.c:2159
+#: ../clients/common/nm-meta-setting-desc.c:2193
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "«%s» не є коректним шістнадцятковим символом"
 
-#: ../clients/common/nm-meta-setting-desc.c:2238
+#: ../clients/common/nm-meta-setting-desc.c:2272
 msgid ""
 "too many arguments. Please only specify a private key file and optionally a "
 "password"
@@ -4856,12 +4856,12 @@ msgstr ""
 "забагато аргументів. Будь ласка, вкажіть файл закритого ключа і, "
 "необов'язково, пароль"
 
-#: ../clients/common/nm-meta-setting-desc.c:2353
+#: ../clients/common/nm-meta-setting-desc.c:2387
 #, c-format
 msgid "failed to set bond option \"%s\""
 msgstr "не вдалося встановити параметр bond «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:2370
+#: ../clients/common/nm-meta-setting-desc.c:2404
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4899,125 +4899,125 @@ msgstr ""
 #. * hacky: we can not see if the type is already set, because
 #. * nmc_setting_set_property() is called only after the property
 #. * we're setting (type) has been removed.
-#: ../clients/common/nm-meta-setting-desc.c:2435
+#: ../clients/common/nm-meta-setting-desc.c:2469
 #, c-format
 msgid "Can not change the connection type"
 msgstr "Не вдалося змінити тип з'єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:2520
+#: ../clients/common/nm-meta-setting-desc.c:2554
 #, c-format
 msgid "invalid permission \"%s\""
 msgstr "некоректні права доступу «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:2620
+#: ../clients/common/nm-meta-setting-desc.c:2654
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "значення «%s» не є коректним UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:2691
+#: ../clients/common/nm-meta-setting-desc.c:2725
 msgid "0 (disabled)"
 msgstr "0 (вимкнено)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2697
+#: ../clients/common/nm-meta-setting-desc.c:2731
 msgid "enabled, "
 msgstr "увімкнено, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2699
+#: ../clients/common/nm-meta-setting-desc.c:2733
 msgid "advertise, "
 msgstr "оголошення, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2701
+#: ../clients/common/nm-meta-setting-desc.c:2735
 msgid "willing, "
 msgstr "надання, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2790
+#: ../clients/common/nm-meta-setting-desc.c:2824
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "«%s» не є коректним прапорцем DCB"
 
-#: ../clients/common/nm-meta-setting-desc.c:2817
+#: ../clients/common/nm-meta-setting-desc.c:2851
 msgid "must contain 8 comma-separated numbers"
 msgstr "має містити 8 чисел, відокремлених комами"
 
-#: ../clients/common/nm-meta-setting-desc.c:2831
+#: ../clients/common/nm-meta-setting-desc.c:2865
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "«%s» не є числом у діапазоні від 0 до %u (включно) або %u"
 
-#: ../clients/common/nm-meta-setting-desc.c:2834
+#: ../clients/common/nm-meta-setting-desc.c:2868
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "«%s» не є числом у діапазоні від 0 до %u (включно)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2855
+#: ../clients/common/nm-meta-setting-desc.c:2889
 #, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
 msgstr "зміни не буде задіяно, доки «%s» не включатиме 1 (увімкнено)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2885
+#: ../clients/common/nm-meta-setting-desc.c:2919
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "сума частин каналу у відсотках має складати 100%%"
 
-#: ../clients/common/nm-meta-setting-desc.c:2956
-#: ../clients/common/nm-meta-setting-desc.c:2962
+#: ../clients/common/nm-meta-setting-desc.c:2990
+#: ../clients/common/nm-meta-setting-desc.c:2996
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr ""
 "Ідентифікатор оператора SIM має бути п'яти- або шестицифровим кодом MCCMNC"
 
-#: ../clients/common/nm-meta-setting-desc.c:2986
+#: ../clients/common/nm-meta-setting-desc.c:3020
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "«%s» не є коректним закритим ключем IBoIP"
 
-#: ../clients/common/nm-meta-setting-desc.c:3009
+#: ../clients/common/nm-meta-setting-desc.c:3043
 msgid "default"
 msgstr "типовий"
 
-#: ../clients/common/nm-meta-setting-desc.c:3173
+#: ../clients/common/nm-meta-setting-desc.c:3207
 #, c-format
 msgid "invalid IPv%c address '%s'"
 msgstr "некоректна адреса IPv%c, «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3300
+#: ../clients/common/nm-meta-setting-desc.c:3334
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "некоректна адреса шлюзу, «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3450
+#: ../clients/common/nm-meta-setting-desc.c:3490
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "«%s» не є коректним каналом; канал має належати діапазону <1-13>"
 
-#: ../clients/common/nm-meta-setting-desc.c:3530
+#: ../clients/common/nm-meta-setting-desc.c:3570
 msgid "The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
 msgstr ""
 "Коректна синтаксична конструкція: vf [атрибут=значення]... [,vf "
 "[атрибут=значення]...]"
 
-#: ../clients/common/nm-meta-setting-desc.c:3554
-#: ../clients/common/nm-meta-setting-desc.c:3634
+#: ../clients/common/nm-meta-setting-desc.c:3594
+#: ../clients/common/nm-meta-setting-desc.c:3674
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
 msgstr ""
 "Коректний синтаксис: '[root | parent <дескриптор>] [handle <дескриптор>] "
 "<тип>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3579
+#: ../clients/common/nm-meta-setting-desc.c:3619
 msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
 msgstr "Коректний синтаксис: '<vid>[-<vid>] [pvid] [untagged]'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3775
+#: ../clients/common/nm-meta-setting-desc.c:3815
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "некоректне відображення пріоритетності, «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:3867
+#: ../clients/common/nm-meta-setting-desc.c:3907
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "«%s» не є коректним значенням; слід вказати 2 або 3 рядки"
 
-#: ../clients/common/nm-meta-setting-desc.c:3906
+#: ../clients/common/nm-meta-setting-desc.c:3946
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -5028,17 +5028,17 @@ msgstr ""
 "  параметр = <значення>, параметр = <значення>,...\n"
 "Коректні значення параметрів: %s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:3941
+#: ../clients/common/nm-meta-setting-desc.c:3981
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "«%s» не є коректним каналом"
 
-#: ../clients/common/nm-meta-setting-desc.c:3947
+#: ../clients/common/nm-meta-setting-desc.c:3987
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "«%ld» не є коректним каналом"
 
-#: ../clients/common/nm-meta-setting-desc.c:3964
+#: ../clients/common/nm-meta-setting-desc.c:4004
 #: ../libnm-core/nm-setting-sriov.c:438 ../libnm-core/nm-setting-wired.c:758
 #: ../libnm-core/nm-setting-wired.c:771 ../libnm-core/nm-setting-wired.c:824
 #: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:881
@@ -5047,7 +5047,7 @@ msgstr "«%ld» не є коректним каналом"
 msgid "'%s' is not a valid MAC address"
 msgstr "%s не є припустимою MAC-адресою"
 
-#: ../clients/common/nm-meta-setting-desc.c:4024
+#: ../clients/common/nm-meta-setting-desc.c:4064
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -5056,64 +5056,64 @@ msgstr ""
 "«%s» є несумісним з %s «%s», будь ласка, спочатку змініть ключ або "
 "встановіть правильне значення %s."
 
-#: ../clients/common/nm-meta-setting-desc.c:4034
+#: ../clients/common/nm-meta-setting-desc.c:4074
 #, c-format
 msgid "WEP key is guessed to be of '%s'"
 msgstr "Припускаємо, що ключем WEP є «%s»"
 
-#: ../clients/common/nm-meta-setting-desc.c:4039
+#: ../clients/common/nm-meta-setting-desc.c:4079
 #, c-format
 msgid "WEP key index set to '%d'"
 msgstr "індекс ключа WEP встановлено у значення «%d»"
 
-#: ../clients/common/nm-meta-setting-desc.c:4078
+#: ../clients/common/nm-meta-setting-desc.c:4118
 #, c-format
 msgid "'%s' is not compatible with '%s' type, please change or delete the key."
 msgstr "«%s» несумісний з типом «%s». Будь ласка, змініть або вилучіть ключ."
 
-#: ../clients/common/nm-meta-setting-desc.c:4135
+#: ../clients/common/nm-meta-setting-desc.c:4174
 #, c-format
 msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
 msgstr ""
 "«%s» не є коректним значенням; можна використовувати лише значення «on», "
 "«off» або «ignore»"
 
-#: ../clients/common/nm-meta-setting-desc.c:4195
+#: ../clients/common/nm-meta-setting-desc.c:4234
 msgid "Bonding primary interface [none]"
 msgstr "Основний інтерфейс прив'язування [типово немає]"
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4202
+#: ../clients/common/nm-meta-setting-desc.c:4241
 msgid "Bonding monitoring mode"
 msgstr "Режим спостереження за зв'язком"
 
-#: ../clients/common/nm-meta-setting-desc.c:4211
+#: ../clients/common/nm-meta-setting-desc.c:4250
 msgid "Bonding miimon [100]"
 msgstr "Частота спостереження MII прив'язування [типово 100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4219
+#: ../clients/common/nm-meta-setting-desc.c:4258
 msgid "Bonding downdelay [0]"
 msgstr "downdelay прив'язування [типово 0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4227
+#: ../clients/common/nm-meta-setting-desc.c:4266
 msgid "Bonding updelay [0]"
 msgstr "updelay прив'язування [типово 0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4235
+#: ../clients/common/nm-meta-setting-desc.c:4274
 msgid "Bonding arp-interval [0]"
 msgstr "arp-interval прив'язування [типово 0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4243
+#: ../clients/common/nm-meta-setting-desc.c:4282
 msgid "Bonding arp-ip-target [none]"
 msgstr "arp-ip-target прив'язування [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4251
+#: ../clients/common/nm-meta-setting-desc.c:4290
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "Швидкість LACP (slow або fast) [slow]"
 
 #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
 #. * that the actual type is (guint32(*)(type *)).
-#: ../clients/common/nm-meta-setting-desc.c:4418
+#: ../clients/common/nm-meta-setting-desc.c:4457
 msgid ""
 "nmcli can accepts both direct JSON configuration data and a file name "
 "containing the configuration. In the latter case the file is read and the "
@@ -5132,7 +5132,7 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4426
+#: ../clients/common/nm-meta-setting-desc.c:4465
 msgid ""
 "Enter a list of link watchers formatted as dictionaries where the keys are "
 "teamd properties. Dictionary pairs are in the form: key=value and pairs are "
@@ -5181,11 +5181,11 @@ msgstr ""
 "   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
 "name=ethtool delay-up=3\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4475
+#: ../clients/common/nm-meta-setting-desc.c:4514
 msgid "IEEE 802.15.4 (WPAN) parent device or connection UUID"
 msgstr "Батьківський пристрій або UUID з'єднання IEEE 802.15.4 (WPAN)"
 
-#: ../clients/common/nm-meta-setting-desc.c:4511
+#: ../clients/common/nm-meta-setting-desc.c:4550
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5198,7 +5198,7 @@ msgstr ""
 "форматі простого масиву даних.\n"
 "Приклад: /home/cimrman/cacert.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4553
+#: ../clients/common/nm-meta-setting-desc.c:4592
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5212,7 +5212,7 @@ msgstr ""
 "форматі простого масиву даних.\n"
 "Приклад: /home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4610
+#: ../clients/common/nm-meta-setting-desc.c:4649
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5228,7 +5228,7 @@ msgstr ""
 "форматі простого масиву даних.\n"
 "Приклад: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4653
+#: ../clients/common/nm-meta-setting-desc.c:4692
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5244,7 +5244,7 @@ msgstr ""
 "форматі простого масиву даних.\n"
 "Приклад: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4680
+#: ../clients/common/nm-meta-setting-desc.c:4719
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -5266,8 +5266,8 @@ msgstr ""
 "Приклади: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4697
-#: ../clients/common/nm-meta-setting-desc.c:4715
+#: ../clients/common/nm-meta-setting-desc.c:4736
+#: ../clients/common/nm-meta-setting-desc.c:4754
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5281,84 +5281,84 @@ msgstr ""
 "форматі простого масиву даних.\n"
 "Приклад: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4754
+#: ../clients/common/nm-meta-setting-desc.c:4793
 #: ../clients/common/nm-secret-agent-simple.c:268
 #: ../clients/common/nm-secret-agent-simple.c:356
 #: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:322
 msgid "Username"
 msgstr "Користувач"
 
-#: ../clients/common/nm-meta-setting-desc.c:4760
-#: ../clients/common/nm-meta-setting-desc.c:5002
-#: ../clients/common/nm-meta-setting-desc.c:5398
-#: ../clients/common/nm-meta-setting-desc.c:6338
+#: ../clients/common/nm-meta-setting-desc.c:4799
+#: ../clients/common/nm-meta-setting-desc.c:5047
+#: ../clients/common/nm-meta-setting-desc.c:5448
+#: ../clients/common/nm-meta-setting-desc.c:6388
 msgid "Password [none]"
 msgstr "Пароль [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4806
+#: ../clients/common/nm-meta-setting-desc.c:4845
 msgid "Bluetooth device address"
 msgstr "Адреса пристрою Bluetooth"
 
-#: ../clients/common/nm-meta-setting-desc.c:4854
-#: ../clients/common/nm-meta-setting-desc.c:5451
-#: ../clients/common/nm-meta-setting-desc.c:7046
-#: ../clients/common/nm-meta-setting-desc.c:7084
-#: ../clients/common/nm-meta-setting-desc.c:7266
-#: ../clients/common/nm-meta-setting-desc.c:7496
+#: ../clients/common/nm-meta-setting-desc.c:4893
+#: ../clients/common/nm-meta-setting-desc.c:5501
+#: ../clients/common/nm-meta-setting-desc.c:7096
+#: ../clients/common/nm-meta-setting-desc.c:7134
+#: ../clients/common/nm-meta-setting-desc.c:7316
+#: ../clients/common/nm-meta-setting-desc.c:7546
 msgid "MAC [none]"
 msgstr "MAC [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4860
+#: ../clients/common/nm-meta-setting-desc.c:4899
 msgid "Enable STP [no]"
 msgstr "Увімкнути STP [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4866
+#: ../clients/common/nm-meta-setting-desc.c:4905
 msgid "STP priority [32768]"
 msgstr "Пріоритет STP [типово 32768]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4872
+#: ../clients/common/nm-meta-setting-desc.c:4911
 msgid "Forward delay [15]"
 msgstr "Затримка переспрямування [типово 15]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4878
+#: ../clients/common/nm-meta-setting-desc.c:4917
 msgid "Hello time [2]"
 msgstr "Час на вітання [типово 2]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4884
+#: ../clients/common/nm-meta-setting-desc.c:4923
 msgid "Max age [20]"
 msgstr "Макс. вік [типово 20]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4890
+#: ../clients/common/nm-meta-setting-desc.c:4929
 msgid "MAC address ageing time [300]"
 msgstr "Час застарівання MAC-адреси [типово 300]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4899
+#: ../clients/common/nm-meta-setting-desc.c:4939
 msgid "Group forward mask [0]"
 msgstr "Маска групового переспрямовування [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4911
+#: ../clients/common/nm-meta-setting-desc.c:4953
 msgid "Enable IGMP snooping [no]"
 msgstr "Увімкнути підглядання IGMP [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4958
+#: ../clients/common/nm-meta-setting-desc.c:5003
 msgid "Bridge port priority [32]"
 msgstr "Пріоритетний порт містка [типово 32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4964
+#: ../clients/common/nm-meta-setting-desc.c:5009
 msgid "Bridge port STP path cost [100]"
 msgstr "Вартість маршруту STP порту містка [типово 100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4970
+#: ../clients/common/nm-meta-setting-desc.c:5015
 msgid "Hairpin [no]"
 msgstr "Початкова зона [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4996
-#: ../clients/common/nm-meta-setting-desc.c:5392
-#: ../clients/common/nm-meta-setting-desc.c:6892
+#: ../clients/common/nm-meta-setting-desc.c:5041
+#: ../clients/common/nm-meta-setting-desc.c:5442
+#: ../clients/common/nm-meta-setting-desc.c:6942
 msgid "Username [none]"
 msgstr "Користувач [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5098
+#: ../clients/common/nm-meta-setting-desc.c:5143
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -5373,7 +5373,7 @@ msgstr ""
 "\n"
 "Приклад: alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5151
+#: ../clients/common/nm-meta-setting-desc.c:5196
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -5394,7 +5394,7 @@ msgstr ""
 "\n"
 "Приклад: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5174
+#: ../clients/common/nm-meta-setting-desc.c:5219
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
@@ -5410,25 +5410,25 @@ msgstr ""
 "«unknown» — дозволити NetworkManager вибирати значення за допомогою "
 "евристики\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5408
+#: ../clients/common/nm-meta-setting-desc.c:5458
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:5460
-#: ../clients/common/nm-meta-setting-desc.c:7115
-#: ../clients/common/nm-meta-setting-desc.c:7306
+#: ../clients/common/nm-meta-setting-desc.c:5510
+#: ../clients/common/nm-meta-setting-desc.c:7165
+#: ../clients/common/nm-meta-setting-desc.c:7356
 msgid "MTU [auto]"
 msgstr "MTU [типово авто]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5479
+#: ../clients/common/nm-meta-setting-desc.c:5529
 msgid "P_KEY [none]"
 msgstr "P_KEY [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5488
+#: ../clients/common/nm-meta-setting-desc.c:5538
 msgid "Parent interface [none]"
 msgstr "Батьківський інтерфейс [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5515
+#: ../clients/common/nm-meta-setting-desc.c:5565
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5438,11 +5438,11 @@ msgstr ""
 "\n"
 "Приклад: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5563
+#: ../clients/common/nm-meta-setting-desc.c:5613
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "Адреса IPv4 (IP[/plen]) [немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5565
+#: ../clients/common/nm-meta-setting-desc.c:5615
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5456,11 +5456,11 @@ msgstr ""
 "\n"
 "Приклад: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5584
+#: ../clients/common/nm-meta-setting-desc.c:5634
 msgid "IPv4 gateway [none]"
 msgstr "Шлюз IPv4 [немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5592
+#: ../clients/common/nm-meta-setting-desc.c:5642
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5483,7 +5483,7 @@ msgstr ""
 "Приклади: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5632
+#: ../clients/common/nm-meta-setting-desc.c:5682
 msgid ""
 "Enter a list of IPv4 routing rules formatted as:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
@@ -5493,7 +5493,7 @@ msgstr ""
 "  priority [пріоритетність] [from [джерело]] [to [призначення]], ,...\n"
 "\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5723
+#: ../clients/common/nm-meta-setting-desc.c:5773
 msgid ""
 "Enter a list of IPv6 addresses of DNS servers.  If the IPv6 configuration "
 "method is 'auto' these DNS servers are appended to those (if any) returned "
@@ -5514,11 +5514,11 @@ msgstr ""
 "\n"
 "Приклад: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5777
+#: ../clients/common/nm-meta-setting-desc.c:5827
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "Адреса IPv6 (IP[/plen]) [немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5779
+#: ../clients/common/nm-meta-setting-desc.c:5829
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5532,11 +5532,11 @@ msgstr ""
 "\n"
 "Приклад: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5798
+#: ../clients/common/nm-meta-setting-desc.c:5848
 msgid "IPv6 gateway [none]"
 msgstr "Шлюз IPv6 [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5806
+#: ../clients/common/nm-meta-setting-desc.c:5856
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5561,7 +5561,7 @@ msgstr ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5846
+#: ../clients/common/nm-meta-setting-desc.c:5896
 msgid ""
 "Enter a list of IPv6 routing rules formatted as:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
@@ -5571,170 +5571,170 @@ msgstr ""
 "  priority [пріоритетність] [from [джерело]] [to [призначення]], ,...\n"
 "\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5953
-#: ../clients/common/nm-meta-setting-desc.c:6945
+#: ../clients/common/nm-meta-setting-desc.c:6003
+#: ../clients/common/nm-meta-setting-desc.c:6995
 msgid "Parent device [none]"
 msgstr "Батьківський пристрій [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5959
+#: ../clients/common/nm-meta-setting-desc.c:6009
 msgid "Local endpoint [none]"
 msgstr "Локальна кінцева точка [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5966
-#: ../clients/common/nm-meta-setting-desc.c:6965
+#: ../clients/common/nm-meta-setting-desc.c:6016
+#: ../clients/common/nm-meta-setting-desc.c:7015
 msgid "Remote"
 msgstr "Віддалений"
 
-#: ../clients/common/nm-meta-setting-desc.c:6011
+#: ../clients/common/nm-meta-setting-desc.c:6061
 msgid "MACsec parent device or connection UUID"
 msgstr "Батьківський пристрій MACsec або UUID з'єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:6032
+#: ../clients/common/nm-meta-setting-desc.c:6082
 msgid "Enable encryption [yes]"
 msgstr "Увімкнути шифрування [типово «так»]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6038
+#: ../clients/common/nm-meta-setting-desc.c:6088
 #: ../clients/common/nm-secret-agent-simple.c:917
 msgid "MKA CAK"
 msgstr "MKA CAK"
 
-#: ../clients/common/nm-meta-setting-desc.c:6048
+#: ../clients/common/nm-meta-setting-desc.c:6098
 msgid "MKA_CKN"
 msgstr "MKA_CKN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6054
+#: ../clients/common/nm-meta-setting-desc.c:6104
 msgid "SCI port [1]"
 msgstr "Порт SCI [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6080
+#: ../clients/common/nm-meta-setting-desc.c:6130
 msgid "MACVLAN parent device or connection UUID"
 msgstr "Батьківський пристрій MACVLAN або UUID з'єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:6101
+#: ../clients/common/nm-meta-setting-desc.c:6151
 msgid "Tap [no]"
 msgstr "Tap [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6136
-#: ../clients/common/nm-meta-setting-desc.c:7220
+#: ../clients/common/nm-meta-setting-desc.c:6186
+#: ../clients/common/nm-meta-setting-desc.c:7270
 #: ../clients/tui/nmt-page-wifi.c:213
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6145
+#: ../clients/common/nm-meta-setting-desc.c:6195
 msgid "OLPC Mesh channel [1]"
 msgstr "Канал OLPC Mesh [типово 1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6154
+#: ../clients/common/nm-meta-setting-desc.c:6204
 msgid "DHCP anycast MAC address [none]"
 msgstr "MAC-адреса довільного надсилання (anycast) DHCP [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6319
+#: ../clients/common/nm-meta-setting-desc.c:6369
 msgid "PPPoE parent device"
 msgstr "Батьківський пристрій PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:6325
+#: ../clients/common/nm-meta-setting-desc.c:6375
 msgid "Service [none]"
 msgstr "Служба [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6332
+#: ../clients/common/nm-meta-setting-desc.c:6382
 msgid "PPPoE username"
 msgstr "Користувач PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:6368
+#: ../clients/common/nm-meta-setting-desc.c:6418
 msgid "Browser only [no]"
 msgstr "Лише навігатор [типово «ні»]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6374
+#: ../clients/common/nm-meta-setting-desc.c:6424
 msgid "PAC URL"
 msgstr "Адреса PAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:6380
+#: ../clients/common/nm-meta-setting-desc.c:6430
 msgid "PAC script"
 msgstr "Скрипт PAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:6504
-#: ../clients/common/nm-meta-setting-desc.c:6692
+#: ../clients/common/nm-meta-setting-desc.c:6554
+#: ../clients/common/nm-meta-setting-desc.c:6742
 msgid "Team JSON configuration [none]"
 msgstr "Налаштування JSON команди [немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6795
+#: ../clients/common/nm-meta-setting-desc.c:6845
 msgid "User ID [none]"
 msgstr "Ідентифікатор користувача [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6801
+#: ../clients/common/nm-meta-setting-desc.c:6851
 msgid "Group ID [none]"
 msgstr "Ідентифікатор групи [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6807
+#: ../clients/common/nm-meta-setting-desc.c:6857
 msgid "Enable PI [no]"
 msgstr "Увімкнути PI [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6813
+#: ../clients/common/nm-meta-setting-desc.c:6863
 msgid "Enable VNET header [no]"
 msgstr "Увімкнути заголовок VNET [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6819
+#: ../clients/common/nm-meta-setting-desc.c:6869
 msgid "Enable multi queue [no]"
 msgstr "Увімкнути декілька черг [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6832
+#: ../clients/common/nm-meta-setting-desc.c:6882
 msgid "VLAN parent device or connection UUID"
 msgstr "Батьківський пристрій VLAN або UUID з'єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:6839
+#: ../clients/common/nm-meta-setting-desc.c:6889
 msgid "VLAN ID (<0-4094>)"
 msgstr "Ід. VLAN (<0-4094>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:6845
+#: ../clients/common/nm-meta-setting-desc.c:6895
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "Прапорці VLAN (<0-7>) [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6854
+#: ../clients/common/nm-meta-setting-desc.c:6904
 msgid "Ingress priority maps [none]"
 msgstr "Відображення пріоритетності вхідного доступу [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6864
+#: ../clients/common/nm-meta-setting-desc.c:6914
 msgid "Egress priority maps [none]"
 msgstr "Відображення пріоритетності вихідного доступу [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6932
+#: ../clients/common/nm-meta-setting-desc.c:6982
 msgid "Table [0]"
 msgstr "Таблиця [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6952
+#: ../clients/common/nm-meta-setting-desc.c:7002
 msgid "VXLAN ID"
 msgstr "Ід. VXLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6958
+#: ../clients/common/nm-meta-setting-desc.c:7008
 msgid "Local address [none]"
 msgstr "Локальна адреса [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6971
+#: ../clients/common/nm-meta-setting-desc.c:7021
 msgid "Minimum source port [0]"
 msgstr "Мінімальний порт джерела [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6977
+#: ../clients/common/nm-meta-setting-desc.c:7027
 msgid "Maximum source port [0]"
 msgstr "Максимальний порт джерела [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6983
+#: ../clients/common/nm-meta-setting-desc.c:7033
 msgid "Destination port [8472]"
 msgstr "Порт призначення [типово 8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7023
+#: ../clients/common/nm-meta-setting-desc.c:7073
 msgid "Peer"
 msgstr "Вузол"
 
-#: ../clients/common/nm-meta-setting-desc.c:7053
+#: ../clients/common/nm-meta-setting-desc.c:7103
 msgid "WiMAX NSP name"
 msgstr "Назва NSP WiMAX"
 
-#: ../clients/common/nm-meta-setting-desc.c:7090
-#: ../clients/common/nm-meta-setting-desc.c:7271
+#: ../clients/common/nm-meta-setting-desc.c:7140
+#: ../clients/common/nm-meta-setting-desc.c:7321
 msgid "Cloned MAC [none]"
 msgstr "Клонований MAC [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7123
+#: ../clients/common/nm-meta-setting-desc.c:7173
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -5744,7 +5744,7 @@ msgstr ""
 "\n"
 "Приклад: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7445
+#: ../clients/common/nm-meta-setting-desc.c:7495
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
@@ -5752,230 +5752,230 @@ msgstr ""
 "Вкажіть тип ключів WEP. Можливі значення: 0 або unknown (невідомо), 1 або "
 "key (ключ) та 2 або passphrase (пароль).\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7504
+#: ../clients/common/nm-meta-setting-desc.c:7554
 msgid "Short address (<0x0000-0xffff>)"
 msgstr "Коротка адреса (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7520
+#: ../clients/common/nm-meta-setting-desc.c:7570
 msgid "PAN Identifier (<0x0000-0xffff>)"
 msgstr "Ідентифікатор PAN (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7535
+#: ../clients/common/nm-meta-setting-desc.c:7585
 msgid "Page (<default|0-31>)"
 msgstr "Сторінка (<default|0-31>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7549
+#: ../clients/common/nm-meta-setting-desc.c:7599
 msgid "Channel (<default|0-26>)"
 msgstr "Канал (<default|0-26>)"
 
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7684
+#: ../clients/common/nm-meta-setting-desc.c:7734
 msgid "6LOWPAN settings"
 msgstr "Параметри 6LOWPAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7685
+#: ../clients/common/nm-meta-setting-desc.c:7735
 msgid "802-1x settings"
 msgstr "Параметри 802-1x"
 
-#: ../clients/common/nm-meta-setting-desc.c:7686
+#: ../clients/common/nm-meta-setting-desc.c:7736
 #: ../src/devices/adsl/nm-device-adsl.c:117
 msgid "ADSL connection"
 msgstr "З'єднання ADSL"
 
-#: ../clients/common/nm-meta-setting-desc.c:7687
+#: ../clients/common/nm-meta-setting-desc.c:7737
 msgid "bluetooth connection"
 msgstr "з'єднання bluetooth"
 
-#: ../clients/common/nm-meta-setting-desc.c:7688
+#: ../clients/common/nm-meta-setting-desc.c:7738
 msgid "Bond device"
 msgstr "Пристрій Bond"
 
-#: ../clients/common/nm-meta-setting-desc.c:7689
+#: ../clients/common/nm-meta-setting-desc.c:7739
 msgid "Bridge device"
 msgstr "Пристрій містка"
 
-#: ../clients/common/nm-meta-setting-desc.c:7690
+#: ../clients/common/nm-meta-setting-desc.c:7740
 msgid "Bridge port"
 msgstr "Порт містка"
 
-#: ../clients/common/nm-meta-setting-desc.c:7691
+#: ../clients/common/nm-meta-setting-desc.c:7741
 msgid "CDMA mobile broadband connection"
 msgstr "мобільне широкосмугове з'єднання CDMA"
 
-#: ../clients/common/nm-meta-setting-desc.c:7692
+#: ../clients/common/nm-meta-setting-desc.c:7742
 msgid "General settings"
 msgstr "Загальні параметри"
 
-#: ../clients/common/nm-meta-setting-desc.c:7693
+#: ../clients/common/nm-meta-setting-desc.c:7743
 msgid "DCB settings"
 msgstr "Параметри DCB"
 
-#: ../clients/common/nm-meta-setting-desc.c:7694
+#: ../clients/common/nm-meta-setting-desc.c:7744
 msgid "Dummy settings"
 msgstr "Фіктивні параметри"
 
-#: ../clients/common/nm-meta-setting-desc.c:7695
+#: ../clients/common/nm-meta-setting-desc.c:7745
 msgid "Ethtool settings"
 msgstr "Параметри Ethtool"
 
-#: ../clients/common/nm-meta-setting-desc.c:7696
+#: ../clients/common/nm-meta-setting-desc.c:7746
 msgid "Generic settings"
 msgstr "Загальні параметри"
 
-#: ../clients/common/nm-meta-setting-desc.c:7697
+#: ../clients/common/nm-meta-setting-desc.c:7747
 msgid "GSM mobile broadband connection"
 msgstr "мобільне широкосмугове з'єднання GSM"
 
-#: ../clients/common/nm-meta-setting-desc.c:7698
+#: ../clients/common/nm-meta-setting-desc.c:7748
 #: ../src/devices/nm-device-infiniband.c:158
 msgid "InfiniBand connection"
 msgstr "З'єднання InfiniBand"
 
-#: ../clients/common/nm-meta-setting-desc.c:7699
+#: ../clients/common/nm-meta-setting-desc.c:7749
 msgid "IPv4 protocol"
 msgstr "Протокол IPv4"
 
-#: ../clients/common/nm-meta-setting-desc.c:7700
+#: ../clients/common/nm-meta-setting-desc.c:7750
 msgid "IPv6 protocol"
 msgstr "Протокол IPv6"
 
-#: ../clients/common/nm-meta-setting-desc.c:7701
+#: ../clients/common/nm-meta-setting-desc.c:7751
 msgid "IP-tunnel settings"
 msgstr "Параметри IP-тунелювання"
 
-#: ../clients/common/nm-meta-setting-desc.c:7702
+#: ../clients/common/nm-meta-setting-desc.c:7752
 msgid "MACsec connection"
 msgstr "З'єднання MACsec"
 
-#: ../clients/common/nm-meta-setting-desc.c:7703
+#: ../clients/common/nm-meta-setting-desc.c:7753
 msgid "macvlan connection"
 msgstr "З'єднання MACVLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7704
+#: ../clients/common/nm-meta-setting-desc.c:7754
 msgid "Match"
 msgstr "Відповідність"
 
-#: ../clients/common/nm-meta-setting-desc.c:7705
+#: ../clients/common/nm-meta-setting-desc.c:7755
 msgid "OLPC Mesh connection"
 msgstr "З'єднання OLPC Mesh"
 
-#: ../clients/common/nm-meta-setting-desc.c:7706
+#: ../clients/common/nm-meta-setting-desc.c:7756
 msgid "Open vSwitch bridge settings"
 msgstr "Параметри містка Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7707
+#: ../clients/common/nm-meta-setting-desc.c:7757
 msgid "Open vSwitch DPDK interface settings"
 msgstr "Параметри інтерфейсу Open vSwitch DPDK"
 
-#: ../clients/common/nm-meta-setting-desc.c:7708
+#: ../clients/common/nm-meta-setting-desc.c:7758
 msgid "Open vSwitch interface settings"
 msgstr "Параметри інтерфейсу Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7709
+#: ../clients/common/nm-meta-setting-desc.c:7759
 msgid "Open vSwitch patch interface settings"
 msgstr "Параметри інтерфейсу латок Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7710
+#: ../clients/common/nm-meta-setting-desc.c:7760
 msgid "Open vSwitch port settings"
 msgstr "Параметри портів Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7711
+#: ../clients/common/nm-meta-setting-desc.c:7761
 msgid "PPP settings"
 msgstr "Параметри PPP"
 
-#: ../clients/common/nm-meta-setting-desc.c:7712
+#: ../clients/common/nm-meta-setting-desc.c:7762
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:7713
+#: ../clients/common/nm-meta-setting-desc.c:7763
 msgid "Proxy"
 msgstr "Проксі"
 
-#: ../clients/common/nm-meta-setting-desc.c:7714
+#: ../clients/common/nm-meta-setting-desc.c:7764
 msgid "Serial settings"
 msgstr "Параметри послідовного з'єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:7715
+#: ../clients/common/nm-meta-setting-desc.c:7765
 msgid "SR-IOV settings"
 msgstr "Параметри SR-IOV"
 
-#: ../clients/common/nm-meta-setting-desc.c:7716
+#: ../clients/common/nm-meta-setting-desc.c:7766
 msgid "Traffic controls"
 msgstr "Засоби керування обміном даними"
 
-#: ../clients/common/nm-meta-setting-desc.c:7717
+#: ../clients/common/nm-meta-setting-desc.c:7767
 msgid "Team device"
 msgstr "Пристрій Team"
 
-#: ../clients/common/nm-meta-setting-desc.c:7718
+#: ../clients/common/nm-meta-setting-desc.c:7768
 msgid "Team port"
 msgstr "Порт Team"
 
-#: ../clients/common/nm-meta-setting-desc.c:7719
+#: ../clients/common/nm-meta-setting-desc.c:7769
 msgid "Tun device"
 msgstr "Пристрій TUN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7720
+#: ../clients/common/nm-meta-setting-desc.c:7770
 msgid "User settings"
 msgstr "Параметри користувача"
 
-#: ../clients/common/nm-meta-setting-desc.c:7721
+#: ../clients/common/nm-meta-setting-desc.c:7771
 #: ../src/devices/nm-device-vlan.c:385
 msgid "VLAN connection"
 msgstr "З'єднання VLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7722 ../src/nm-manager.c:5644
+#: ../clients/common/nm-meta-setting-desc.c:7772 ../src/nm-manager.c:5683
 msgid "VPN connection"
 msgstr "З'єднання VPN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7723
+#: ../clients/common/nm-meta-setting-desc.c:7773
 #: ../src/devices/nm-device-vrf.c:175
 msgid "VRF connection"
 msgstr "З'єднання VRF"
 
-#: ../clients/common/nm-meta-setting-desc.c:7724
+#: ../clients/common/nm-meta-setting-desc.c:7774
 #: ../src/devices/nm-device-vxlan.c:354
 msgid "VXLAN connection"
 msgstr "З'єднання VXLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7725
+#: ../clients/common/nm-meta-setting-desc.c:7775
 msgid "Wi-Fi P2P connection"
 msgstr "З'єднання P2P Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7726
+#: ../clients/common/nm-meta-setting-desc.c:7776
 msgid "WiMAX connection"
 msgstr "З'єднання WiMAX"
 
-#: ../clients/common/nm-meta-setting-desc.c:7727
+#: ../clients/common/nm-meta-setting-desc.c:7777
 msgid "Wired Ethernet"
 msgstr "Дротовий Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:7728
+#: ../clients/common/nm-meta-setting-desc.c:7778
 msgid "WireGuard VPN settings"
 msgstr "Параметри VPN WireGuard"
 
-#: ../clients/common/nm-meta-setting-desc.c:7729
+#: ../clients/common/nm-meta-setting-desc.c:7779
 msgid "Wi-Fi connection"
 msgstr "З'єднання Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7730
+#: ../clients/common/nm-meta-setting-desc.c:7780
 msgid "Wi-Fi security settings"
 msgstr "Параметри захисту Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7731
+#: ../clients/common/nm-meta-setting-desc.c:7781
 msgid "WPAN settings"
 msgstr "Параметри WPAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:8108
+#: ../clients/common/nm-meta-setting-desc.c:8158
 msgid "name"
 msgstr "назва"
 
-#: ../clients/common/nm-polkit-listener.c:347
+#: ../clients/common/nm-polkit-listener.c:368
 #, c-format
 msgid "Could not find any session id for uid %d"
 msgstr "Не вдалося знайти жодного ідентифікатора сеансу для uid %d"
 
-#: ../clients/common/nm-polkit-listener.c:349
+#: ../clients/common/nm-polkit-listener.c:370
 #, c-format
 msgid "Could not retrieve session id: %s"
 msgstr "Не вдалося отримати ідентифікатор сеансу: %s"
@@ -6116,38 +6116,38 @@ msgstr ""
 msgid "failed to load VPN plugin \"%s\": %s"
 msgstr "не вдалося завантажити додаток VPN «%s»: %s"
 
-#: ../clients/common/nm-vpn-helpers.c:115
+#: ../clients/common/nm-vpn-helpers.c:144
 msgid "Certificate password"
 msgstr "Пароль сертифіката"
 
-#: ../clients/common/nm-vpn-helpers.c:116
+#: ../clients/common/nm-vpn-helpers.c:145
 msgid "HTTP proxy password"
 msgstr "Пароль для розпізнавання за HTTP"
 
-#: ../clients/common/nm-vpn-helpers.c:121
-#: ../clients/common/nm-vpn-helpers.c:126
+#: ../clients/common/nm-vpn-helpers.c:152
+#: ../clients/common/nm-vpn-helpers.c:161
 msgid "Group password"
 msgstr "Пароль групи"
 
-#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:130
+#: ../clients/common/nm-vpn-helpers.c:167 ../clients/tui/nmt-page-ip4.c:130
 #: ../clients/tui/nmt-page-ip6.c:131
 msgid "Gateway"
 msgstr "Шлюз"
 
-#: ../clients/common/nm-vpn-helpers.c:131
+#: ../clients/common/nm-vpn-helpers.c:168
 msgid "Cookie"
 msgstr "Кука"
 
-#: ../clients/common/nm-vpn-helpers.c:132
+#: ../clients/common/nm-vpn-helpers.c:169
 msgid "Gateway certificate hash"
 msgstr "Хеш сертифіката шлюзу"
 
-#: ../clients/common/nm-vpn-helpers.c:257
+#: ../clients/common/nm-vpn-helpers.c:267
 #, c-format
 msgid "Invalid peer starting at %s:%zu: %s"
 msgstr "Некоректний вузол, що починається з %s:%zu: %s"
 
-#: ../clients/common/nm-vpn-helpers.c:377
+#: ../clients/common/nm-vpn-helpers.c:387
 msgid ""
 "The name of the WireGuard config must be a valid interface name followed by "
 "\".conf\""
@@ -6155,22 +6155,22 @@ msgstr ""
 "Назва файла налаштувань WireGuard повинна бути коректною назвою: назва файла "
 "має збігатися із назвою інтерфейсу, до неї має бути додано «.conf»"
 
-#: ../clients/common/nm-vpn-helpers.c:666
+#: ../clients/common/nm-vpn-helpers.c:675
 #, c-format
 msgid "unrecognized line at %s:%zu"
 msgstr "нерозпізнаний рядок у %s:%zu"
 
-#: ../clients/common/nm-vpn-helpers.c:671
+#: ../clients/common/nm-vpn-helpers.c:680
 #, c-format
 msgid "invalid value for '%s' at %s:%zu"
 msgstr "некоректне значення для «%s» у %s:%zu"
 
-#: ../clients/common/nm-vpn-helpers.c:676
+#: ../clients/common/nm-vpn-helpers.c:685
 #, c-format
 msgid "invalid secret '%s' at %s:%zu"
 msgstr "некоректні реєстраційні дані «%s» у %s:%zu"
 
-#: ../clients/common/nm-vpn-helpers.c:789
+#: ../clients/common/nm-vpn-helpers.c:811
 #, c-format
 msgid "Failed to create WireGuard connection: %s"
 msgstr "Не вдалося створити з'єднання WireGuard: %s"
@@ -6929,8 +6929,8 @@ msgstr ""
 #: ../clients/common/settings-docs.h.in:61
 #: ../clients/common/settings-docs.h.in:107
 #: ../clients/common/settings-docs.h.in:140
-#: ../clients/common/settings-docs.h.in:189
-#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.h.in:190
+#: ../clients/common/settings-docs.h.in:309
 msgid "Flags indicating how to handle the \"password\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «password»."
 
@@ -7264,7 +7264,7 @@ msgid "PIN used for EAP authentication methods."
 msgstr "PIN, який використовується для методів розпізнавання EAP."
 
 #: ../clients/common/settings-docs.h.in:85
-#: ../clients/common/settings-docs.h.in:191
+#: ../clients/common/settings-docs.h.in:192
 msgid "Flags indicating how to handle the \"pin\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «pin»."
 
@@ -7638,11 +7638,11 @@ msgid ""
 "address format, ie an address of the form 01:80:C2:00:00:0X, with X in [0, "
 "4..F]. If not specified the default value is 01:80:C2:00:00:00."
 msgstr ""
-"Якщо вказано, MAC-адреса універсальної трансляції, яку цей місток"
-" використовує для STP. Адреса має бути адресою локального зв'язку"
-" (link-local) у стандартному форматі адрес MAC Ethernet, тобто адресою у"
-" форматі 01:80:C2:00:00:0X, де X має належати множині [0, 4..F]. Якщо не"
-" вказано, типовим значенням є 01:80:C2:00:00:00."
+"Якщо вказано, MAC-адреса універсальної трансляції, яку цей місток "
+"використовує для STP. Адреса має бути адресою локального зв'язку (link-"
+"local) у стандартному форматі адрес MAC Ethernet, тобто адресою у форматі "
+"01:80:C2:00:00:0X, де X має належати множині [0, 4..F]. Якщо не вказано, "
+"типовим значенням є 01:80:C2:00:00:00."
 
 #: ../clients/common/settings-docs.h.in:118
 msgid ""
@@ -7688,16 +7688,16 @@ msgid ""
 "Enable or disable sending of multicast queries by the bridge. If not "
 "specified the option is disabled."
 msgstr ""
-"Увімкнути або вимкнути надсилання запитів універсальної трансляції містком."
-" Якщо не вказано, вважається вимкненим."
+"Увімкнути або вимкнути надсилання запитів універсальної трансляції містком. "
+"Якщо не вказано, вважається вимкненим."
 
 #: ../clients/common/settings-docs.h.in:123
 msgid ""
 "If enabled the bridge's own IP address is used as the source address for "
 "IGMP queries otherwise the default of 0.0.0.0 is used."
 msgstr ""
-"Якщо увімкнено, як адресу джерела для запитів IGMP буде використано власну"
-" IP-адресу містка. Якщо вимкнено, буде використано типову адресу 0.0.0.0."
+"Якщо увімкнено, як адресу джерела для запитів IGMP буде використано власну "
+"IP-адресу містка. Якщо вимкнено, буде використано типову адресу 0.0.0.0."
 
 #: ../clients/common/settings-docs.h.in:124
 msgid ""
@@ -7705,9 +7705,9 @@ msgid ""
 "option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not "
 "specified the default value is 'auto'."
 msgstr ""
-"Встановлює маршрутизатор універсальної трансляції містка. Щоб цей параметр"
-" спрацював, має бути увімкнено multicast-snooping. Підтримувані значення:"
-" «auto», «disabled», «enabled». Якщо не вказано, типовим значенням є «auto»."
+"Встановлює маршрутизатор універсальної трансляції містка. Щоб цей параметр "
+"спрацював, має бути увімкнено multicast-snooping. Підтримувані значення: "
+"«auto», «disabled», «enabled». Якщо не вказано, типовим значенням є «auto»."
 
 #: ../clients/common/settings-docs.h.in:125
 msgid ""
@@ -7753,12 +7753,11 @@ msgid ""
 "If specified, the protocol used for VLAN filtering. Supported values are: "
 "'802.1Q', '802.1ad'. If not specified the default value is '802.1Q'."
 msgstr ""
-"Якщо вказано, протокол, який буде використано для фільтрування VLAN."
-" Підтримувані значення: «802.1Q», «802.1ad». Якщо не вказано, типовим"
-" значенням буде «802.1Q»."
+"Якщо вказано, протокол, який буде використано для фільтрування VLAN. "
+"Підтримувані значення: «802.1Q», «802.1ad». Якщо не вказано, типовим "
+"значенням буде «802.1Q»."
 
 #: ../clients/common/settings-docs.h.in:131
-#| msgid "Control whether VLAN filtering is enabled on the bridge."
 msgid "Controls whether per-VLAN stats accounting is enabled."
 msgstr "Керує тим, чи увімкнено облік статистичних даних для окремих VLAN."
 
@@ -7817,8 +7816,8 @@ msgstr ""
 "відокремлено дефісом."
 
 #: ../clients/common/settings-docs.h.in:137
-#: ../clients/common/settings-docs.h.in:185
-#: ../clients/common/settings-docs.h.in:196
+#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.h.in:197
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
@@ -7837,7 +7836,7 @@ msgstr ""
 "вказано, буде використано типовий номер (#777)."
 
 #: ../clients/common/settings-docs.h.in:139
-#: ../clients/common/settings-docs.h.in:188
+#: ../clients/common/settings-docs.h.in:189
 msgid ""
 "The password used to authenticate with the network, if required.  Many "
 "providers do not require a password, or accept any password.  But if a "
@@ -7848,7 +7847,7 @@ msgstr ""
 "пароль. Втім, якщо пароль потрібен, його слід вказати тут."
 
 #: ../clients/common/settings-docs.h.in:141
-#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.h.in:195
 msgid ""
 "The username used to authenticate with the network, if required.  Many "
 "providers do not require a username, or accept any username.  But if a "
@@ -8045,13 +8044,33 @@ msgstr ""
 
 #: ../clients/common/settings-docs.h.in:155
 msgid ""
+"If configured, set to a Manufacturer Usage Description (MUD) URL that points "
+"to manufacturer-recommended network policies for IoT devices. It is "
+"transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL "
+"starting with \"https://\". The special value \"none\" is allowed to "
+"indicate that no MUD URL is used. If the per-profile value is unspecified "
+"(the default), a global connection default gets consulted. If still "
+"unspecified, the ultimate default is \"none\"."
+msgstr ""
+"Якщо налаштовано, встановлює значення адреси опису використання виробника"
+" (MUD), яка вказує на рекомендовані виробником правила роботи у мережі для"
+" пристрої інтернету речей. Передається як параметр DHCPv4 або DHCPv6."
+" Значення має бути коректною адресою, що починається з «https://». Можна"
+" використовувати особливе значення «none» для позначення того, що адреса MUD"
+" не використовується. Якщо значення для окремих профілів не вказано (типовий"
+" варіант), значення буде взято із типових параметрів загального з'єднання."
+" Якщо встановити значення за типовими параметрами не вдасться, остаточним"
+" типовим варіантом буде вибрано «none»."
+
+#: ../clients/common/settings-docs.h.in:156
+msgid ""
 "Specifies whether the profile can be active multiple times at a particular "
 "moment. The value is of type NMConnectionMultiConnect."
 msgstr ""
 "Визначає, чи може бути профіль активним для декількох з'єднань одночасно. "
 "Значення належить до типу NMConnectionMultiConnect."
 
-#: ../clients/common/settings-docs.h.in:156
+#: ../clients/common/settings-docs.h.in:157
 msgid ""
 "An array of strings defining what access a given user has to this "
 "connection.  If this is NULL or empty, all users are allowed to access this "
@@ -8081,7 +8100,7 @@ msgstr ""
 "використано у майбутньому. Усі значення, [тип], [ідентифікатор] і "
 "[зарезервоване значення], мають бути коректними рядками UTF-8."
 
-#: ../clients/common/settings-docs.h.in:157
+#: ../clients/common/settings-docs.h.in:158
 msgid ""
 "FALSE if the connection can be modified using the provided settings "
 "service's D-Bus interface with the right privileges, or TRUE if the "
@@ -8092,7 +8111,7 @@ msgstr ""
 "якщо параметри з'єднання є придатними лише для читання, і їх не можна "
 "змінювати."
 
-#: ../clients/common/settings-docs.h.in:158
+#: ../clients/common/settings-docs.h.in:159
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
@@ -8100,7 +8119,7 @@ msgstr ""
 "Список UUID з'єднань, які має бути активовано, якщо активовано базове "
 "з'єднання. У поточній версії передбачено підтримку лише з'єднань VPN."
 
-#: ../clients/common/settings-docs.h.in:159
+#: ../clients/common/settings-docs.h.in:160
 msgid ""
 "Setting name of the device type of this slave's master connection (eg, \"bond"
 "\"), or NULL if this connection is not a slave."
@@ -8108,7 +8127,7 @@ msgstr ""
 "Встановлює назву типу пристрою для основного з'єднання цього підлеглого "
 "з'єднання (наприклад «bond») або NULL, якщо це з'єднання не є підлеглим."
 
-#: ../clients/common/settings-docs.h.in:160
+#: ../clients/common/settings-docs.h.in:161
 msgid ""
 "This represents the identity of the connection used for various purposes. It "
 "allows to configure multiple profiles to share the identity. Also, the "
@@ -8174,7 +8193,7 @@ msgstr ""
 "алгоритму для «${CONNECTION}», і використано унікальний фіксований "
 "ідентифікатор для з'єднання."
 
-#: ../clients/common/settings-docs.h.in:161
+#: ../clients/common/settings-docs.h.in:162
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
@@ -8188,7 +8207,7 @@ msgstr ""
 "активного з'єднання найсвіжішої часової позначки. Властивість можна лише "
 "читати (зміни до цієї властивості не зберігатимуться)."
 
-#: ../clients/common/settings-docs.h.in:162
+#: ../clients/common/settings-docs.h.in:163
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
@@ -8202,7 +8221,7 @@ msgstr ""
 "з'єднань VPN та інших має містити назву параметра відповідного типу "
 "параметрів (тобто «vpn» або «bridge» тощо)."
 
-#: ../clients/common/settings-docs.h.in:163
+#: ../clients/common/settings-docs.h.in:164
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -8224,7 +8243,7 @@ msgstr ""
 "«2815492f-7e56-435e-b2e9-246bd7cdc664» (тобто у форматі запису, який містить "
 "лише шістнадцяткові цифри і символи «-»)."
 
-#: ../clients/common/settings-docs.h.in:164
+#: ../clients/common/settings-docs.h.in:165
 msgid ""
 "Timeout in milliseconds to wait for device at startup. During boot, devices "
 "may take a while to be detected by the driver. This property will cause to "
@@ -8244,7 +8263,7 @@ msgstr ""
 "значенням є -1, що у поточній версії означає, що очікування на запуск "
 "пристрою не буде."
 
-#: ../clients/common/settings-docs.h.in:165
+#: ../clients/common/settings-docs.h.in:166
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
@@ -8258,7 +8277,7 @@ msgstr ""
 "брандмауером. Якщо ця властивість оновлюється для поточного активованого "
 "з'єднання, зміни набудуть чинності негайно."
 
-#: ../clients/common/settings-docs.h.in:166
+#: ../clients/common/settings-docs.h.in:167
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8268,11 +8287,11 @@ msgstr ""
 "будь-яка комбінація NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.h.in:168
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
 msgstr "Режим контролера FCoE; або «fabric» (типовий), або «vn2vn»."
 
-#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.h.in:169
 msgid ""
 "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
 "default priority.  Only used when the \"app-fcoe-flags\" property includes "
@@ -8283,7 +8302,7 @@ msgstr ""
 "лише якщо до властивості «app-fcoe-flags» включає прапорець "
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)."
 
-#: ../clients/common/settings-docs.h.in:169
+#: ../clients/common/settings-docs.h.in:170
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8293,7 +8312,7 @@ msgstr ""
 "будь-якою комбінацією NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:170
+#: ../clients/common/settings-docs.h.in:171
 msgid ""
 "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
 "default priority.  Only used when the \"app-fip-flags\" property includes "
@@ -8304,7 +8323,7 @@ msgstr ""
 "лише якщо до властивості «app-fip-flags» включає прапорець "
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)."
 
-#: ../clients/common/settings-docs.h.in:171
+#: ../clients/common/settings-docs.h.in:172
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8314,7 +8333,7 @@ msgstr ""
 "будь-якою комбінацією NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:172
+#: ../clients/common/settings-docs.h.in:173
 msgid ""
 "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
 "default priority. Only used when the \"app-iscsi-flags\" property includes "
@@ -8325,7 +8344,7 @@ msgstr ""
 "лише якщо до властивості «app-iscsi-flags» включає прапорець "
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)."
 
-#: ../clients/common/settings-docs.h.in:173
+#: ../clients/common/settings-docs.h.in:174
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
@@ -8339,7 +8358,7 @@ msgstr ""
 "може використовувати. Сума усіх значень у межах однієї групи має складати "
 "100 відсотків."
 
-#: ../clients/common/settings-docs.h.in:174
+#: ../clients/common/settings-docs.h.in:175
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the corresponding "
@@ -8349,7 +8368,7 @@ msgstr ""
 "користувача (від 0 до 7), а значення відповідає за те, чи має відповідна "
 "пріоритетність передавати паузу пріоритетності."
 
-#: ../clients/common/settings-docs.h.in:175
+#: ../clients/common/settings-docs.h.in:176
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8359,7 +8378,7 @@ msgstr ""
 "Прапорці можуть бути будь-якою комбінацією NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.h.in:177
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the Priority "
 "Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
@@ -8371,7 +8390,7 @@ msgstr ""
 "каналу з'єднання, яку пов'язано із відповідною групою. Допустимими є "
 "значення від 0 до 100. Сума усіх значень має складати 100 відсотків."
 
-#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:178
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8381,7 +8400,7 @@ msgstr ""
 "будь-якою комбінацією NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)"
 
-#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.h.in:179
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed "
@@ -8392,7 +8411,7 @@ msgstr ""
 "пріоритетності. Дозволеними значенням ідентифікатора групи пріоритетності є "
 "значення від 0 до 7 або 15 для групи без обмежень."
 
-#: ../clients/common/settings-docs.h.in:179
+#: ../clients/common/settings-docs.h.in:180
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the priority may use "
@@ -8403,7 +8422,7 @@ msgstr ""
 "пріоритетність використовувати усю ширину каналу, пов'язаного із відповідною "
 "групою."
 
-#: ../clients/common/settings-docs.h.in:180
+#: ../clients/common/settings-docs.h.in:181
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
@@ -8413,7 +8432,7 @@ msgstr ""
 "користувача (0 - 7), а значення відповідає за клас передавання даних (від 0 "
 "до 7), із яким пов'язано пріоритетність."
 
-#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.h.in:182
 msgid ""
 "The GPRS Access Point Name specifying the APN used when establishing a data "
 "session with the GSM-based network.  The APN often determines how the user "
@@ -8431,7 +8450,7 @@ msgstr ""
 "користувача важливо використовувати належну APN. Назва APN може складатися "
 "лише із символів a-z, 0-9, . та - за стандартом GSM 03.60, розділ 14.9."
 
-#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.h.in:183
 msgid ""
 "When TRUE, the settings such as APN, username, or password will default to "
 "values that match the network the modem will register to in the Mobile "
@@ -8442,7 +8461,7 @@ msgstr ""
 "зареєстровано модем у бази даних надавачів послуг мобільного широкосмугового "
 "доступу до інтернету."
 
-#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.h.in:184
 msgid ""
 "The device unique identifier (as given by the WWAN management service) which "
 "this connection applies to.  If given, the connection will only apply to the "
@@ -8452,7 +8471,7 @@ msgstr ""
 "WWAN), до якого застосовується це з'єднання. Якщо вказано, з'єднання "
 "застосовуватиметься лише для вказаного пристрою."
 
-#: ../clients/common/settings-docs.h.in:184
+#: ../clients/common/settings-docs.h.in:185
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
@@ -8460,7 +8479,7 @@ msgstr ""
 "Якщо має значення TRUE, буде дозволено лише з'єднання із домашньою мережею. "
 "З'єднання із мережами роумінґу не виконуватимуться."
 
-#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.h.in:187
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
@@ -8475,7 +8494,7 @@ msgstr ""
 "роумінґовою мережею, якщо керування роумінґом пристрою у інший спосіб "
 "неможливе."
 
-#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.h.in:188
 msgid ""
 "Legacy setting that used to help establishing PPP data sessions for GSM-"
 "based modems. Deprecated: 1"
@@ -8483,7 +8502,7 @@ msgstr ""
 "Застарілий параметр, який використовувався для полегшення встановлення "
 "сеансів обміну даними PPP для модемів на основі технології GSM. Застарілий: 1"
 
-#: ../clients/common/settings-docs.h.in:190
+#: ../clients/common/settings-docs.h.in:191
 msgid ""
 "If the SIM is locked with a PIN it must be unlocked before any other "
 "operations are requested.  Specify the PIN here to allow operation of the "
@@ -8493,7 +8512,7 @@ msgstr ""
 "виконувати будь-які інші дії. Тут слід вказати PIN-код, який відкриває "
 "доступ до дій із пристроєм."
 
-#: ../clients/common/settings-docs.h.in:192
+#: ../clients/common/settings-docs.h.in:193
 msgid ""
 "The SIM card unique identifier (as given by the WWAN management service) "
 "which this connection applies to.  If given, the connection will apply to "
@@ -8505,7 +8524,7 @@ msgstr ""
 "застосовуватиметься до будь-якого пристрою, який також дозволено «device-"
 "id», де міститься значення відповідності SIM-картки вказаному ідентифікатору."
 
-#: ../clients/common/settings-docs.h.in:193
+#: ../clients/common/settings-docs.h.in:194
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
@@ -8518,7 +8537,7 @@ msgstr ""
 "властивостями «device-id» і «sim-id» і який містить SIM-картку, яку випущено "
 "вказаним оператором."
 
-#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.h.in:196
 msgid ""
 "If specified, this connection will only apply to the IPoIB device whose "
 "permanent MAC address matches. This property does not change the MAC address "
@@ -8528,7 +8547,7 @@ msgstr ""
 "відповідною сталою адресою MAC. Ця властивість не змінює MAC-адреси пристрою "
 "(таку зміну називають підміною MAC)."
 
-#: ../clients/common/settings-docs.h.in:197
+#: ../clients/common/settings-docs.h.in:198
 msgid ""
 "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
 "default P_Key (aka \"the P_Key at index 0\").  Otherwise it is a 16-bit "
@@ -8539,7 +8558,7 @@ msgstr ""
 "Інші значення має бути вказано у форматі 16-бітового цілого числа без знаку, "
 "старший біт якого дорівнює одиниці, якщо P_Key є ключем «повного членства»."
 
-#: ../clients/common/settings-docs.h.in:198
+#: ../clients/common/settings-docs.h.in:199
 msgid ""
 "The interface name of the parent device of this device. Normally NULL, but "
 "if the \"p_key\" property is set, then you must specify the base device by "
@@ -8550,14 +8569,14 @@ msgstr ""
 "вказати базовий пристрій або встановленням значення для цієї властивості, "
 "або встановленням значення для властивості «mac-address»."
 
-#: ../clients/common/settings-docs.h.in:199
+#: ../clients/common/settings-docs.h.in:200
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr ""
 "Режим передавання IP-over-InfiniBand. Можливі значення: «datagram» або "
 "«connected»."
 
-#: ../clients/common/settings-docs.h.in:200
+#: ../clients/common/settings-docs.h.in:201
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
@@ -8565,7 +8584,7 @@ msgstr ""
 "Кількість додаткових рівнів вкладеності, які дозволено дописувати до "
 "пакетів. Цю властивість стосується лише тунелів IPv6."
 
-#: ../clients/common/settings-docs.h.in:201
+#: ../clients/common/settings-docs.h.in:202
 msgid ""
 "Tunnel flags. Currently the following values are supported: "
 "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
@@ -8583,14 +8602,14 @@ msgstr ""
 "(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). Ці значення є "
 "коректними лише для тунелів IPv6."
 
-#: ../clients/common/settings-docs.h.in:202
+#: ../clients/common/settings-docs.h.in:203
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
 msgstr ""
 "Мітка потоку для пакетів тунелю. Ця властивість стосується лише тунелів IPv6."
 
-#: ../clients/common/settings-docs.h.in:203
+#: ../clients/common/settings-docs.h.in:204
 msgid ""
 "The key used for tunnel input packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
@@ -8599,7 +8618,7 @@ msgstr ""
 "лише для певних режимів роботи тунелю (GRE, IP6GRE). Якщо порожній, ключ не "
 "використовується."
 
-#: ../clients/common/settings-docs.h.in:204
+#: ../clients/common/settings-docs.h.in:205
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
@@ -8607,7 +8626,7 @@ msgstr ""
 "Локальна кінцева точка тунелю; значення може бути порожнім або має містити "
 "адресу IPv4 або IPv6."
 
-#: ../clients/common/settings-docs.h.in:205
+#: ../clients/common/settings-docs.h.in:206
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
@@ -8615,7 +8634,7 @@ msgstr ""
 "Режим тунелювання, наприклад NM_IP_TUNNEL_MODE_IPIP (1) або "
 "NM_IP_TUNNEL_MODE_GRE (2)."
 
-#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:207
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
@@ -8623,7 +8642,7 @@ msgstr ""
 "Якщо має ненульове значення, передавати пакети лише вказаного або меншого "
 "розміру, розбиваючи великі пакети на декілька фрагментів."
 
-#: ../clients/common/settings-docs.h.in:207
+#: ../clients/common/settings-docs.h.in:208
 msgid ""
 "The key used for tunnel output packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
@@ -8632,7 +8651,7 @@ msgstr ""
 "чинною лише для певних режимів роботи тунелю (GRE, IP6GRE). Якщо порожній, "
 "ключ не використовується."
 
-#: ../clients/common/settings-docs.h.in:208
+#: ../clients/common/settings-docs.h.in:209
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID the "
 "new device will be bound to so that tunneled packets will only be routed via "
@@ -8642,18 +8661,18 @@ msgstr ""
 "з'єднання, до якого буде прив'язано новий пристрій так, що тунельовані "
 "пакети маршрутизуватимуться лише крізь цей інтерфейс."
 
-#: ../clients/common/settings-docs.h.in:209
+#: ../clients/common/settings-docs.h.in:210
 msgid "Whether to enable Path MTU Discovery on this tunnel."
 msgstr "Визначає, чи слід вмикати Path MTU Discovery для цього тунелю."
 
-#: ../clients/common/settings-docs.h.in:210
+#: ../clients/common/settings-docs.h.in:211
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
 msgstr ""
 "Віддалена кінцева точка тунелю; значення має містити адресу IPv4 або IPv6."
 
-#: ../clients/common/settings-docs.h.in:211
+#: ../clients/common/settings-docs.h.in:212
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
@@ -8661,7 +8680,7 @@ msgstr ""
 "Поле типу служби (IPv4) або класу передавання даних (IPv6), яке слід "
 "встановити для тунельованих пакетів."
 
-#: ../clients/common/settings-docs.h.in:212
+#: ../clients/common/settings-docs.h.in:213
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
@@ -8669,13 +8688,13 @@ msgstr ""
 "Значення TTL, яке слід призначити для тунельованих пакетів. 0 — спеціальне "
 "значення, яке означає, що пакети успадковують значення TTL."
 
-#: ../clients/common/settings-docs.h.in:213
-#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.h.in:214
+#: ../clients/common/settings-docs.h.in:237
 msgid "Array of IP addresses."
 msgstr "Масив IP-адрес."
 
-#: ../clients/common/settings-docs.h.in:214
-#: ../clients/common/settings-docs.h.in:237
+#: ../clients/common/settings-docs.h.in:215
+#: ../clients/common/settings-docs.h.in:238
 msgid ""
 "Timeout in milliseconds used to check for the presence of duplicate IP "
 "addresses on the network.  If an address conflict is detected, the "
@@ -8692,7 +8711,7 @@ msgstr ""
 "перевищує нуль, вважатиметься часом очікування у мілісекундах. Цю "
 "властивість у поточній версії реалізовано лише для IPv4."
 
-#: ../clients/common/settings-docs.h.in:215
+#: ../clients/common/settings-docs.h.in:216
 msgid ""
 "A string sent to the DHCP server to identify the local machine which the "
 "DHCP server may use to customize the DHCP lease and options. When the "
@@ -8736,7 +8755,7 @@ msgstr ""
 "налаштоване значення. Якщо і це значення не налаштовано, типове значення "
 "залежатиме від додатка DHCP."
 
-#: ../clients/common/settings-docs.h.in:216
+#: ../clients/common/settings-docs.h.in:217
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -8746,8 +8765,8 @@ msgstr ""
 "адреси до сервера DHCP буде надіслано вказану FDQN. Цю властивість не можна "
 "використовувати разом із властивістю «dhcp-hostname»."
 
-#: ../clients/common/settings-docs.h.in:217
-#: ../clients/common/settings-docs.h.in:239
+#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.h.in:240
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -8757,8 +8776,8 @@ msgstr ""
 "адреси до сервера DHCP буде надіслано вказану назву. Цю властивість не можна "
 "використовувати разом із властивістю «dhcp-fqdn»."
 
-#: ../clients/common/settings-docs.h.in:218
-#: ../clients/common/settings-docs.h.in:240
+#: ../clients/common/settings-docs.h.in:219
+#: ../clients/common/settings-docs.h.in:241
 msgid ""
 "Flags for the DHCP hostname and FQDN. Currently this property only includes "
 "flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN "
@@ -8795,8 +8814,8 @@ msgstr ""
 "NM_DHCP_HOSTNAME_FLAG_NONE (0x0), у запитах DHCP надсилатимуться стандартні "
 "прапорці FQDN, описані вище."
 
-#: ../clients/common/settings-docs.h.in:219
-#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.h.in:220
+#: ../clients/common/settings-docs.h.in:242
 msgid ""
 "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 "
@@ -8825,8 +8844,8 @@ msgstr ""
 "буде проігноровано у dhclient, який завжди визначає IAID на основі MAC-"
 "адреси."
 
-#: ../clients/common/settings-docs.h.in:220
-#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.h.in:221
+#: ../clients/common/settings-docs.h.in:243
 msgid ""
 "If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
 "DHCP servers use this hostname to update DNS databases, essentially "
@@ -8841,8 +8860,8 @@ msgstr ""
 "властивості вказано значення TRUE, буде надіслано поточну стану назву вузла "
 "комп'ютера."
 
-#: ../clients/common/settings-docs.h.in:221
-#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.h.in:222
+#: ../clients/common/settings-docs.h.in:244
 msgid ""
 "A timeout for a DHCP transaction in seconds. If zero (the default), a "
 "globally configured default is used. If still unspecified, a device specific "
@@ -8856,25 +8875,38 @@ msgstr ""
 "секунд). Встановіть значення 2147483647 (MAXINT32), якщо час очікування має "
 "бути необмеженим."
 
-#: ../clients/common/settings-docs.h.in:222
-#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.h.in:245
 msgid "Array of IP addresses of DNS servers."
 msgstr "Масив IP-адрес серверів DNS."
 
-#: ../clients/common/settings-docs.h.in:223
-#: ../clients/common/settings-docs.h.in:245
+#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.h.in:246
 msgid ""
 "Array of DNS options as described in man 5 resolv.conf. NULL means that the "
 "options are unset and left at the default. In this case NetworkManager will "
-"use default options. This is distinct from an empty list of properties."
+"use default options. This is distinct from an empty list of properties. The "
+"currently supported options are \"attempts\", \"debug\", \"edns0\", "
+"\"inet6\", \"ip6-bytestring\", \"ip6-dotint\", \"ndots\", \"no-check-names"
+"\", \"no-ip6-dotint\", \"no-reload\", \"no-tld-query\", \"rotate\", \"single-"
+"request\", \"single-request-reopen\", \"timeout\", \"trust-ad\", \"use-vc\". "
+"The \"trust-ad\" setting is only honored if the profile contributes name "
+"servers to resolv.conf, and if all contributing profiles have \"trust-ad\" "
+"enabled."
 msgstr ""
-"Масив параметрів DNS, описаний на сторінці підручника (man) resolv.conf. "
-"NULL означає, що параметри не встановлено, визначено типові значення. У "
-"такому випадку NetworkManager використовуватиме типові параметри. Якщо ж "
-"буде вказано порожній список властивостей, поведінка програми буде інакшою."
+"Масив параметрів DNS, який описано на сторінці підручника (man 5)"
+" resolv.conf. NULL означає, що параметри не встановлено і NetworkManager слід"
+" використовувати типове значення. Варіант з NULL не є тим самим, що"
+" визначення порожнього списку властивостей. У поточній версії передбачено"
+" підтримку варіантів значень «attempts», «debug», «edns0», «inet6»,"
+" «ip6-bytestring», «ip6-dotint», «ndots», «no-check-names», «no-ip6-dotint»,"
+" «no-reload», «no-tld-query», «rotate», «single-request»,"
+" «single-request-reopen», «timeout», «trust-ad», «use-vc». Варіант «trust-ad»"
+" буде взято до уваги, лише якщо профіль вказує сервери назв у resolv.conf і"
+" для всіх відповідних профілів увімкнено «trust-ad»."
 
-#: ../clients/common/settings-docs.h.in:224
-#: ../clients/common/settings-docs.h.in:246
+#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:247
 msgid ""
 "DNS servers priority. The relative priority for DNS servers specified by "
 "this setting.  A lower value is better (higher priority). Zero selects a "
@@ -8930,8 +8962,8 @@ msgstr ""
 "домен, який є піддоменом іншого домену із від'ємним значенням пріоритетності "
 "DNS, цей піддомен буде проігноровано."
 
-#: ../clients/common/settings-docs.h.in:225
-#: ../clients/common/settings-docs.h.in:247
+#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.h.in:248
 msgid ""
 "Array of DNS search domains. Domains starting with a tilde ('~') are "
 "considered 'routing' domains and are used only to decide the interface over "
@@ -8943,18 +8975,26 @@ msgstr ""
 "визначення інтерфейсу, крізь який слід спрямовувати запит; такі записи не "
 "використовуватимуться для доповнення неповних назв вузлів."
 
-#: ../clients/common/settings-docs.h.in:226
-#: ../clients/common/settings-docs.h.in:248
-msgid ""
-"The gateway associated with this configuration. This is only meaningful if "
-"\"addresses\" is also set."
-msgstr ""
-"Шлюз, який пов'язано із цими налаштуваннями. Має значення, лише якщо "
-"встановлено значення «addresses»."
-
 #: ../clients/common/settings-docs.h.in:227
 #: ../clients/common/settings-docs.h.in:249
 msgid ""
+"The gateway associated with this configuration. This is only meaningful if "
+"\"addresses\" is also set. The gateway's main purpose is to control the next "
+"hop of the standard default route on the device. Hence, the gateway property "
+"conflicts with \"never-default\" and will be automatically dropped if the IP "
+"configuration is set to never-default. As an alternative to set the gateway, "
+"configure a static default route with /0 as prefix length."
+msgstr ""
+"Шлюз, який пов'язано із цими налаштуваннями. Має значення, лише якщо вказано"
+" «addresses». Основним призначенням шлюзу є керування наступним переходом у"
+" стандартному типовому маршруті на пристрої. Отже, властивість шлюз"
+" конфліктує із «never-default» — її буде автоматично відкинуто, якщо для"
+" налаштувань IP вказано never-default. Альтернативою встановленню шлюзу є"
+" налаштовування статичного типового маршруту з довжиною префікса /0."
+
+#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:250
+msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
 "and search domains specified in the \"dns\" and \"dns-search\" properties, "
@@ -8966,8 +9006,8 @@ msgstr ""
 "пошуку, вказані за допомогою властивостей «dns» і «dns-search», якщо буде "
 "вказано якісь записи серверів і доменів для цих властивостей."
 
-#: ../clients/common/settings-docs.h.in:228
-#: ../clients/common/settings-docs.h.in:250
+#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.h.in:251
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
@@ -8978,8 +9018,8 @@ msgstr ""
 "використовуватимуться лише маршрути, вказані за допомогою властивості "
 "«routes», якщо такі існують."
 
-#: ../clients/common/settings-docs.h.in:229
-#: ../clients/common/settings-docs.h.in:252
+#: ../clients/common/settings-docs.h.in:230
+#: ../clients/common/settings-docs.h.in:253
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -8996,8 +9036,8 @@ msgstr ""
 "NMSettingIP4Config уможливлює успішне налаштовування усієї мережі, якщо не "
 "вдається налаштувати IPv4, але IPv6 налаштовано успішно."
 
-#: ../clients/common/settings-docs.h.in:230
-#: ../clients/common/settings-docs.h.in:253
+#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:254
 msgid ""
 "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
 "support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the "
@@ -9026,8 +9066,8 @@ msgstr ""
 "налаштовано на інтерфейсі, який надає спільний доступ до інтернету для "
 "підмережі, а не на з'єднанні, яке надається у спільний доступ."
 
-#: ../clients/common/settings-docs.h.in:231
-#: ../clients/common/settings-docs.h.in:254
+#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.h.in:255
 msgid ""
 "If TRUE, this connection will never be the default connection for this IP "
 "type, meaning it will never be assigned the default route by NetworkManager."
@@ -9036,8 +9076,8 @@ msgstr ""
 "IP, що означає, що його ніколи не буде пов'язано із типовим маршрутом у "
 "NetworkManager."
 
-#: ../clients/common/settings-docs.h.in:232
-#: ../clients/common/settings-docs.h.in:256
+#: ../clients/common/settings-docs.h.in:233
+#: ../clients/common/settings-docs.h.in:257
 msgid ""
 "The default metric for routes that don't explicitly specify a metric. The "
 "default value -1 means that the metric is chosen automatically based on the "
@@ -9057,8 +9097,8 @@ msgstr ""
 "насправді означає, що встановлено значення 1024. Для IPv4 нуль є звичайним "
 "значенням для метрики."
 
-#: ../clients/common/settings-docs.h.in:233
-#: ../clients/common/settings-docs.h.in:257
+#: ../clients/common/settings-docs.h.in:234
+#: ../clients/common/settings-docs.h.in:258
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -9090,12 +9130,12 @@ msgstr ""
 "таблиці. Так зроблено, щоб зберегти зворотну сумісність для користувачів, "
 "які змінюють таблиці маршрутизації з-поза меж NetworkManager."
 
-#: ../clients/common/settings-docs.h.in:234
-#: ../clients/common/settings-docs.h.in:258
+#: ../clients/common/settings-docs.h.in:235
+#: ../clients/common/settings-docs.h.in:259
 msgid "Array of IP routes."
 msgstr "Масив IP-маршрутів."
 
-#: ../clients/common/settings-docs.h.in:235
+#: ../clients/common/settings-docs.h.in:236
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -9136,7 +9176,7 @@ msgstr ""
 "конфіденційності, які налаштовуються властивістю «ip6-privacy», і не впливає "
 "на тимчасові адреси, які налаштовано за допомогою відповідної властивості."
 
-#: ../clients/common/settings-docs.h.in:238
+#: ../clients/common/settings-docs.h.in:239
 msgid ""
 "A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp "
 "client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried "
@@ -9193,7 +9233,7 @@ msgstr ""
 "використано загальне значення для «ipv6.dhcp-duid». Якщо загальне значення "
 "не вказано, буде використано типове значення «lease»."
 
-#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.h.in:252
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -9224,7 +9264,7 @@ msgstr ""
 "увімкнено за допомогою параметра «stable-privacy» властивості «addr-gen-"
 "mode», як інший спосіб уникнути стеження за вузлом за допомогою адрес IPv6."
 
-#: ../clients/common/settings-docs.h.in:255
+#: ../clients/common/settings-docs.h.in:256
 msgid ""
 "A timeout for waiting Router Advertisements in seconds. If zero (the "
 "default), a globally configured default is used. If still unspecified, the "
@@ -9237,7 +9277,7 @@ msgstr ""
 "залежатиме від параметрів sysctl пристрою. Встановіть значення 2147483647 "
 "(MAXINT32), якщо час очікування має бути необмеженим."
 
-#: ../clients/common/settings-docs.h.in:259
+#: ../clients/common/settings-docs.h.in:260
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
@@ -9246,22 +9286,22 @@ msgstr ""
 "chown-6man-tokenised-ipv6-identifiers-02. Корисне у поєднанні зі значення "
 "addr-gen-mode eui64."
 
-#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.h.in:261
 msgid "Whether the transmitted traffic must be encrypted."
 msgstr "Визначає, чи слід шифрувати дані, які передаються."
 
-#: ../clients/common/settings-docs.h.in:261
+#: ../clients/common/settings-docs.h.in:262
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
 msgstr ""
 "Попереднього поширений CAK (ключ прив'язки з'єднань) для узгодження ключів "
 "MACsec."
 
-#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.h.in:263
 msgid "Flags indicating how to handle the \"mka-cak\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «mka-cak»."
 
-#: ../clients/common/settings-docs.h.in:263
+#: ../clients/common/settings-docs.h.in:264
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
@@ -9269,7 +9309,7 @@ msgstr ""
 "Попереднього поширена CKN (назва ключа ключ прив'язки з'єднань) для "
 "узгодження ключів MACsec."
 
-#: ../clients/common/settings-docs.h.in:264
+#: ../clients/common/settings-docs.h.in:265
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
@@ -9277,7 +9317,7 @@ msgstr ""
 "Визначає спосіб отримання CAK (ключа прив'язки з'єднань) для MKA (узгодження "
 "ключів MACsec)."
 
-#: ../clients/common/settings-docs.h.in:265
+#: ../clients/common/settings-docs.h.in:266
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MACSEC interface should be created.  If this property is not "
@@ -9289,7 +9329,7 @@ msgstr ""
 "значення для цієї властивості не вказано, запис з'єднання має містити "
 "параметр «802-3-ethernet» із властивістю «mac-address»."
 
-#: ../clients/common/settings-docs.h.in:266
+#: ../clients/common/settings-docs.h.in:267
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
@@ -9297,17 +9337,17 @@ msgstr ""
 "Компонент порту SCI (ідентифікатора безпечного каналу), значення від 1 до "
 "65534."
 
-#: ../clients/common/settings-docs.h.in:267
+#: ../clients/common/settings-docs.h.in:268
 msgid ""
 "Specifies whether the SCI (Secure Channel Identifier) is included in every "
 "packet."
 msgstr "Вказує, чи включено SCI (Secure Channel Identifier) до кожного пакета."
 
-#: ../clients/common/settings-docs.h.in:268
+#: ../clients/common/settings-docs.h.in:269
 msgid "Specifies the validation mode for incoming frames."
 msgstr "Визначає режим перевірки для вхідних кадрів."
 
-#: ../clients/common/settings-docs.h.in:269
+#: ../clients/common/settings-docs.h.in:270
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
@@ -9315,7 +9355,7 @@ msgstr ""
 "Режим macvlan, який визначає механізм обміну даними між декількома macvlan "
 "на одному пристрої нижнього рівня."
 
-#: ../clients/common/settings-docs.h.in:270
+#: ../clients/common/settings-docs.h.in:271
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MAC-VLAN interface should be created.  If this property is not "
@@ -9327,15 +9367,15 @@ msgstr ""
 "значення для цієї властивості не вказано, запис з'єднання має містити "
 "параметр «802-3-ethernet» із властивістю «mac-address»."
 
-#: ../clients/common/settings-docs.h.in:271
+#: ../clients/common/settings-docs.h.in:272
 msgid "Whether the interface should be put in promiscuous mode."
 msgstr "Визначає, чи слід переводити інтерфейс у нерозбірливий режим."
 
-#: ../clients/common/settings-docs.h.in:272
+#: ../clients/common/settings-docs.h.in:273
 msgid "Whether the interface should be a MACVTAP."
 msgstr "Визначає, чи має бути інтерфейс інтерфейсом MACVTAP."
 
-#: ../clients/common/settings-docs.h.in:273
+#: ../clients/common/settings-docs.h.in:274
 msgid ""
 "A list of interface names to match. Each element is a shell wildcard "
 "pattern.  When an element is prefixed with exclamation mark (!) the "
@@ -9352,35 +9392,35 @@ msgstr ""
 "елементів немає; (b) не встановлено відповідності жодному з елементів із "
 "префіксом «!»."
 
-#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.h.in:275
 msgid "The data path type. One of \"system\", \"netdev\" or empty."
 msgstr ""
 "Тип шляху до даних. Одне з таких значень: «system», «netdev» або порожнє "
 "значення."
 
-#: ../clients/common/settings-docs.h.in:275
+#: ../clients/common/settings-docs.h.in:276
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
 msgstr ""
 "Режим відмови містка. Одне з таких значень: «secure», «standalone» або "
 "порожнє значення."
 
-#: ../clients/common/settings-docs.h.in:276
+#: ../clients/common/settings-docs.h.in:277
 msgid "Enable or disable multicast snooping."
 msgstr "Увімкнути або вимкнути переставляння універсальної трансляції."
 
-#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.h.in:278
 msgid "Enable or disable RSTP."
 msgstr "Увімкнути або вимкнути RSTP."
 
-#: ../clients/common/settings-docs.h.in:278
+#: ../clients/common/settings-docs.h.in:279
 msgid "Enable or disable STP."
 msgstr "Увімкнути або вимкнути STP."
 
-#: ../clients/common/settings-docs.h.in:279
+#: ../clients/common/settings-docs.h.in:280
 msgid "Open vSwitch DPDK device arguments."
 msgstr "Параметри пристрою Open vSwitch DPDK."
 
-#: ../clients/common/settings-docs.h.in:280
+#: ../clients/common/settings-docs.h.in:281
 msgid ""
 "The interface type. Either \"internal\", \"system\", \"patch\", \"dpdk\", or "
 "empty."
@@ -9388,7 +9428,7 @@ msgstr ""
 "Тип інтерфейсу. Рядок «internal», «system», «patch», «dpdk» або порожній "
 "рядок."
 
-#: ../clients/common/settings-docs.h.in:281
+#: ../clients/common/settings-docs.h.in:282
 msgid ""
 "Specifies the unicast destination IP address of a remote Open vSwitch bridge "
 "port to connect to."
@@ -9396,30 +9436,30 @@ msgstr ""
 "Визначає IP-адресу односпрямованої трансляції, з якою слід з'єднувати порт "
 "містка Open vSwitch."
 
-#: ../clients/common/settings-docs.h.in:282
+#: ../clients/common/settings-docs.h.in:283
 msgid "The time port must be inactive in order to be considered down."
 msgstr "Щоб вважатися вимкненим, порт часу має бути неактивним."
 
-#: ../clients/common/settings-docs.h.in:283
+#: ../clients/common/settings-docs.h.in:284
 msgid ""
 "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr ""
 "Режим прив'язування. Одне з таких значень: «active-backup», «balance-slb» "
 "або «balance-tcp»."
 
-#: ../clients/common/settings-docs.h.in:284
+#: ../clients/common/settings-docs.h.in:285
 msgid "The time port must be active before it starts forwarding traffic."
 msgstr "Щоб почати переспрямовувати дані, слід активувати порт часу."
 
-#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.h.in:286
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
 msgstr "Режим LACP. Одне з таких значень: «active», «off» або «passive»."
 
-#: ../clients/common/settings-docs.h.in:286
+#: ../clients/common/settings-docs.h.in:287
 msgid "The VLAN tag in the range 0-4095."
 msgstr "Теґ VLAN у діапазоні від 0 до 4095."
 
-#: ../clients/common/settings-docs.h.in:287
+#: ../clients/common/settings-docs.h.in:288
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
@@ -9427,7 +9467,7 @@ msgstr ""
 "Режим VLAN. Одне з таких значень: «access», «native-tagged», «native-"
 "untagged», «trunk» або порожнє значення."
 
-#: ../clients/common/settings-docs.h.in:288
+#: ../clients/common/settings-docs.h.in:289
 msgid ""
 "If non-zero, instruct pppd to set the serial port to the specified "
 "baudrate.  This value should normally be left as 0 to automatically choose "
@@ -9437,7 +9477,7 @@ msgstr ""
 "вказану швидкість передавання даних у бодах. Зазвичай, для цієї властивості "
 "слід залишити нульове значення, щоб швидкість було вибрано автоматично."
 
-#: ../clients/common/settings-docs.h.in:289
+#: ../clients/common/settings-docs.h.in:290
 msgid ""
 "If TRUE, specify that pppd should set the serial port to use hardware flow "
 "control with RTS and CTS signals.  This value should normally be set to "
@@ -9447,7 +9487,7 @@ msgstr ""
 "керування потоком апаратних даних за допомогою сигналів RTS і CTS. За "
 "звичних умов, для цієї властивості має бути встановлено значення FALSE."
 
-#: ../clients/common/settings-docs.h.in:290
+#: ../clients/common/settings-docs.h.in:291
 msgid ""
 "If non-zero, instruct pppd to presume the connection to the peer has failed "
 "if the specified number of LCP echo-requests go unanswered by the peer.  The "
@@ -9459,7 +9499,7 @@ msgstr ""
 "кількість луна-запитів LCP. Якщо використовується ця властивість, для "
 "властивості «lcp-echo-interval» слід встановити ненульове значення."
 
-#: ../clients/common/settings-docs.h.in:291
+#: ../clients/common/settings-docs.h.in:292
 msgid ""
 "If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
 "every n seconds (where n is the specified value).  Note that some PPP peers "
@@ -9471,7 +9511,7 @@ msgstr ""
 "відповідатимуть на луна-запити, а деякі — ні. Визначити, чи відповідатиме "
 "певний вузол, у автоматичному режимі неможливо."
 
-#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.h.in:293
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
@@ -9479,7 +9519,7 @@ msgstr ""
 "Якщо TRUE, використовуватиметься режим MPPE зі станами (stateful). "
 "Докладніший опис режиму MPPE зі станами наведено у документації із pppd."
 
-#: ../clients/common/settings-docs.h.in:293
+#: ../clients/common/settings-docs.h.in:294
 msgid ""
 "If non-zero, instruct pppd to request that the peer send packets no larger "
 "than the specified size.  If non-zero, the MRU should be between 128 and "
@@ -9489,20 +9529,20 @@ msgstr ""
 "щодо того, щоб він надсилав пакети, не більші за вказаний розмір. Якщо має "
 "ненульове значення, MRU має бути від 128 до 16384."
 
-#: ../clients/common/settings-docs.h.in:294
+#: ../clients/common/settings-docs.h.in:295
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
 msgstr ""
 "Якщо має ненульове значення, наказує pppd надсилати пакети, не більші за "
 "вказаний розмір."
 
-#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.h.in:296
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
 msgstr ""
 "Якщо має значення TRUE, запит щодо стискання заголовків TCP ван Якобсена не "
 "надсилатиметься."
 
-#: ../clients/common/settings-docs.h.in:296
+#: ../clients/common/settings-docs.h.in:297
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
@@ -9513,35 +9553,35 @@ msgstr ""
 "FALSE, вимагати проходження розпізнавання з боку віддаленого вузла. У "
 "більшості випадків слід використовувати значення TRUE."
 
-#: ../clients/common/settings-docs.h.in:297
+#: ../clients/common/settings-docs.h.in:298
 msgid "If TRUE, BSD compression will not be requested."
 msgstr "Якщо TRUE, стискання BSD не вимагатиметься."
 
-#: ../clients/common/settings-docs.h.in:298
+#: ../clients/common/settings-docs.h.in:299
 msgid "If TRUE, \"deflate\" compression will not be requested."
 msgstr "Якщо TRUE, стискання «deflate» не вимагатиметься."
 
-#: ../clients/common/settings-docs.h.in:299
+#: ../clients/common/settings-docs.h.in:300
 msgid "If TRUE, the CHAP authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання CHAP не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:300
+#: ../clients/common/settings-docs.h.in:301
 msgid "If TRUE, the EAP authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання EAP не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:301
+#: ../clients/common/settings-docs.h.in:302
 msgid "If TRUE, the MSCHAP authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання MSCHAP не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:302
+#: ../clients/common/settings-docs.h.in:303
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання MSCHAPv2 не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:303
+#: ../clients/common/settings-docs.h.in:304
 msgid "If TRUE, the PAP authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання PAP не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:304
+#: ../clients/common/settings-docs.h.in:305
 msgid ""
 "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
 "PPP session.  If either 64-bit or 128-bit MPPE is not available the session "
@@ -9552,7 +9592,7 @@ msgstr ""
 "128-бітове MPPE виявиться недоступним, сеанс не буде створено. Зауважте, що "
 "MPPE не використовується для мобільних широкосмугових з'єднань."
 
-#: ../clients/common/settings-docs.h.in:305
+#: ../clients/common/settings-docs.h.in:306
 msgid ""
 "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
 "for the PPP session, and the \"require-mppe\" property must also be set to "
@@ -9563,7 +9603,7 @@ msgstr ""
 "для властивості «require-mppe» також має бути встановлено TRUE. Якщо 128-"
 "бітове MPPE виявиться недоступним, сеанс не буде створено."
 
-#: ../clients/common/settings-docs.h.in:306
+#: ../clients/common/settings-docs.h.in:307
 msgid ""
 "If given, specifies the parent interface name on which this PPPoE connection "
 "should be created.  If this property is not specified, the connection is "
@@ -9575,11 +9615,11 @@ msgstr ""
 "з'єднання буде активовано на інтерфейсі, який вказано за допомогою параметра "
 "«interface-name» NMSettingConnection."
 
-#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.h.in:308
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Пароль, який використовуватиметься для розпізнавання на службі PPPoE."
 
-#: ../clients/common/settings-docs.h.in:309
+#: ../clients/common/settings-docs.h.in:310
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
@@ -9592,33 +9632,33 @@ msgstr ""
 "якщо ви маєте справу із концентраторами із декількома способами доступу або "
 "відомо, що вказана служба є необхідною."
 
-#: ../clients/common/settings-docs.h.in:310
+#: ../clients/common/settings-docs.h.in:311
 msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 "Ім'я користувача, яке використовуватиметься для розпізнавання на службі "
 "PPPoE."
 
-#: ../clients/common/settings-docs.h.in:311
+#: ../clients/common/settings-docs.h.in:312
 msgid "Whether the proxy configuration is for browser only."
 msgstr ""
 "Визначає, чи використовуються налаштування проксі лише для програм для "
 "перегляду інтернету."
 
-#: ../clients/common/settings-docs.h.in:312
+#: ../clients/common/settings-docs.h.in:313
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
 msgstr ""
 "Спосіб налаштовування проксі. Типовим є NM_SETTING_PROXY_METHOD_NONE (0)"
 
-#: ../clients/common/settings-docs.h.in:313
+#: ../clients/common/settings-docs.h.in:314
 msgid "PAC script for the connection."
 msgstr "Скрипт PAC для з'єднання."
 
-#: ../clients/common/settings-docs.h.in:314
+#: ../clients/common/settings-docs.h.in:315
 msgid "PAC URL for obtaining PAC file."
 msgstr "Адреса PAC для отримання файла PAC."
 
-#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.h.in:316
 msgid ""
 "Speed to use for communication over the serial port.  Note that this value "
 "usually has no effect for mobile broadband modems as they generally ignore "
@@ -9629,20 +9669,20 @@ msgstr ""
 "загалом, для них параметри швидкості ігноруються — просто використовується "
 "найвища доступна швидкість."
 
-#: ../clients/common/settings-docs.h.in:316
+#: ../clients/common/settings-docs.h.in:317
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
 msgstr "Байтова ширина послідовного обміну даними. Наприклад, 8 у «8n1»."
 
-#: ../clients/common/settings-docs.h.in:317
+#: ../clients/common/settings-docs.h.in:318
 msgid "Parity setting of the serial port."
 msgstr "Параметр парності послідовного порту."
 
-#: ../clients/common/settings-docs.h.in:318
+#: ../clients/common/settings-docs.h.in:319
 msgid "Time to delay between each byte sent to the modem, in microseconds."
 msgstr ""
 "Затримка у часі між надсиланнями одного байта на модем, у мікросекундах."
 
-#: ../clients/common/settings-docs.h.in:319
+#: ../clients/common/settings-docs.h.in:320
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
@@ -9650,7 +9690,7 @@ msgstr ""
 "Кількість бітів зупинки для обміну даними на послідовному порту. Може мати "
 "значення 1 або 2. Наприклад, 1 у «8n1»."
 
-#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.h.in:321
 msgid ""
 "Whether to autoprobe virtual functions by a compatible driver. If set to "
 "NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver "
@@ -9670,7 +9710,7 @@ msgstr ""
 "використовуватимуться загальні типові параметри. Якщо загальні типові "
 "параметри не вказано, припускатиметься варіант NM_TERNARY_TRUE (1)."
 
-#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.h.in:322
 msgid ""
 "The total number of virtual functions to create. Note that when the sriov "
 "setting is present NetworkManager enforces the number of virtual functions "
@@ -9685,7 +9725,7 @@ msgstr ""
 "внесенню будь-яких змін до параметрів SR-IOV, не додавайте параметр sriov до "
 "параметрів з'єднання."
 
-#: ../clients/common/settings-docs.h.in:322
+#: ../clients/common/settings-docs.h.in:323
 msgid ""
 "Array of virtual function descriptors. Each VF descriptor is a dictionary "
 "mapping attribute names to GVariant values. The 'index' entry is mandatory "
@@ -9711,15 +9751,15 @@ msgstr ""
 "форму: «ІДЕНТИФІКАТОР[.ПРІОРИТЕТНІСТЬ[.ПРОТОКОЛ]]». Значенням ПРОТОКОЛ може "
 "бути або «q» для 802.1Q (типовий варіант) або «ad» для 802.1ad."
 
-#: ../clients/common/settings-docs.h.in:323
+#: ../clients/common/settings-docs.h.in:324
 msgid "Array of TC queueing disciplines."
 msgstr "Масив дисциплін TC у черзі."
 
-#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.h.in:325
 msgid "Array of TC traffic filters."
 msgstr "Список TC фільтрів обміну даними."
 
-#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.h.in:326
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
@@ -9732,8 +9772,8 @@ msgstr ""
 "використовуватимуться типові налаштування. Щоб дізнатися більше про "
 "форматування даних, ознайомитеся із підручником (man) з teamd.conf."
 
-#: ../clients/common/settings-docs.h.in:326
-#: ../clients/common/settings-docs.h.in:344
+#: ../clients/common/settings-docs.h.in:327
+#: ../clients/common/settings-docs.h.in:345
 msgid ""
 "Link watchers configuration for the connection: each link watcher is defined "
 "by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -9754,23 +9794,23 @@ msgstr ""
 "«validate-inactive», «send-always». Докладніше про це на сторінці підручника "
 "(man) щодо teamd.conf."
 
-#: ../clients/common/settings-docs.h.in:327
+#: ../clients/common/settings-docs.h.in:328
 msgid "Corresponds to the teamd mcast_rejoin.count."
 msgstr "Відповідає mcast_rejoin.count у teamd."
 
-#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.h.in:329
 msgid "Corresponds to the teamd mcast_rejoin.interval."
 msgstr "Відповідає mcast_rejoin.interval у teamd."
 
-#: ../clients/common/settings-docs.h.in:329
+#: ../clients/common/settings-docs.h.in:330
 msgid "Corresponds to the teamd notify_peers.count."
 msgstr "Відповідає notify_peers.count у teamd."
 
-#: ../clients/common/settings-docs.h.in:330
+#: ../clients/common/settings-docs.h.in:331
 msgid "Corresponds to the teamd notify_peers.interval."
 msgstr "Відповідає notify_peers.interval у teamd."
 
-#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.h.in:332
 msgid ""
 "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
 "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"."
@@ -9778,43 +9818,43 @@ msgstr ""
 "Відповідає runner.name у teamd. Можливі такі значення: «roundrobin», "
 "«broadcast», «activebackup», «loadbalance», «lacp», «random»."
 
-#: ../clients/common/settings-docs.h.in:332
+#: ../clients/common/settings-docs.h.in:333
 msgid "Corresponds to the teamd runner.active."
 msgstr "Відповідає runner.active у teamd."
 
-#: ../clients/common/settings-docs.h.in:333
+#: ../clients/common/settings-docs.h.in:334
 msgid "Corresponds to the teamd runner.agg_select_policy."
 msgstr "Відповідає runner.agg_select_policy у teamd."
 
-#: ../clients/common/settings-docs.h.in:334
+#: ../clients/common/settings-docs.h.in:335
 msgid "Corresponds to the teamd runner.fast_rate."
 msgstr "Відповідає runner.fast_rate у teamd."
 
-#: ../clients/common/settings-docs.h.in:335
+#: ../clients/common/settings-docs.h.in:336
 msgid "Corresponds to the teamd runner.hwaddr_policy."
 msgstr "Відповідає runner.hwaddr_policy у teamd."
 
-#: ../clients/common/settings-docs.h.in:336
+#: ../clients/common/settings-docs.h.in:337
 msgid "Corresponds to the teamd runner.min_ports."
 msgstr "Відповідає runner.min_ports у teamd."
 
-#: ../clients/common/settings-docs.h.in:337
+#: ../clients/common/settings-docs.h.in:338
 msgid "Corresponds to the teamd runner.sys_prio."
 msgstr "Відповідає runner.sys_prio у teamd."
 
-#: ../clients/common/settings-docs.h.in:338
+#: ../clients/common/settings-docs.h.in:339
 msgid "Corresponds to the teamd runner.tx_balancer.name."
 msgstr "Відповідає runner.tx_balancer.name у teamd."
 
-#: ../clients/common/settings-docs.h.in:339
+#: ../clients/common/settings-docs.h.in:340
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
 msgstr "Відповідає runner.tx_balancer.interval у teamd."
 
-#: ../clients/common/settings-docs.h.in:340
+#: ../clients/common/settings-docs.h.in:341
 msgid "Corresponds to the teamd runner.tx_hash."
 msgstr "Відповідає runner.tx_hash у teamd."
 
-#: ../clients/common/settings-docs.h.in:341
+#: ../clients/common/settings-docs.h.in:342
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
@@ -9827,19 +9867,19 @@ msgstr ""
 "використовуватимуться типові налаштування. Щоб дізнатися більше про "
 "форматування даних, ознайомитеся із підручником (man) з teamd.conf."
 
-#: ../clients/common/settings-docs.h.in:342
+#: ../clients/common/settings-docs.h.in:343
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
 msgstr "Відповідає ports.PORTIFNAME.lacp_key у teamd."
 
-#: ../clients/common/settings-docs.h.in:343
+#: ../clients/common/settings-docs.h.in:344
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
 msgstr "Відповідає ports.PORTIFNAME.lacp_prio у teamd."
 
-#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.h.in:346
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
 msgstr "Відповідає ports.PORTIFNAME.prio у teamd."
 
-#: ../clients/common/settings-docs.h.in:346
+#: ../clients/common/settings-docs.h.in:347
 msgid ""
 "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
 "parameter is skipped from the json config."
@@ -9847,11 +9887,11 @@ msgstr ""
 "Відповідає ports.PORTIFNAME.queue_id у teamd. Значення -1 означає, що "
 "параметр пропускається у налаштуваннях json."
 
-#: ../clients/common/settings-docs.h.in:347
+#: ../clients/common/settings-docs.h.in:348
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
 msgstr "Відповідає ports.PORTIFNAME.sticky у teamd."
 
-#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.h.in:349
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
@@ -9859,7 +9899,7 @@ msgstr ""
 "Ідентифікатор групи-власника пристрою. Якщо встановлено значення NULL, "
 "пристроєм зможе користуватися будь-хто."
 
-#: ../clients/common/settings-docs.h.in:349
+#: ../clients/common/settings-docs.h.in:350
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
@@ -9869,7 +9909,7 @@ msgstr ""
 "NM_SETTING_TUN_MODE_TUN (1) для створення пристрою шару 3 і "
 "NM_SETTING_TUN_MODE_TAP (2) для створення пристрою Ethernet-подібного шару 2."
 
-#: ../clients/common/settings-docs.h.in:350
+#: ../clients/common/settings-docs.h.in:351
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
@@ -9880,7 +9920,7 @@ msgstr ""
 "надсилання або отримування пакетів. Якщо ж встановлено значення FALSE, "
 "інтерфейсом підтримуватиметься лише одна черга."
 
-#: ../clients/common/settings-docs.h.in:351
+#: ../clients/common/settings-docs.h.in:352
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
@@ -9888,7 +9928,7 @@ msgstr ""
 "Ідентифікатор користувача-власника пристрою. Якщо встановлено значення NULL, "
 "пристроєм зможе користуватися будь-хто."
 
-#: ../clients/common/settings-docs.h.in:352
+#: ../clients/common/settings-docs.h.in:353
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
@@ -9896,7 +9936,7 @@ msgstr ""
 "Якщо TRUE, інтерфейс дописуватиме на початку пакетів заголовок у 4 байти із "
 "описом фізичного інтерфейсу."
 
-#: ../clients/common/settings-docs.h.in:353
+#: ../clients/common/settings-docs.h.in:354
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
@@ -9904,7 +9944,7 @@ msgstr ""
 "Якщо IFF_VNET_HDR має значення TRUE, тунельовані пакети включатимуть "
 "заголовок мережі virtio."
 
-#: ../clients/common/settings-docs.h.in:354
+#: ../clients/common/settings-docs.h.in:355
 msgid ""
 "A dictionary of key/value pairs with user data. This data is ignored by "
 "NetworkManager and can be used at the users discretion. The keys only "
@@ -9917,7 +9957,7 @@ msgstr ""
 "формату ASCII, але значення можуть бути довільними рядками UTF8, довжина "
 "яких не перевищує певного значення."
 
-#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.h.in:356
 msgid ""
 "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
@@ -9927,7 +9967,7 @@ msgstr ""
 "802.1p. Прив'язка визначається у форматі «з:до», де обидва значення, «з» і "
 "«до» є цілими додатними числами, наприклад «7:3»."
 
-#: ../clients/common/settings-docs.h.in:356
+#: ../clients/common/settings-docs.h.in:357
 msgid ""
 "One or more flags which control the behavior and features of the VLAN "
 "interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of "
@@ -9949,7 +9989,7 @@ msgstr ""
 "зберегти зворотну сумісність, типовим значенням у програмному інтерфейсі D-"
 "Bus лишається 0, а нестача властивості у D-Bus також розглядається як 0."
 
-#: ../clients/common/settings-docs.h.in:357
+#: ../clients/common/settings-docs.h.in:358
 msgid ""
 "The VLAN identifier that the interface created by this connection should be "
 "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
@@ -9958,7 +9998,7 @@ msgstr ""
 "з'єднанням. Коректним діапазоном є діапазон від 0 до 4094, без "
 "зарезервованого ідентифікатора 4095."
 
-#: ../clients/common/settings-docs.h.in:358
+#: ../clients/common/settings-docs.h.in:359
 msgid ""
 "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
@@ -9968,7 +10008,7 @@ msgstr ""
 "Linux. Прив'язка визначається у форматі «з:до», де обидва значення, «з» і "
 "«до» є цілими додатними числами, наприклад «7:3»."
 
-#: ../clients/common/settings-docs.h.in:359
+#: ../clients/common/settings-docs.h.in:360
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this VLAN interface should be created.  If this property is not "
@@ -9980,7 +10020,7 @@ msgstr ""
 "значення для цієї властивості не вказано, запис з'єднання має містити "
 "параметр «802-3-ethernet» із властивістю «mac-address»."
 
-#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.h.in:361
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
@@ -9988,7 +10028,7 @@ msgstr ""
 "Словник із пар ключ-значення для специфічних даних додатка VPN. Величинами "
 "ключа і значення можуть бути лише текстові рядки."
 
-#: ../clients/common/settings-docs.h.in:361
+#: ../clients/common/settings-docs.h.in:362
 msgid ""
 "If the VPN service supports persistence, and this property is TRUE, the VPN "
 "will attempt to stay connected across link changes and outages, until "
@@ -9999,7 +10039,7 @@ msgstr ""
 "час зміни параметрів зв'язку або неможливості обміну даними, аж доки "
 "з'єднання не буде розірвано явним чином."
 
-#: ../clients/common/settings-docs.h.in:362
+#: ../clients/common/settings-docs.h.in:363
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
@@ -10008,7 +10048,7 @@ msgstr ""
 "VPN, зокрема паролів або закритих ключів. Величинами ключа і значення можуть "
 "бути лише текстові рядки."
 
-#: ../clients/common/settings-docs.h.in:363
+#: ../clients/common/settings-docs.h.in:364
 msgid ""
 "D-Bus service name of the VPN plugin that this setting uses to connect to "
 "its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
@@ -10017,7 +10057,7 @@ msgstr ""
 "додатка з його мережею. Приклад: org.freedesktop.NetworkManager.vpnc для "
 "додатка vpnc."
 
-#: ../clients/common/settings-docs.h.in:364
+#: ../clients/common/settings-docs.h.in:365
 msgid ""
 "Timeout for the VPN service to establish the connection. Some services may "
 "take quite a long time to connect. Value of 0 means a default timeout, which "
@@ -10030,7 +10070,7 @@ msgstr ""
 "допомогою параметра vpn.timeout у файлі налаштувань). Значення, які "
 "перевищують нуль, визначають час очікування у секундах."
 
-#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.h.in:366
 msgid ""
 "If the VPN connection requires a user name for authentication, that name "
 "should be provided here.  If the connection is available to more than one "
@@ -10046,15 +10086,15 @@ msgstr ""
 "порожнє, NetworkManager автоматично використає ім'я користувача, який "
 "надіслав запит щодо встановлення з'єднання VPN."
 
-#: ../clients/common/settings-docs.h.in:366
+#: ../clients/common/settings-docs.h.in:367
 msgid "The routing table for this VRF."
 msgstr "Таблиця маршрутизації для цього VRF."
 
-#: ../clients/common/settings-docs.h.in:367
+#: ../clients/common/settings-docs.h.in:368
 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
 msgstr "Визначає час життя у секундах записів FDB, вивчених ядром."
 
-#: ../clients/common/settings-docs.h.in:368
+#: ../clients/common/settings-docs.h.in:369
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
@@ -10062,22 +10102,22 @@ msgstr ""
 "Визначає порт призначення UDP для обміну даними із віддаленою кінцевою "
 "точкою тунелю VXLAN."
 
-#: ../clients/common/settings-docs.h.in:369
+#: ../clients/common/settings-docs.h.in:370
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
 msgstr ""
 "Визначає ідентифікатор мережі VXLAN (або ідентифікатор сегмента VXLAN), яким "
 "слід скористатися."
 
-#: ../clients/common/settings-docs.h.in:370
+#: ../clients/common/settings-docs.h.in:371
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
 msgstr "Визначає, чи будуть створюватися сповіщення netlink LL ADDR miss."
 
-#: ../clients/common/settings-docs.h.in:371
+#: ../clients/common/settings-docs.h.in:372
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
 msgstr "Визначає, чи будуть створюватися сповіщення netlink IP ADDR miss."
 
-#: ../clients/common/settings-docs.h.in:372
+#: ../clients/common/settings-docs.h.in:373
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
@@ -10085,7 +10125,7 @@ msgstr ""
 "Вказує, чи вводяться невідомі адреси шару посилань та IP-адреси до бази "
 "даних переспрямовування пристроїв VXLAN."
 
-#: ../clients/common/settings-docs.h.in:373
+#: ../clients/common/settings-docs.h.in:374
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
@@ -10093,24 +10133,24 @@ msgstr ""
 "Вказує максимальну кількість записів FDB. Нульове значення означає, що ядро "
 "зберігатиме необмежену кількість записів."
 
-#: ../clients/common/settings-docs.h.in:374
+#: ../clients/common/settings-docs.h.in:375
 msgid "If given, specifies the source IP address to use in outgoing packets."
 msgstr ""
 "Якщо задано, визначає початкову IP-адресу, якою слід скористатися для "
 "вихідних пакетів."
 
-#: ../clients/common/settings-docs.h.in:375
+#: ../clients/common/settings-docs.h.in:376
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
 msgstr ""
 "Якщо задано, визначає назву батьківського інтерфейсу або UUID батьківського "
 "з'єднання."
 
-#: ../clients/common/settings-docs.h.in:376
+#: ../clients/common/settings-docs.h.in:377
 msgid "Specifies whether ARP proxy is turned on."
 msgstr "Визначає, чи увімкнено ARP-проксі."
 
-#: ../clients/common/settings-docs.h.in:377
+#: ../clients/common/settings-docs.h.in:378
 msgid ""
 "Specifies the unicast destination IP address to use in outgoing packets when "
 "the destination link layer address is not known in the VXLAN device "
@@ -10121,11 +10161,11 @@ msgstr ""
 "переспрямовування пристроїв VXLAN, або IP-адреса універсальної трансляції, з "
 "якою слід встановити зв'язок."
 
-#: ../clients/common/settings-docs.h.in:378
+#: ../clients/common/settings-docs.h.in:379
 msgid "Specifies whether route short circuit is turned on."
 msgstr "Визначає, чи увімкнено коротке замикання маршруту."
 
-#: ../clients/common/settings-docs.h.in:379
+#: ../clients/common/settings-docs.h.in:380
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
@@ -10133,7 +10173,7 @@ msgstr ""
 "Визначає максимальний початковий порт UDP для обміну даними із віддаленою "
 "кінцевою точкою тунелю VXLAN."
 
-#: ../clients/common/settings-docs.h.in:380
+#: ../clients/common/settings-docs.h.in:381
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
@@ -10141,16 +10181,16 @@ msgstr ""
 "Визначає мінімальний початковий порт UDP для обміну даними із віддаленою "
 "кінцевою точкою тунелю VXLAN."
 
-#: ../clients/common/settings-docs.h.in:381
+#: ../clients/common/settings-docs.h.in:382
 msgid "Specifies the TOS value to use in outgoing packets."
 msgstr "Визначає значення TOS, яке слід використовувати для вихідних пакетів."
 
-#: ../clients/common/settings-docs.h.in:382
+#: ../clients/common/settings-docs.h.in:383
 msgid "Specifies the time-to-live value to use in outgoing packets."
 msgstr ""
 "Визначає значення часу життя, яке слід використовувати для вихідних пакетів."
 
-#: ../clients/common/settings-docs.h.in:383
+#: ../clients/common/settings-docs.h.in:384
 msgid ""
 "The P2P device that should be connected to. Currently this is the only way "
 "to create or join a group."
@@ -10158,7 +10198,7 @@ msgstr ""
 "Пристрій P2P, з яким слід встановити з'єднання. У поточній версії це єдиний "
 "спосіб створення групи або долучення до неї."
 
-#: ../clients/common/settings-docs.h.in:384
+#: ../clients/common/settings-docs.h.in:385
 msgid ""
 "The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display "
 "requires a protocol specific information element to be set in certain Wi-Fi "
@@ -10172,7 +10212,7 @@ msgstr ""
 "Вказати ці елементи з метою встановлення з'єднання можна тут. Цей параметр є "
 "корисним лише для реалізації клієнта дисплея Wi-Fi."
 
-#: ../clients/common/settings-docs.h.in:385
+#: ../clients/common/settings-docs.h.in:386
 msgid ""
 "Flags indicating which mode of WPS is to be used. There's little point in "
 "changing the default setting as NetworkManager will automatically determine "
@@ -10182,7 +10222,7 @@ msgstr ""
 "типове значення не варто, оскільки NetworkManager автоматично визначає "
 "найкращий режим."
 
-#: ../clients/common/settings-docs.h.in:386
+#: ../clients/common/settings-docs.h.in:387
 msgid ""
 "If specified, this connection will only apply to the WiMAX device whose MAC "
 "address matches. This property does not change the MAC address of the device "
@@ -10192,7 +10232,7 @@ msgstr ""
 "відповідною адресою MAC. Ця властивість не змінює MAC-адреси пристрою (таку "
 "зміну називають підміною MAC). Застаріле: 1"
 
-#: ../clients/common/settings-docs.h.in:387
+#: ../clients/common/settings-docs.h.in:388
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
@@ -10200,7 +10240,7 @@ msgstr ""
 "Назва надавача мережевих послуг (NSP) для мережі WiMAX, яку має "
 "використовувати це з'єднання. Застаріле: 1"
 
-#: ../clients/common/settings-docs.h.in:388
+#: ../clients/common/settings-docs.h.in:389
 msgid ""
 "The use of fwmark is optional and is by default off. Setting it to 0 "
 "disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that "
@@ -10212,33 +10252,49 @@ msgstr ""
 "fwmark для вихідних пакетів. Зауважте, що вмикання «ip4-auto-default-route» "
 "або «ip6-auto-default-route» неявним чином призводить до вибору fwmark."
 
-#: ../clients/common/settings-docs.h.in:389
+#: ../clients/common/settings-docs.h.in:390
+#| msgid ""
+#| "Whether to enable special handling of the IPv4 default route. If enabled, "
+#| "the IPv4 default route will be placed to a dedicated routing-table and "
+#| "two policy routing rules will be added. The fwmark number is also used as "
+#| "routing-table for the default-route, and if fwmark is zero, a unused "
+#| "fwmark/table is chosen automatically. This corresponds to what wg-quick "
+#| "does with Table=auto. Leaving this at the default will enable this option "
+#| "automatically if ipv4.never-default is not set and there are any peers "
+#| "that use a default-route as allowed-ips."
 msgid ""
 "Whether to enable special handling of the IPv4 default route. If enabled, "
-"the IPv4 default route will be placed to a dedicated routing-table and two "
-"policy routing rules will be added. The fwmark number is also used as "
-"routing-table for the default-route, and if fwmark is zero, a unused fwmark/"
-"table is chosen automatically. This corresponds to what wg-quick does with "
-"Table=auto. Leaving this at the default will enable this option "
-"automatically if ipv4.never-default is not set and there are any peers that "
-"use a default-route as allowed-ips."
+"the IPv4 default route from wireguard.peer-routes will be placed to a "
+"dedicated routing-table and two policy routing rules will be added. The "
+"fwmark number is also used as routing-table for the default-route, and if "
+"fwmark is zero, an unused fwmark/table is chosen automatically. This "
+"corresponds to what wg-quick does with Table=auto and what WireGuard calls "
+"\"Improved Rule-based Routing\". Note that for this automatism to work, you "
+"usually don't want to set ipv4.gateway, because that will result in a "
+"conflicting default route. Leaving this at the default will enable this "
+"option automatically if ipv4.never-default is not set and there are any "
+"peers that use a default-route as allowed-ips."
 msgstr ""
 "Визначає, чи слід вмикати особливу обробку типового маршруту IPv4. Якщо "
-"увімкнено, типовий маршрут IPv4 буде розміщено у спеціальній таблиці "
+"увімкнено, типовий маршрут IPv4 з wireguard.peer-routes буде розміщено у"
+" спеціальній таблиці "
 "маршрутизації, а також буде додано два правила маршрутизації. Також буде "
 "використано число fwmark як номер таблиці маршрутизації для типового "
 "маршруту. Якщо fwmark дорівнює нулю, буде автоматично вибрано невикористане "
 "значення fwmark або таблицю. Це збігається з тим, що wg-quick робить з "
-"Table=auto. Якщо не змінювати типове значення цього параметра, його буде "
+"Table=auto і що у WireGuard називається «Improved Rule-based Routing»."
+" Зауважте, що для того, щоб ця автоматизація спрацювала, не варто"
+" встановлювати ipv4.gateway, оскільки це призведе до конфлікту для типового"
+" маршруту. Якщо не змінювати типове значення цього параметра, його буде "
 "увімкнено, якщо не буде встановлено ipv4.never-default і не буде жодного "
 "вузла, який використовує типовий маршрут (default-route) у дозволених IP-"
 "адресах (allowed-ips)."
 
-#: ../clients/common/settings-docs.h.in:390
+#: ../clients/common/settings-docs.h.in:391
 msgid "Like ip4-auto-default-route, but for the IPv6 default route."
 msgstr "Те саме, що ip4-auto-default-route, але для типового маршруту IPv6."
 
-#: ../clients/common/settings-docs.h.in:391
+#: ../clients/common/settings-docs.h.in:392
 msgid ""
 "The listen-port. If listen-port is not specified, the port will be chosen "
 "randomly when the interface comes up."
@@ -10246,7 +10302,7 @@ msgstr ""
 "Порт для очікування на дані. Якщо порт для очікування на дані не вказано, "
 "номер буде вибрано випадковим чином під час підняття інтерфейсу."
 
-#: ../clients/common/settings-docs.h.in:392
+#: ../clients/common/settings-docs.h.in:393
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments. If zero a default MTU is "
@@ -10259,30 +10315,45 @@ msgstr ""
 "відміну від параметра MTU wg-quick, тут не беруться до уваги поточні "
 "маршрути на момент активації."
 
-#: ../clients/common/settings-docs.h.in:393
+#: ../clients/common/settings-docs.h.in:394
+#| msgid ""
+#| "Whether to automatically add routes for the AllowedIPs ranges of the "
+#| "peers. If TRUE (the default), NetworkManager will automatically add "
+#| "routes in the routing tables according to ipv4.route-table and ipv6.route-"
+#| "table. If FALSE, no such routes are added automatically. In this case, "
+#| "the user may want to configure static routes in ipv4.routes and ipv6."
+#| "routes, respectively."
 msgid ""
 "Whether to automatically add routes for the AllowedIPs ranges of the peers. "
 "If TRUE (the default), NetworkManager will automatically add routes in the "
-"routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, "
-"no such routes are added automatically. In this case, the user may want to "
-"configure static routes in ipv4.routes and ipv6.routes, respectively."
+"routing tables according to ipv4.route-table and ipv6.route-table. Usually "
+"you want this automatism enabled. If FALSE, no such routes are added "
+"automatically. In this case, the user may want to configure static routes in "
+"ipv4.routes and ipv6.routes, respectively. Note that if the peer's "
+"AllowedIPs is \"0.0.0.0/0\" or \"::/0\" and the profile's ipv4.never-default "
+"or ipv6.never-default setting is enabled, the peer route for this peer won't "
+"be added automatically."
 msgstr ""
 "Визначає, чи слід автоматично додавати маршрути для діапазонів AllowedIP "
 "вузлів. Якщо має значення TRUE (типове значення), NetworkManager автоматично "
 "додаватиме маршрути до таблиць маршрутизації відповідно до ipv4.route-table "
-"і ipv6.route-table. Якщо має значення FALSE, автоматичне додавання маршрутів "
+"і ipv6.route-table. Зазвичай, не варто вимикати цю автоматизацію. Якщо має"
+" значення FALSE, автоматичне додавання маршрутів "
 "не виконуватиметься. У цьому випадку користувачеві варто налаштувати "
-"статичні маршрути у ipv4.routes та ipv6.routes, відповідно."
+"статичні маршрути у ipv4.routes та ipv6.routes, відповідно. Зауважте, що якщо"
+" AllowedIPs для вузла має значення «0.0.0.0/0» або «::/0», а для профілю"
+" увімкнено ipv4.never-default або ipv6.never-default, маршрут вузла для цього"
+" вузла не буде додано автоматично."
 
-#: ../clients/common/settings-docs.h.in:394
+#: ../clients/common/settings-docs.h.in:395
 msgid "The 256 bit private-key in base64 encoding."
 msgstr "256-бітовий закритий ключ у кодуванні base64."
 
-#: ../clients/common/settings-docs.h.in:395
+#: ../clients/common/settings-docs.h.in:396
 msgid "Flags indicating how to handle the \"private-key\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «private-key»."
 
-#: ../clients/common/settings-docs.h.in:396
+#: ../clients/common/settings-docs.h.in:397
 msgid ""
 "IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use "
 "whatever the device is already set to\"."
@@ -10290,7 +10361,7 @@ msgstr ""
 "Канал IEEE 802.15.4. Додане ціле значення або -1, що означає «не "
 "встановлювати, використовувати той, який вже встановлено пристроєм»."
 
-#: ../clients/common/settings-docs.h.in:397
+#: ../clients/common/settings-docs.h.in:398
 msgid ""
 "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
 "MAC layer device whose permanent MAC address matches."
@@ -10298,7 +10369,7 @@ msgstr ""
 "Якщо вказано, це з'єднання застосовуватиметься лише до пристрою шару MAC "
 "IEEE 802.15.4 (WPAN) із відповідною сталою адресою MAC."
 
-#: ../clients/common/settings-docs.h.in:398
+#: ../clients/common/settings-docs.h.in:399
 msgid ""
 "IEEE 802.15.4 channel page. A positive integer or -1, meaning \"do not set, "
 "use whatever the device is already set to\"."
@@ -10306,11 +10377,11 @@ msgstr ""
 "Сторінка каналу IEEE 80215.4. Додане ціле значення або -1, що означає «не "
 "встановлювати, використовувати ту, яку вже встановлено пристроєм»."
 
-#: ../clients/common/settings-docs.h.in:399
+#: ../clients/common/settings-docs.h.in:400
 msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
 msgstr "Ідентифікатор Personal Area Network (PAN) IEEE 802.15.4."
 
-#: ../clients/common/settings-docs.h.in:400
+#: ../clients/common/settings-docs.h.in:401
 msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
 msgstr ""
 "Коротка адреса IEEE 802.15.4, яку слід використовувати у обмеженому "
@@ -10352,14 +10423,14 @@ msgstr ""
 "Негайно завершити роботу, якщо NetworkManager не запущено або виконується "
 "спроба з'єднання"
 
-#: ../clients/nm-online.c:263
+#: ../clients/nm-online.c:265
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
 msgstr ""
 "Очікує на завершення активації NetworkManager з'єднань, які слід активувати "
 "під час запуску."
 
-#: ../clients/nm-online.c:270 ../clients/nm-online.c:276
+#: ../clients/nm-online.c:272 ../clients/nm-online.c:278
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr ""
 "Некоректний параметр. Щоб ознайомитися зі списком параметрів, скористайтеся "
@@ -10436,7 +10507,7 @@ msgstr "З'єднання DSL %d"
 
 #: ../clients/tui/nm-editor-utils.c:179 ../libnm-core/nm-connection.c:2705
 #: ../libnm/nm-device.c:1542
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5022
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5027
 msgid "Bond"
 msgstr "Прив'язка"
 
@@ -10447,7 +10518,7 @@ msgstr "Прив'язане з'єднання %d"
 
 #: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2709
 #: ../libnm/nm-device.c:1546
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5386
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5391
 msgid "Bridge"
 msgstr "Місток"
 
@@ -10458,7 +10529,7 @@ msgstr "З'єднання містка %d"
 
 #: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2707
 #: ../libnm/nm-device.c:1544
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5095
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5100
 msgid "Team"
 msgstr "Команда"
 
@@ -11642,10 +11713,10 @@ msgstr "неочікуваний UUID %s замість %s"
 #: ../libnm-core/nm-setting-bluetooth.c:109
 #: ../libnm-core/nm-setting-bluetooth.c:167
 #: ../libnm-core/nm-setting-bluetooth.c:181 ../libnm-core/nm-setting-cdma.c:128
-#: ../libnm-core/nm-setting-connection.c:954
-#: ../libnm-core/nm-setting-connection.c:983
-#: ../libnm-core/nm-setting-connection.c:1220
-#: ../libnm-core/nm-setting-ip-config.c:4933
+#: ../libnm-core/nm-setting-connection.c:975
+#: ../libnm-core/nm-setting-connection.c:1004
+#: ../libnm-core/nm-setting-connection.c:1266
+#: ../libnm-core/nm-setting-ip-config.c:4935
 #: ../libnm-core/nm-setting-ip-tunnel.c:359
 #: ../libnm-core/nm-setting-olpc-mesh.c:84
 #: ../libnm-core/nm-setting-ovs-patch.c:77 ../libnm-core/nm-setting-pppoe.c:130
@@ -11735,10 +11806,12 @@ msgstr ""
 #: ../libnm-core/nm-setting-8021x.c:2753 ../libnm-core/nm-setting-8021x.c:2765
 #: ../libnm-core/nm-setting-8021x.c:2790 ../libnm-core/nm-setting-adsl.c:166
 #: ../libnm-core/nm-setting-cdma.c:135 ../libnm-core/nm-setting-cdma.c:144
-#: ../libnm-core/nm-setting-connection.c:961
-#: ../libnm-core/nm-setting-connection.c:995 ../libnm-core/nm-setting-gsm.c:283
-#: ../libnm-core/nm-setting-gsm.c:341 ../libnm-core/nm-setting-gsm.c:378
-#: ../libnm-core/nm-setting-gsm.c:387 ../libnm-core/nm-setting-ip-config.c:4940
+#: ../libnm-core/nm-setting-connection.c:982
+#: ../libnm-core/nm-setting-connection.c:1016
+#: ../libnm-core/nm-setting-connection.c:1238
+#: ../libnm-core/nm-setting-gsm.c:283 ../libnm-core/nm-setting-gsm.c:341
+#: ../libnm-core/nm-setting-gsm.c:378 ../libnm-core/nm-setting-gsm.c:387
+#: ../libnm-core/nm-setting-ip-config.c:4942
 #: ../libnm-core/nm-setting-ip4-config.c:167
 #: ../libnm-core/nm-setting-ip4-config.c:174
 #: ../libnm-core/nm-setting-pppoe.c:137 ../libnm-core/nm-setting-pppoe.c:146
@@ -11780,7 +11853,7 @@ msgstr "можна вмикати лише для з'єднань Ethernet"
 #: ../libnm-core/nm-setting-wireless.c:835
 #: ../libnm-core/nm-setting-wireless.c:844
 #: ../libnm-core/nm-setting-wireless.c:855 ../libnm-core/nm-setting-wpan.c:162
-#: ../libnm-core/nm-utils.c:4555
+#: ../libnm-core/nm-utils.c:4553
 msgid "property is invalid"
 msgstr "властивість є некоректною"
 
@@ -11807,83 +11880,83 @@ msgstr "з'єднання «%s» потребує параметра «%s» аб
 msgid "'%s' connection requires '%s' setting"
 msgstr "з'єднання «%s» потребує параметра «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:754
+#: ../libnm-core/nm-setting-bond.c:757
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr "некоректний параметр «%s» або його значення «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:786
+#: ../libnm-core/nm-setting-bond.c:789
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr "пропущено обов'язковий параметр «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:796
+#: ../libnm-core/nm-setting-bond.c:799
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr "«%s» не є коректним значенням «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:814
+#: ../libnm-core/nm-setting-bond.c:816
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr "«%s=%s» є несумісним з «%s > 0»"
 
-#: ../libnm-core/nm-setting-bond.c:834
+#: ../libnm-core/nm-setting-bond.c:836
 #, c-format
 msgid "'%s' is not valid for the '%s' option: %s"
 msgstr "«%s» є некоректним для параметра «%s»: %s"
 
-#: ../libnm-core/nm-setting-bond.c:847
+#: ../libnm-core/nm-setting-bond.c:849
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr "параметр «%s» можна використовувати, лише якщо «%s=%s»"
 
-#: ../libnm-core/nm-setting-bond.c:860
+#: ../libnm-core/nm-setting-bond.c:862
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "«%s=%s» не є коректним налаштуванням для «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:875 ../libnm-core/nm-setting-bond.c:888
+#: ../libnm-core/nm-setting-bond.c:877 ../libnm-core/nm-setting-bond.c:890
 #: ../libnm-core/nm-setting-bridge.c:1145
 #, c-format
 msgid "'%s' option requires '%s' option to be enabled"
 msgstr "використання параметра «%s» вимагає вмикання параметра «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:910 ../libnm-core/nm-setting-bond.c:956
+#: ../libnm-core/nm-setting-bond.c:912 ../libnm-core/nm-setting-bond.c:958
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
 msgstr "використання параметра «%s» вимагає встановлення параметра «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:925
+#: ../libnm-core/nm-setting-bond.c:927
 #, c-format
 msgid "'%s' option is empty"
 msgstr "параметр «%s» є порожнім"
 
-#: ../libnm-core/nm-setting-bond.c:939
+#: ../libnm-core/nm-setting-bond.c:941
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "«%s» не є припустимою адресою IPv4 для параметра «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:973
+#: ../libnm-core/nm-setting-bond.c:975
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
 msgstr "параметр «%s» є коректним лише у режимі «%s»"
 
-#: ../libnm-core/nm-setting-bond.c:985
+#: ../libnm-core/nm-setting-bond.c:987
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
 msgstr "Значення «%s» і «%s» не можуть бути різними"
 
-#: ../libnm-core/nm-setting-bond.c:1001
+#: ../libnm-core/nm-setting-bond.c:1010
 #, c-format
 msgid "'%s' option should be string"
 msgstr "параметр «%s» має бути рядком"
 
-#: ../libnm-core/nm-setting-bond.c:1015
+#: ../libnm-core/nm-setting-bond.c:1023
 #, c-format
 msgid "'%s' option is not valid with mode '%s'"
 msgstr "параметр «%s» є коректним з режимом «%s»"
 
-#: ../libnm-core/nm-setting-bridge-port.c:301
+#: ../libnm-core/nm-setting-bridge-port.c:303
 #: ../libnm-core/nm-setting-ovs-bridge.c:153
 #: ../libnm-core/nm-setting-ovs-interface.c:269
 #: ../libnm-core/nm-setting-ovs-port.c:172
@@ -11892,7 +11965,7 @@ msgstr "параметр «%s» є коректним з режимом «%s»"
 msgid "missing setting"
 msgstr "пропущено параметр"
 
-#: ../libnm-core/nm-setting-bridge-port.c:312
+#: ../libnm-core/nm-setting-bridge-port.c:314
 #: ../libnm-core/nm-setting-ovs-interface.c:290
 #: ../libnm-core/nm-setting-ovs-port.c:193
 #: ../libnm-core/nm-setting-team-port.c:310
@@ -11918,83 +11991,90 @@ msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
 msgstr "маска не може містити біти 0 (STP), 1 (MAC) і 2 (LACP)"
 
 #: ../libnm-core/nm-setting-bridge.c:1108
-#| msgid "is not a valid MAC address"
 msgid "is not a valid link local MAC address"
 msgstr "не є коректною MAC-адресою для локальних з'єднань"
 
 #: ../libnm-core/nm-setting-bridge.c:1120
-#| msgid "'%s' is not a valid Ethernet port value"
 msgid "is not a valid VLAN filtering protocol"
 msgstr "не є коректним протоколом фільтрування VLAN"
 
 #: ../libnm-core/nm-setting-bridge.c:1133
-#| msgid "value is not a valid token"
 msgid "is not a valid option"
 msgstr "не є коректним параметром"
 
-#: ../libnm-core/nm-setting-connection.c:931
+#: ../libnm-core/nm-setting-connection.c:952
 #, c-format
 msgid "setting required for connection of type '%s'"
 msgstr "для з'єднання типу «%s» потрібен параметр"
 
-#: ../libnm-core/nm-setting-connection.c:970
+#: ../libnm-core/nm-setting-connection.c:991
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "«%s» не є коректним UUID"
 
-#: ../libnm-core/nm-setting-connection.c:1006
+#: ../libnm-core/nm-setting-connection.c:1027
 #, c-format
 msgid "connection type '%s' is not valid"
 msgstr "тип з'єднання «%s» є некоректним"
 
-#: ../libnm-core/nm-setting-connection.c:1099
+#: ../libnm-core/nm-setting-connection.c:1120
 #, c-format
 msgid "Unknown slave type '%s'"
 msgstr "Невідомий тип підлеглого «%s»"
 
-#: ../libnm-core/nm-setting-connection.c:1110
+#: ../libnm-core/nm-setting-connection.c:1131
 #, c-format
 msgid "Slave connections need a valid '%s' property"
 msgstr "Для підлеглих з'єднань потрібна коректна властивість «%s»"
 
-#: ../libnm-core/nm-setting-connection.c:1131
+#: ../libnm-core/nm-setting-connection.c:1152
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr "Не можна встановити «%s» без «%s»"
 
-#: ../libnm-core/nm-setting-connection.c:1145
+#: ../libnm-core/nm-setting-connection.c:1166
 #, c-format
 msgid "'%s' connections must be enslaved to '%s', not '%s'"
 msgstr "з'єднання «%s» мають підпорядковуватися «%s», а не «%s»"
 
-#: ../libnm-core/nm-setting-connection.c:1159
+#: ../libnm-core/nm-setting-connection.c:1180
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "лічильне значення %d є некоректним"
 
-#: ../libnm-core/nm-setting-connection.c:1170
-#: ../libnm-core/nm-setting-connection.c:1181
-#: ../libnm-core/nm-setting-connection.c:1194
+#: ../libnm-core/nm-setting-connection.c:1191
+#: ../libnm-core/nm-setting-connection.c:1202
+#: ../libnm-core/nm-setting-connection.c:1215
 #, c-format
 msgid "value %d is not valid"
 msgstr "значення %d є некоректним"
 
-#: ../libnm-core/nm-setting-connection.c:1207
+#: ../libnm-core/nm-setting-connection.c:1228
 #, c-format
 msgid "wait-device-timeout requires %s"
 msgstr "wait-device-timeout потребує %s"
 
-#: ../libnm-core/nm-setting-connection.c:1229
+#: ../libnm-core/nm-setting-connection.c:1247
+#| msgid "interface name is longer than 15 characters"
+msgid "DHCP option cannot be longer than 255 characters"
+msgstr "Довжина параметра DHCP не може перевищувати 255 символів"
+
+#: ../libnm-core/nm-setting-connection.c:1253
+#| msgid "URI is not valid UTF-8"
+msgid "MUD URL is not a valid URL"
+msgstr "Адреса MUD не є коректною адресою"
+
+#: ../libnm-core/nm-setting-connection.c:1275
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr "тип властивості має бути встановлено у значення «%s»"
 
-#: ../libnm-core/nm-setting-connection.c:1244
+#: ../libnm-core/nm-setting-connection.c:1290
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
 msgstr "тип підлеглого з'єднання «%s» потребує параметра «%s» у з'єднанні"
 
-#: ../libnm-core/nm-setting-connection.c:1254
+#: ../libnm-core/nm-setting-connection.c:1300
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
@@ -12003,7 +12083,7 @@ msgstr ""
 "Визначити підлегле з'єднання зі встановленим «%s» і типом порту «%s». «%s» "
 "слід встановити у значення «%s»"
 
-#: ../libnm-core/nm-setting-connection.c:1271
+#: ../libnm-core/nm-setting-connection.c:1317
 #, c-format
 msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
 msgstr ""
@@ -12107,287 +12187,287 @@ msgstr ""
 msgid "mtu can be at most %u but it is %u"
 msgstr "mtu не може перевищувати %u, але маємо %u"
 
-#: ../libnm-core/nm-setting-ip-config.c:107
+#: ../libnm-core/nm-setting-ip-config.c:109
 #, c-format
 msgid "Missing IPv4 address"
 msgstr "Не вказано адреси IPv4"
 
-#: ../libnm-core/nm-setting-ip-config.c:107
+#: ../libnm-core/nm-setting-ip-config.c:109
 #, c-format
 msgid "Missing IPv6 address"
 msgstr "Не вказано адреси IPv6"
 
-#: ../libnm-core/nm-setting-ip-config.c:112
+#: ../libnm-core/nm-setting-ip-config.c:114
 #, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr "Некоректна адреса IPv4, «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:112
+#: ../libnm-core/nm-setting-ip-config.c:114
 #, c-format
 msgid "Invalid IPv6 address '%s'"
 msgstr "Некоректна адреса IPv6, «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:127
+#: ../libnm-core/nm-setting-ip-config.c:129
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
 msgstr "Некоректний префікс адреси IPv4, «%u»"
 
-#: ../libnm-core/nm-setting-ip-config.c:127
+#: ../libnm-core/nm-setting-ip-config.c:129
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
 msgstr "Некоректний префікс адреси IPv6, «%u»"
 
-#: ../libnm-core/nm-setting-ip-config.c:142
+#: ../libnm-core/nm-setting-ip-config.c:144
 #, c-format
 msgid "Invalid routing metric '%s'"
 msgstr "Некоректна метрика маршрутизації, «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:1269
+#: ../libnm-core/nm-setting-ip-config.c:1271
 #: ../libnm-core/nm-setting-sriov.c:413
 msgid "unknown attribute"
 msgstr "невідомий атрибут"
 
-#: ../libnm-core/nm-setting-ip-config.c:1279
+#: ../libnm-core/nm-setting-ip-config.c:1281
 #: ../libnm-core/nm-setting-sriov.c:423
 #, c-format
 msgid "invalid attribute type '%s'"
 msgstr "некоректний тип атрибута «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:1290
+#: ../libnm-core/nm-setting-ip-config.c:1292
 #, c-format
 msgid "attribute is not valid for a IPv4 route"
 msgstr "атрибут не є коректним для маршрутизації IPv4"
 
-#: ../libnm-core/nm-setting-ip-config.c:1291
+#: ../libnm-core/nm-setting-ip-config.c:1293
 #, c-format
 msgid "attribute is not valid for a IPv6 route"
 msgstr "атрибут не є коректним для маршрутизації IPv6"
 
-#: ../libnm-core/nm-setting-ip-config.c:1305
-#: ../libnm-core/nm-setting-ip-config.c:1333
+#: ../libnm-core/nm-setting-ip-config.c:1307
+#: ../libnm-core/nm-setting-ip-config.c:1335
 #, c-format
 msgid "'%s' is not a valid IPv4 address"
 msgstr "«%s» не є коректною адресою IPv4"
 
-#: ../libnm-core/nm-setting-ip-config.c:1306
-#: ../libnm-core/nm-setting-ip-config.c:1334
+#: ../libnm-core/nm-setting-ip-config.c:1308
+#: ../libnm-core/nm-setting-ip-config.c:1336
 #, c-format
 msgid "'%s' is not a valid IPv6 address"
 msgstr "«%s» не є коректною адресою IPv6"
 
-#: ../libnm-core/nm-setting-ip-config.c:1324
+#: ../libnm-core/nm-setting-ip-config.c:1326
 #, c-format
 msgid "invalid prefix %s"
 msgstr "некоректний префікс %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2500
+#: ../libnm-core/nm-setting-ip-config.c:2502
 msgid "invalid priority"
 msgstr "некоректна пріоритетність"
 
-#: ../libnm-core/nm-setting-ip-config.c:2511
+#: ../libnm-core/nm-setting-ip-config.c:2513
 msgid "missing table"
 msgstr "не вказано таблиці"
 
-#: ../libnm-core/nm-setting-ip-config.c:2517
+#: ../libnm-core/nm-setting-ip-config.c:2519
 msgid "invalid action"
 msgstr "некоректна дія"
 
-#: ../libnm-core/nm-setting-ip-config.c:2524
+#: ../libnm-core/nm-setting-ip-config.c:2526
 msgid "has from/src but the prefix-length is zero"
 msgstr ""
 "містить from/src, але значення довжини префікса (prefix-length) є нульовим"
 
-#: ../libnm-core/nm-setting-ip-config.c:2531
+#: ../libnm-core/nm-setting-ip-config.c:2533
 msgid "missing from/src for a non zero prefix-length"
 msgstr "пропущено from/src для ненульового значення довжини префікса"
 
-#: ../libnm-core/nm-setting-ip-config.c:2536
+#: ../libnm-core/nm-setting-ip-config.c:2538
 msgid "invalid from/src"
 msgstr "некоректне значення from/src"
 
-#: ../libnm-core/nm-setting-ip-config.c:2541
+#: ../libnm-core/nm-setting-ip-config.c:2543
 msgid "invalid prefix length for from/src"
 msgstr "некоректна довжина префікса для from/src"
 
-#: ../libnm-core/nm-setting-ip-config.c:2548
+#: ../libnm-core/nm-setting-ip-config.c:2550
 msgid "has to/dst but the prefix-length is zero"
 msgstr ""
 "містить to/dst, але значення довжини префікса (prefix-length) є нульовим"
 
-#: ../libnm-core/nm-setting-ip-config.c:2555
+#: ../libnm-core/nm-setting-ip-config.c:2557
 msgid "missing to/dst for a non zero prefix-length"
 msgstr "пропущено to/dst для ненульового значення довжини префікса"
 
-#: ../libnm-core/nm-setting-ip-config.c:2560
+#: ../libnm-core/nm-setting-ip-config.c:2562
 msgid "invalid to/dst"
 msgstr "некоректне значення to/dst"
 
-#: ../libnm-core/nm-setting-ip-config.c:2565
+#: ../libnm-core/nm-setting-ip-config.c:2567
 msgid "invalid prefix length for to/dst"
 msgstr "некоректна довжина префікса для to/dst"
 
-#: ../libnm-core/nm-setting-ip-config.c:2573
+#: ../libnm-core/nm-setting-ip-config.c:2575
 msgid "invalid iifname"
 msgstr "некоректна назва інтерфейсу"
 
-#: ../libnm-core/nm-setting-ip-config.c:2581
+#: ../libnm-core/nm-setting-ip-config.c:2583
 msgid "invalid oifname"
 msgstr "некоректна назва інтерфейсу (oifname)"
 
-#: ../libnm-core/nm-setting-ip-config.c:2587
+#: ../libnm-core/nm-setting-ip-config.c:2589
 msgid "invalid source port range"
 msgstr "некоректний діапазон номерів порту джерела"
 
-#: ../libnm-core/nm-setting-ip-config.c:2593
+#: ../libnm-core/nm-setting-ip-config.c:2595
 msgid "invalid destination port range"
 msgstr "некоректний діапазон номерів порту призначення"
 
-#: ../libnm-core/nm-setting-ip-config.c:2601
+#: ../libnm-core/nm-setting-ip-config.c:2603
 msgid "suppress_prefixlength out of range"
 msgstr "suppress_prefixlength поза припустимим діапазоном"
 
-#: ../libnm-core/nm-setting-ip-config.c:2606
+#: ../libnm-core/nm-setting-ip-config.c:2608
 msgid "suppress_prefixlength is only allowed with the to-table action"
 msgstr ""
 "suppress_prefixlength можна використовувати лише разом із дією to-table"
 
-#: ../libnm-core/nm-setting-ip-config.c:2713
+#: ../libnm-core/nm-setting-ip-config.c:2715
 #, c-format
 msgid "duplicate key %s"
 msgstr "дублікат ключа %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2727
+#: ../libnm-core/nm-setting-ip-config.c:2729
 #, c-format
 msgid "invalid key \"%s\""
 msgstr "некоректний ключ «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:2740
+#: ../libnm-core/nm-setting-ip-config.c:2742
 #, c-format
 msgid "invalid variant type '%s' for \"%s\""
 msgstr "некоректний тип варіанта «%s» для «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:2749
+#: ../libnm-core/nm-setting-ip-config.c:2751
 msgid "missing \""
 msgstr "не вистачає \""
 
-#: ../libnm-core/nm-setting-ip-config.c:2755
+#: ../libnm-core/nm-setting-ip-config.c:2757
 msgid "invalid \""
 msgstr "некоректна \""
 
-#: ../libnm-core/nm-setting-ip-config.c:2952
+#: ../libnm-core/nm-setting-ip-config.c:2954
 msgid "Unsupported to-string-flags argument"
 msgstr "Непідтримуваний аргумент to-string-flags"
 
-#: ../libnm-core/nm-setting-ip-config.c:2959
+#: ../libnm-core/nm-setting-ip-config.c:2961
 msgid "Unsupported extra-argument"
 msgstr "Непідтримуваний додатковий аргумент"
 
-#: ../libnm-core/nm-setting-ip-config.c:3226
+#: ../libnm-core/nm-setting-ip-config.c:3228
 #, c-format
 msgid "unsupported key \"%s\""
 msgstr "непідтримуваний ключ «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:3231
+#: ../libnm-core/nm-setting-ip-config.c:3233
 #, c-format
 msgid "duplicate key \"%s\""
 msgstr "дублікат ключа «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:3236
+#: ../libnm-core/nm-setting-ip-config.c:3238
 #, c-format
 msgid "invalid value for \"%s\""
 msgstr "некоректне значення «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:3246
+#: ../libnm-core/nm-setting-ip-config.c:3248
 msgid "empty text does not describe a rule"
 msgstr "порожній текст не описує правило"
 
-#: ../libnm-core/nm-setting-ip-config.c:3252
+#: ../libnm-core/nm-setting-ip-config.c:3254
 #, c-format
 msgid "missing argument for \"%s\""
 msgstr "пропущено аргумент «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:3264
+#: ../libnm-core/nm-setting-ip-config.c:3266
 msgid "invalid \"from\" part"
 msgstr "некоректна частина «from»"
 
-#: ../libnm-core/nm-setting-ip-config.c:3278
+#: ../libnm-core/nm-setting-ip-config.c:3280
 msgid "invalid \"to\" part"
 msgstr "некоректна частина «to»"
 
-#: ../libnm-core/nm-setting-ip-config.c:3287
+#: ../libnm-core/nm-setting-ip-config.c:3289
 #, c-format
 msgid "cannot detect address family for rule"
 msgstr "не вдалося визначити сімейство адрес для правила"
 
-#: ../libnm-core/nm-setting-ip-config.c:3347
-#: ../libnm-core/nm-setting-ip-config.c:3441
+#: ../libnm-core/nm-setting-ip-config.c:3349
+#: ../libnm-core/nm-setting-ip-config.c:3443
 #, c-format
 msgid "rule is invalid: %s"
 msgstr "правило є некоректним: %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:3424
+#: ../libnm-core/nm-setting-ip-config.c:3426
 msgid "invalid address family"
 msgstr "некоректне сімейство адрес"
 
-#: ../libnm-core/nm-setting-ip-config.c:4697
+#: ../libnm-core/nm-setting-ip-config.c:4699
 #, c-format
 msgid "rule #%u is invalid: %s"
 msgstr "правило %u є некоректним: %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:4953
+#: ../libnm-core/nm-setting-ip-config.c:4955
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. Адреса сервера DNS є некоректною."
 
-#: ../libnm-core/nm-setting-ip-config.c:4969
+#: ../libnm-core/nm-setting-ip-config.c:4971
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. IP-адреса є некоректною."
 
-#: ../libnm-core/nm-setting-ip-config.c:4981
+#: ../libnm-core/nm-setting-ip-config.c:4983
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. IP-адреса має властивість «label» некоректного типу"
 
-#: ../libnm-core/nm-setting-ip-config.c:4990
+#: ../libnm-core/nm-setting-ip-config.c:4992
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. IP-адреса має некоректну мітку, «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:5004
+#: ../libnm-core/nm-setting-ip-config.c:5006
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "шлюз не може бути встановлено, якщо не налаштовано адрес"
 
-#: ../libnm-core/nm-setting-ip-config.c:5013
+#: ../libnm-core/nm-setting-ip-config.c:5015
 msgid "gateway is invalid"
 msgstr "шлюз є некоректним"
 
-#: ../libnm-core/nm-setting-ip-config.c:5027
+#: ../libnm-core/nm-setting-ip-config.c:5029
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. Некоректний маршрут"
 
-#: ../libnm-core/nm-setting-ip-config.c:5043
+#: ../libnm-core/nm-setting-ip-config.c:5045
 #, c-format
 msgid "%u. rule has wrong address-family"
 msgstr "%u. у правилі вказано помилкове сімейство адрес"
 
-#: ../libnm-core/nm-setting-ip-config.c:5052
+#: ../libnm-core/nm-setting-ip-config.c:5054
 #, c-format
 msgid "%u. rule is invalid: %s"
 msgstr "%u. правило є некоректним: %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:5066
+#: ../libnm-core/nm-setting-ip-config.c:5068
 #, c-format
 msgid "'%s' is not a valid IAID"
 msgstr "«%s» не є коректним IAID"
 
-#: ../libnm-core/nm-setting-ip-config.c:5080
+#: ../libnm-core/nm-setting-ip-config.c:5082
 #, c-format
 msgid "the property cannot be set when '%s' is disabled"
 msgstr "властивість не можна встановлювати, якщо вимкнено «%s»"
 
-#: ../libnm-core/nm-setting-ip-config.c:5102
+#: ../libnm-core/nm-setting-ip-config.c:5104
 #, c-format
 msgid "a gateway is incompatible with '%s'"
 msgstr "шлюз є несумісним з «%s»"
@@ -12821,7 +12901,7 @@ msgstr "досягнуто максимальної кількості запи
 msgid "invalid key \"%s\": %s"
 msgstr "некоректний ключ «%s»: %s"
 
-#: ../libnm-core/nm-setting-user.c:358 ../shared/nm-keyfile/nm-keyfile.c:856
+#: ../libnm-core/nm-setting-user.c:358 ../shared/nm-keyfile/nm-keyfile.c:857
 #, c-format
 msgid "invalid value for \"%s\": %s"
 msgstr "некоректне значення для «%s»: %s"
@@ -12868,7 +12948,6 @@ msgstr "пароль не належить до коректного типу"
 
 #: ../libnm-core/nm-setting-vpn.c:749 ../libnm-core/nm-setting-vpn.c:798
 #, c-format
-#| msgid "interface name must not be empty"
 msgid "secret name cannot be empty"
 msgstr "назва реєстраційного запису не може бути порожньою"
 
@@ -13282,126 +13361,126 @@ msgstr "Підтримки архівів libtool не передбачено (%
 msgid "Could not find \"%s\" binary"
 msgstr "Не вдалося знайти виконуваний файл «%s»"
 
-#: ../libnm-core/nm-utils.c:4506
+#: ../libnm-core/nm-utils.c:4504
 msgid "unknown secret flags"
 msgstr "невідомі прапорці реєстраційних даних"
 
-#: ../libnm-core/nm-utils.c:4516
+#: ../libnm-core/nm-utils.c:4514
 msgid "conflicting secret flags"
 msgstr "конфлікт прапорців реєстраційних даних"
 
-#: ../libnm-core/nm-utils.c:4527
+#: ../libnm-core/nm-utils.c:4525
 msgid "secret flags must not be \"not-required\""
 msgstr "прапорці реєстраційних даних не можуть бути «not-required»"
 
-#: ../libnm-core/nm-utils.c:4535
+#: ../libnm-core/nm-utils.c:4533
 msgid "unsupported secret flags"
 msgstr "непідтримувані прапорці реєстраційних даних"
 
-#: ../libnm-core/nm-utils.c:4565
+#: ../libnm-core/nm-utils.c:4563
 msgid "can't be simultaneously disabled and enabled"
 msgstr "не може бути одночасно вимкнено і увімкнено"
 
-#: ../libnm-core/nm-utils.c:4573
+#: ../libnm-core/nm-utils.c:4571
 msgid "WPS is required"
 msgstr "Потрібна WPS"
 
-#: ../libnm-core/nm-utils.c:4639
+#: ../libnm-core/nm-utils.c:4637
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr "некоректна адреса MAC ethernet для маски у позиції %lld"
 
-#: ../libnm-core/nm-utils.c:4654
+#: ../libnm-core/nm-utils.c:4652
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
 msgstr "некоректна адреса MAC ethernet #%u у позиції %lld"
 
-#: ../libnm-core/nm-utils.c:5351
+#: ../libnm-core/nm-utils.c:5347
 msgid "not valid utf-8"
 msgstr "некоректні дані UTF-8"
 
-#: ../libnm-core/nm-utils.c:5372 ../libnm-core/nm-utils.c:5425
+#: ../libnm-core/nm-utils.c:5368 ../libnm-core/nm-utils.c:5421
 msgid "is not a JSON object"
 msgstr "не є об'єктом JSON"
 
-#: ../libnm-core/nm-utils.c:5401 ../libnm-core/nm-utils.c:5438
+#: ../libnm-core/nm-utils.c:5397 ../libnm-core/nm-utils.c:5434
 msgid "value is NULL"
 msgstr "значенням є NULL"
 
-#: ../libnm-core/nm-utils.c:5401 ../libnm-core/nm-utils.c:5438
+#: ../libnm-core/nm-utils.c:5397 ../libnm-core/nm-utils.c:5434
 msgid "value is empty"
 msgstr "порожнє значення"
 
-#: ../libnm-core/nm-utils.c:5413
+#: ../libnm-core/nm-utils.c:5409
 #, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr "некоректний код JSON на позиції %d (%s)"
 
-#: ../libnm-core/nm-utils.c:5575 ../libnm-core/nm-utils.c:5595
+#: ../libnm-core/nm-utils.c:5571 ../libnm-core/nm-utils.c:5591
 msgid "unterminated escape sequence"
 msgstr "незавершена екранована послідовність"
 
-#: ../libnm-core/nm-utils.c:5620
+#: ../libnm-core/nm-utils.c:5616
 #, c-format
 msgid "unknown attribute '%s'"
 msgstr "невідомий атрибут «%s»"
 
-#: ../libnm-core/nm-utils.c:5635
+#: ../libnm-core/nm-utils.c:5631
 #, c-format
 msgid "missing key-value separator '%c' after '%s'"
 msgstr "пропущено роздільник пар ключ-значення «%c» після «%s»"
 
-#: ../libnm-core/nm-utils.c:5651
+#: ../libnm-core/nm-utils.c:5647
 #, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
 msgstr "некоректне значення uint32 «%s» атрибута «%s»"
 
-#: ../libnm-core/nm-utils.c:5660
+#: ../libnm-core/nm-utils.c:5656
 #, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
 msgstr "некоректне значення uint8 «%s» атрибута «%s»"
 
-#: ../libnm-core/nm-utils.c:5670
+#: ../libnm-core/nm-utils.c:5666
 #, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
 msgstr "некоректне булеве значення «%s» атрибута «%s»"
 
-#: ../libnm-core/nm-utils.c:5680
+#: ../libnm-core/nm-utils.c:5676
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
 msgstr "непідтримуваний атрибут «%s» типу «%s»"
 
-#: ../libnm-core/nm-utils.c:6045
+#: ../libnm-core/nm-utils.c:6041
 #, c-format
 msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
 msgstr "VLAN містка %d і %d не упорядковано за зростанням vid"
 
-#: ../libnm-core/nm-utils.c:6069
+#: ../libnm-core/nm-utils.c:6065
 #, c-format
 msgid "duplicate bridge VLAN vid %u"
 msgstr "дублікат містка vid VLAN %u"
 
-#: ../libnm-core/nm-utils.c:6081
+#: ../libnm-core/nm-utils.c:6077
 msgid "only one VLAN can be the PVID"
 msgstr "лише одна з VLAN може бути PVID"
 
-#: ../libnm-core/nm-utils.c:6131
+#: ../libnm-core/nm-utils.c:6127
 #, c-format
 msgid "unknown flags 0x%x"
 msgstr "невідомі прапорці 0x%x"
 
-#: ../libnm-core/nm-utils.c:6141
+#: ../libnm-core/nm-utils.c:6137
 msgid ""
 "'fqdn-no-update' and 'fqdn-serv-update' flags cannot be set at the same time"
 msgstr ""
 "не можна одночасно встановлювати прапорці «fqdn-no-update» і «fqdn-serv-"
 "update»"
 
-#: ../libnm-core/nm-utils.c:6152
+#: ../libnm-core/nm-utils.c:6148
 msgid "'fqdn-clear-flags' flag is incompatible with other FQDN flags"
 msgstr "прапорець «fqdn-clear-flags» є несумісним із іншими прапорцями FQDN"
 
-#: ../libnm-core/nm-utils.c:6161
+#: ../libnm-core/nm-utils.c:6157
 msgid "DHCPv6 does not support the E (encoded) FQDN flag"
 msgstr "у DHCPv6 не передбачено підтримки прапорця E (закодовано) FQDN"
 
@@ -13972,36 +14051,36 @@ msgstr ""
 "Правила системи забороняють вмикання або вимикання перевірки придатності до "
 "з'єднання"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:2184
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2202
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "у класі об'єктів «%s» немає властивості із назвою «%s»"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:2191
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2209
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "властивість «%s» класу об'єктів «%s» є непридатною до запису"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:2198
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2216
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 "властивість construct «%s» об'єкта «%s» не можна встановлювати після побудови"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:2206
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2224
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "«%s::%s» не є коректною назвою властивості; «%s» не є підтипом GObject"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:2215
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2233
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "не вдалося встановити значення властивості «%s» типу «%s» на основі значення "
 "типу «%s»"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:2226
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2244
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -14010,260 +14089,260 @@ msgstr ""
 "значення «%s» типу «%s» є некоректним для властивості «%s» типу «%s» або не "
 "належить до припустимого діапазону значень"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:4549
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4614
 msgid "interface name is missing"
 msgstr "пропущено назву інтерфейсу"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:4555
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4620
 msgid "interface name is too short"
 msgstr "назва інтерфейсу є надто короткою"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:4564
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4629
 msgid "interface name is reserved"
 msgstr "таку назву інтерфейсу зарезервовано"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:4576
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4641
 msgid "interface name contains an invalid character"
 msgstr "назва інтерфейсу містить некоректний символ"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:4582
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4647
 msgid "interface name is longer than 15 characters"
 msgstr "назва інтерфейсу є довшою за 15 символів"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:4605
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4670
 #, c-format
 msgid "'%%' is not allowed in interface names"
 msgstr "«%%» не можна використовувати у назвах інтерфейсів"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:4618
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4683
 #, c-format
 msgid "'%s' is not allowed as interface name"
 msgstr "«%s» не можна використовувати як назву інтерфейсу"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:4639
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4704
 msgid ""
 "interface name must be alphanumerical with no forward or backward slashes"
 msgstr ""
 "назва інтерфейсу має складатися з літер і цифр без початкового і "
 "завершального символів похилої риски"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:4656
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4721
 msgid "interface name must not be empty"
 msgstr "назва інтерфейсу не може бути порожньою"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:4662
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4727
 msgid "interface name must be UTF-8 encoded"
 msgstr "назва інтерфейсу має бути набором символів у кодуванні UTF-8"
 
-#: ../shared/nm-keyfile/nm-keyfile-utils.c:242
+#: ../shared/nm-keyfile/nm-keyfile-utils.c:241
 #, c-format
 msgid "value is not an integer in range [%lld, %lld]"
 msgstr "значення не є цілим числом у діапазоні [%lld, %lld]"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:196
+#: ../shared/nm-keyfile/nm-keyfile.c:197
 msgid "ignoring missing number"
 msgstr "ігноруємо пропущене число"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:204
+#: ../shared/nm-keyfile/nm-keyfile.c:205
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "ігноруємо некоректне число «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:225
+#: ../shared/nm-keyfile/nm-keyfile.c:226
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "ігноруємо некоректну адресу %s: %s"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:268
+#: ../shared/nm-keyfile/nm-keyfile.c:269
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "ігноруємо некоректний шлюз «%s» для маршруту %s"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:292
+#: ../shared/nm-keyfile/nm-keyfile.c:293
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "ігноруємо некоректний маршрут %s: %s"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:464
+#: ../shared/nm-keyfile/nm-keyfile.c:465
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "неочікуваний символ «%c» для адреси %s: «%s» (позиція %td)"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:474
+#: ../shared/nm-keyfile/nm-keyfile.c:475
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "неочікуваний символ «%c» для %s: «%s» (позиція %td)"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:483
+#: ../shared/nm-keyfile/nm-keyfile.c:484
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr "неочікуваний символ «%c» у префіксі довжини для %s: «%s» (позиція %td)"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:494
+#: ../shared/nm-keyfile/nm-keyfile.c:495
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "зайві дані наприкінці значення %s: «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:500
+#: ../shared/nm-keyfile/nm-keyfile.c:501
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "застаріла крапка з комою наприкінці значення %s: «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:514
+#: ../shared/nm-keyfile/nm-keyfile.c:515
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "некоректний префікс довжини для %s «%s», повертаємося до типового, %d"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:521
+#: ../shared/nm-keyfile/nm-keyfile.c:522
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "пропущено префікс довжини для %s «%s», повертаємося до типового, %d"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:894
+#: ../shared/nm-keyfile/nm-keyfile.c:895
 #, c-format
 msgid "ignoring invalid DNS server IPv%c address '%s'"
 msgstr "ігноруємо некоректну адресу IPv%c сервера DNS «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:990 ../shared/nm-keyfile/nm-keyfile.c:3143
+#: ../shared/nm-keyfile/nm-keyfile.c:979
+msgid "ignoring invalid MAC address"
+msgstr "ігноруємо некоректну MAC-адресу"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1238
+msgid "ignoring invalid SSID"
+msgstr "ігноруємо некоректний SSID"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1254
+msgid "ignoring invalid raw password"
+msgstr "ігноруємо некоректний необроблений пароль"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1394
+msgid "invalid key/cert value"
+msgstr "некоректне значення ключа/сертифіката"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1405
+#, c-format
+msgid "invalid key/cert value path \"%s\""
+msgstr "некоректний шлях до ключа/сертифіката, «%s»"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1425
+#: ../shared/nm-keyfile/nm-keyfile.c:1508
+#, c-format
+msgid "certificate or key file '%s' does not exist"
+msgstr "файла сертифіката або ключа «%s» не існує"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1434
+#, c-format
+msgid "invalid PKCS#11 URI \"%s\""
+msgstr "некоректна адреса PKCS#11 «%s»"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1478
+msgid "invalid key/cert value data:;base64, is not base64"
+msgstr "некоректні дані значення ключа/сертифіката data:;base64, не є base64"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1487
+msgid "invalid key/cert value data:;base64,file://"
+msgstr "некоректне значення ключа/сертифіката data:;base64,file://"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1520
+msgid "invalid key/cert value is not a valid blob"
+msgstr ""
+"некоректне значення ключа/сертифіката, не є коректним значення «%s» не є "
+"коректним великим бінарним об'єктом"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1622
+#, c-format
+msgid "invalid parity value '%s'"
+msgstr "некоректне значення парності, «%s»"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1639
+#: ../shared/nm-keyfile/nm-keyfile.c:3176
+#, c-format
+msgid "invalid setting: %s"
+msgstr "некоректний параметр: %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1656
+#, c-format
+msgid "ignoring invalid team configuration: %s"
+msgstr "ігноруємо некоректне налаштування команди: %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1734
+#, c-format
+msgid "invalid qdisc: %s"
+msgstr "некоректний qdisc: %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:1780
+#, c-format
+msgid "invalid tfilter: %s"
+msgstr "некоректний tfilter: %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3020
+#, c-format
+msgid "error loading setting value: %s"
+msgstr "помилка під час завантаження значення параметра: %s"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3048
+#: ../shared/nm-keyfile/nm-keyfile.c:3059
+#: ../shared/nm-keyfile/nm-keyfile.c:3077
+#: ../shared/nm-keyfile/nm-keyfile.c:3088
+#: ../shared/nm-keyfile/nm-keyfile.c:3099
+#: ../shared/nm-keyfile/nm-keyfile.c:3151
+#: ../shared/nm-keyfile/nm-keyfile.c:3162
+msgid "value cannot be interpreted as integer"
+msgstr "значення не може бути оброблено як ціле число"
+
+#: ../shared/nm-keyfile/nm-keyfile.c:3121
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr ""
 "ігноруємо некоректний байтовий елемент «%d» (не у діапазоні від 0 до 255, "
 "включно)"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1001
-msgid "ignoring invalid MAC address"
-msgstr "ігноруємо некоректну MAC-адресу"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1260
-msgid "ignoring invalid SSID"
-msgstr "ігноруємо некоректний SSID"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1276
-msgid "ignoring invalid raw password"
-msgstr "ігноруємо некоректний необроблений пароль"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1416
-msgid "invalid key/cert value"
-msgstr "некоректне значення ключа/сертифіката"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1427
-#, c-format
-msgid "invalid key/cert value path \"%s\""
-msgstr "некоректний шлях до ключа/сертифіката, «%s»"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1447
-#: ../shared/nm-keyfile/nm-keyfile.c:1530
-#, c-format
-msgid "certificate or key file '%s' does not exist"
-msgstr "файла сертифіката або ключа «%s» не існує"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1456
-#, c-format
-msgid "invalid PKCS#11 URI \"%s\""
-msgstr "некоректна адреса PKCS#11 «%s»"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1500
-msgid "invalid key/cert value data:;base64, is not base64"
-msgstr "некоректні дані значення ключа/сертифіката data:;base64, не є base64"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1509
-msgid "invalid key/cert value data:;base64,file://"
-msgstr "некоректне значення ключа/сертифіката data:;base64,file://"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1542
-msgid "invalid key/cert value is not a valid blob"
-msgstr ""
-"некоректне значення ключа/сертифіката, не є коректним значення «%s» не є "
-"коректним великим бінарним об'єктом"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1644
-#, c-format
-msgid "invalid parity value '%s'"
-msgstr "некоректне значення парності, «%s»"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1661
-#: ../shared/nm-keyfile/nm-keyfile.c:3198
-#, c-format
-msgid "invalid setting: %s"
-msgstr "некоректний параметр: %s"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1678
-#, c-format
-msgid "ignoring invalid team configuration: %s"
-msgstr "ігноруємо некоректне налаштування команди: %s"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1756
-#, c-format
-msgid "invalid qdisc: %s"
-msgstr "некоректний qdisc: %s"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:1802
-#, c-format
-msgid "invalid tfilter: %s"
-msgstr "некоректний tfilter: %s"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:3042
-#, c-format
-msgid "error loading setting value: %s"
-msgstr "помилка під час завантаження значення параметра: %s"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:3070
-#: ../shared/nm-keyfile/nm-keyfile.c:3081
-#: ../shared/nm-keyfile/nm-keyfile.c:3099
-#: ../shared/nm-keyfile/nm-keyfile.c:3110
-#: ../shared/nm-keyfile/nm-keyfile.c:3121
-#: ../shared/nm-keyfile/nm-keyfile.c:3173
-#: ../shared/nm-keyfile/nm-keyfile.c:3184
-msgid "value cannot be interpreted as integer"
-msgstr "значення не може бути оброблено як ціле число"
-
-#: ../shared/nm-keyfile/nm-keyfile.c:3219
+#: ../shared/nm-keyfile/nm-keyfile.c:3197
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "некоректна назва параметра, «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3264
+#: ../shared/nm-keyfile/nm-keyfile.c:3242
 #, c-format
 msgid "invalid key '%s.%s'"
 msgstr "некоректний ключ «%s.%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3279
+#: ../shared/nm-keyfile/nm-keyfile.c:3257
 #, c-format
 msgid "key '%s.%s' is not boolean"
 msgstr "ключ «%s.%s» не є булевим значенням"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3336
+#: ../shared/nm-keyfile/nm-keyfile.c:3314
 #, c-format
 msgid "invalid peer public key in section '%s'"
 msgstr "некоректний відкритий ключ вузла у розділі «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3348
+#: ../shared/nm-keyfile/nm-keyfile.c:3326
 #, c-format
 msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
 msgstr "ключ «%s.%s» не є коректним 256-бітовим ключем у кодуванні base64"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3361
+#: ../shared/nm-keyfile/nm-keyfile.c:3339
 #, c-format
 msgid "key '%s.%s' is not a valid secret flag"
 msgstr "ключ «%s.%s» не є коректним прапорцем реєстраційних даних"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3373
+#: ../shared/nm-keyfile/nm-keyfile.c:3351
 #, c-format
 msgid "key '%s.%s' is not a integer in range 0 to 2^32"
 msgstr "ключ «%s.%s» не є цілими числом у діапазоні від 0 до 2^32"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3385
+#: ../shared/nm-keyfile/nm-keyfile.c:3363
 #, c-format
 msgid "key '%s.%s' is not a valid endpoint"
 msgstr "ключ «%s.%s» не є коректною кінцевою точкою"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3407
+#: ../shared/nm-keyfile/nm-keyfile.c:3385
 #, c-format
 msgid "key '%s.%s' has invalid allowed-ips"
 msgstr "для ключа «%s.%s» вказано некоректне значення allowed-ips"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3419
+#: ../shared/nm-keyfile/nm-keyfile.c:3397
 #, c-format
 msgid "peer '%s' is invalid: %s"
 msgstr "вузол «%s» є некоректним: %s"
@@ -14329,27 +14408,27 @@ msgid "Failed to read configuration: %s\n"
 msgstr "Не вдалося прочитати налаштування: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:184 ../src/nm-iface-helper.c:296
+#: ../src/main.c:184 ../src/nm-iface-helper.c:297
 msgid "Print NetworkManager version and exit"
 msgstr "Вивести дані щодо версії NetworkManager і завершити роботу"
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:297
+#: ../src/main.c:185 ../src/nm-iface-helper.c:298
 msgid "Don't become a daemon"
 msgstr "Не переходити у стан фонової служби"
 
-#: ../src/main.c:186 ../src/nm-iface-helper.c:299
+#: ../src/main.c:186 ../src/nm-iface-helper.c:300
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Рівень докладності журналу: одне з таких значень: [%s]"
 
-#: ../src/main.c:188 ../src/nm-iface-helper.c:301
+#: ../src/main.c:188 ../src/nm-iface-helper.c:302
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr ""
 "Список доменів для ведення журналу, відокремлених символом «,»: будь-яка "
 "комбінація з [%s]"
 
-#: ../src/main.c:190 ../src/nm-iface-helper.c:303
+#: ../src/main.c:190 ../src/nm-iface-helper.c:304
 msgid "Make all warnings fatal"
 msgstr "Вважати всі попередження помилками"
 
@@ -14374,14 +14453,14 @@ msgstr ""
 "з якими слід пов'язувати картки бездротового доступу на вашому\n"
 "комп'ютері."
 
-#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:444
+#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:445
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "%s. Щоб ознайомитися зі списком параметрів, скористайтеся параметром --"
 "help.\n"
 
-#: ../src/main.c:358 ../src/nm-iface-helper.c:457
+#: ../src/main.c:358 ../src/nm-iface-helper.c:458
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Не вдалося створити фонову службу: %s [помилка %u]\n"
@@ -14416,11 +14495,11 @@ msgstr "%s вже працює (pid %ld)\n"
 msgid "You must be root to run %s!\n"
 msgstr "Для виконання %s потрібно перейти у режим root!\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:303
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:324
 msgid "# Created by NetworkManager\n"
 msgstr "# Створено за допомогою NetworkManager\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:316
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:337
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -14730,7 +14809,7 @@ msgstr "Список додатків, відокремлених комами (
 msgid "Quit after initial configuration"
 msgstr "Вийти після початкового налаштовування"
 
-#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:298
+#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon, and log to stderr"
 msgstr ""
 "Не переходити у стан фонової служби і записувати повідомлення журналу до "
@@ -14758,83 +14837,83 @@ msgid "Show NetworkManager options"
 msgstr "Показати параметри NetworkManager"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:278
+#: ../src/nm-iface-helper.c:279
 msgid "The interface to manage"
 msgstr "Інтерфейс для керування"
 
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:280
 msgid "Connection UUID"
 msgstr "UUID з'єднання"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 msgid "Connection Token for Stable IDs"
 msgstr "Жетон з'єднання для стабільних ідентифікаторів"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "Чи слід керувати SLAAC IPv6"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:283
 msgid "Whether SLAAC must be successful"
 msgstr "Чи має бути SLAAC успішним"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:284
 msgid "Use an IPv6 temporary privacy address"
 msgstr "Використовувати тимчасову приватну адресу IPv6"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:285
 msgid "Current DHCPv4 address"
 msgstr "Поточна адреса DHCPv4"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:286
 msgid "Whether DHCPv4 must be successful"
 msgstr "Чи має DHCPv4 бути успішним"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:287
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "Закодований у шістнадцяткову форму ідентифікатор клієнта DHCPv4"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:288
 msgid "Hostname to send to DHCP server"
 msgstr "Назва вузла для надсилання на сервер DHCP"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:288
 msgid "barbar"
 msgstr "щосьщось"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "FQDN to send to DHCP server"
 msgstr "Повна назва вузла (FQDN) для надсилання на сервер DHCP"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "host.domain.org"
 msgstr "вузол.домен.org"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "Route priority for IPv4"
 msgstr "Пріоритет маршруту для IPv4"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "Route priority for IPv6"
 msgstr "Пріоритет маршруту для IPv6"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:292
 msgid "Hex-encoded Interface Identifier"
 msgstr "Закодований у шістнадцяткове число ідентифікатор інтерфейсу"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:293
 msgid "IPv6 SLAAC address generation mode"
 msgstr "Режим створення адреси SLAAC IPv6"
 
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:294
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
@@ -14842,7 +14921,7 @@ msgstr ""
 "Значення налаштування модуля ведення журналу. Див. logging.backend у "
 "NetworkManager.conf"
 
-#: ../src/nm-iface-helper.c:313
+#: ../src/nm-iface-helper.c:314
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
@@ -14850,29 +14929,29 @@ msgstr ""
 "nm-iface-helper — малий окремий процес, який керує окремим інтерфейсом "
 "мережі."
 
-#: ../src/nm-iface-helper.c:424
+#: ../src/nm-iface-helper.c:425
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "Потрібні назва і UUID інтерфейсу\n"
 
-#: ../src/nm-iface-helper.c:431
+#: ../src/nm-iface-helper.c:432
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "Не вдалося знайти покажчик інтерфейсу для %s (%s)\n"
 
-#: ../src/nm-iface-helper.c:449
+#: ../src/nm-iface-helper.c:450
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr ""
 "Ігноруємо нерозпізнані домени журналювання, «%s», передані за допомогою "
 "командного рядка.\n"
 
-#: ../src/nm-iface-helper.c:490
+#: ../src/nm-iface-helper.c:491
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): некоректний IID %s\n"
 
-#: ../src/nm-iface-helper.c:501
+#: ../src/nm-iface-helper.c:502
 #, c-format
 msgid "(%s): Invalid DHCP client-id %s\n"
 msgstr "(%s): некоректний ідентифікатор клієнта DHCP %s\n"

From 8e945c8967c04c6dd108d3c354cbd8396f43cff2 Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Tue, 21 Apr 2020 17:35:51 +0200
Subject: [PATCH 113/222] nm-setting-bridge: add missing 'Since: X.Y' comments
 to options

https://bugzilla.redhat.com/show_bug.cgi?id=1755768
---
 libnm-core/nm-setting-bridge.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index d800022168..957520f4a6 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1741,6 +1741,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 * description: VLAN filtering protocol.
 	 * example: BRIDGING_OPTS="vlan_protocol=802.1Q"
 	 * ---end---
+	 *
+	 * Since: 1.24
 	 */
 	obj_properties[PROP_VLAN_PROTOCOL] =
 	    g_param_spec_string (NM_SETTING_BRIDGE_VLAN_PROTOCOL, "", "",
@@ -1760,6 +1762,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 * default: 0
 	 * example: BRIDGING_OPTS="vlan_stats_enabled=1"
 	 * ---end---
+	 *
+	 * Since: 1.24
 	 */
 	obj_properties[PROP_VLAN_STATS_ENABLED] =
 	    g_param_spec_boolean (NM_SETTING_BRIDGE_VLAN_STATS_ENABLED, "", "",
@@ -1784,6 +1788,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 * default: auto
 	 * example: BRIDGING_OPTS="multicast_router=enabled"
 	 * ---end---
+	 *
+	 * Since: 1.24
 	 */
 	obj_properties[PROP_MULTICAST_ROUTER] =
 	    g_param_spec_string (NM_SETTING_BRIDGE_MULTICAST_ROUTER, "", "",
@@ -1805,6 +1811,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 * default: 0
 	 * example: BRIDGING_OPTS="multicast_query-use_ifaddr=1"
 	 * ---end---
+	 *
+	 * Since: 1.24
 	 */
 	obj_properties[PROP_MULTICAST_QUERY_USE_IFADDR] =
 	    g_param_spec_boolean (NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR, "", "",
@@ -1825,6 +1833,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 * default: 0
 	 * example: BRIDGING_OPTS="multicast_querier=1"
 	 * ---end---
+	 *
+	 * Since: 1.24
 	 */
 	obj_properties[PROP_MULTICAST_QUERIER] =
 	    g_param_spec_boolean (NM_SETTING_BRIDGE_MULTICAST_QUERIER, "", "",

From 673d51bd5c2674fc1e1df41ffa1efdcd28c7572e Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Fri, 10 Apr 2020 15:03:39 +0200
Subject: [PATCH 114/222] nm-setting-bridge: add 'multicast-hash-max' bridge
 option

https://bugzilla.redhat.com/show_bug.cgi?id=1755768
---
 clients/common/nm-meta-setting-desc.c         |  4 ++
 clients/common/settings-docs.h.in             |  1 +
 libnm-core/nm-core-internal.h                 |  3 +
 libnm-core/nm-setting-bridge.c                | 57 +++++++++++++++++++
 libnm-core/nm-setting-bridge.h                |  4 ++
 libnm-core/tests/test-setting.c               |  7 +++
 libnm/libnm.ver                               |  1 +
 src/devices/nm-device-bridge.c                |  4 ++
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |  1 +
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    |  7 +++
 10 files changed, 89 insertions(+)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 66c1a4f1be..4c96e3aaec 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -4939,6 +4939,10 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	    .prompt =                       N_("Group forward mask [0]"),
 	    .property_type =                &_pt_gobject_int,
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,
+	    .property_type =                &_pt_gobject_int,
+	    .hide_if_default =              TRUE,
+	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERIER,
 	    .property_type =                &_pt_gobject_bool,
 	    .hide_if_default =              TRUE,
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index c9667b47c8..2add72993c 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -119,6 +119,7 @@
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_HELLO_TIME N_("The Spanning Tree Protocol (STP) hello time, in seconds.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MAC_ADDRESS N_("If specified, the MAC address of bridge. When creating a new bridge, this MAC address will be set. If this field is left unspecified, the \"ethernet.cloned-mac-address\" is referred instead to generate the initial MAC address. Note that setting \"ethernet.cloned-mac-address\" anyway overwrites the MAC address of the bridge later while activating the bridge. Hence, this property is deprecated. Deprecated: 1")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MAX_AGE N_("The Spanning Tree Protocol (STP) maximum message age, in seconds.")
+#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_HASH_MAX N_("Set maximum size of multicast hash table (value must be a power of 2).")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERIER N_("Enable or disable sending of multicast queries by the bridge. If not specified the option is disabled.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR N_("If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_ROUTER N_("Sets bridge's multicast router. multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not specified the default value is 'auto'.")
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index ef9e982bf6..bcf3cb406b 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -97,6 +97,9 @@
 #define NM_BR_PORT_MAX_PATH_COST 65535
 #define NM_BR_PORT_DEF_PATH_COST 100
 
+#define NM_BR_MIN_MULTICAST_HASH_MAX 1
+#define NM_BR_MAX_MULTICAST_HASH_MAX G_MAXUINT32
+
 /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
  * connection can be replaced by a already-defined connection. This flag only
  * takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 957520f4a6..7739dd2afd 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -26,6 +26,7 @@
 #define BRIDGE_FORWARD_DELAY_DEFAULT              15
 #define BRIDGE_HELLO_TIME_DEFAULT                 2
 #define BRIDGE_MAX_AGE_DEFAULT                    20
+#define BRIDGE_MULTICAST_HASH_MAX_DEFAULT         4096
 #define BRIDGE_MULTICAST_QUERIER_DEFAULT          FALSE
 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT FALSE
 #define BRIDGE_MULTICAST_SNOOPING_DEFAULT         TRUE
@@ -46,6 +47,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBridge,
 	PROP_AGEING_TIME,
 	PROP_GROUP_ADDRESS,
 	PROP_GROUP_FORWARD_MASK,
+	PROP_MULTICAST_HASH_MAX,
 	PROP_MULTICAST_ROUTER,
 	PROP_MULTICAST_QUERIER,
 	PROP_MULTICAST_QUERY_USE_IFADDR,
@@ -64,6 +66,7 @@ typedef struct {
 	char *   group_address;
 	char *   vlan_protocol;
 	guint32  ageing_time;
+	guint32  multicast_hash_max;
 	guint16  priority;
 	guint16  forward_delay;
 	guint16  hello_time;
@@ -1010,6 +1013,22 @@ nm_setting_bridge_get_multicast_querier (const NMSettingBridge *setting)
 	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_querier;
 }
 
+/**
+ * nm_setting_bridge_get_multicast_hash_max:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:multicast-hash-max property of the setting
+ *
+ * Since 1.26
+ **/
+guint32
+nm_setting_bridge_get_multicast_hash_max (const NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_hash_max;
+}
+
 /*****************************************************************************/
 
 static gboolean
@@ -1149,6 +1168,16 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		}
 	}
 
+	if (!nm_utils_is_power_of_two (priv->multicast_hash_max)) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		             _("'%s' option must be a power of 2"),
+		             NM_SETTING_BRIDGE_MULTICAST_HASH_MAX);
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_MULTICAST_HASH_MAX);
+		return FALSE;
+	}
+
 	/* Failures from here on are NORMALIZABLE... */
 
 	if (!_nm_utils_bridge_vlan_verify_list (priv->vlans,
@@ -1235,6 +1264,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_GROUP_FORWARD_MASK:
 		g_value_set_uint (value, priv->group_forward_mask);
 		break;
+	case PROP_MULTICAST_HASH_MAX:
+		g_value_set_uint (value, priv->multicast_hash_max);
+		break;
 	case PROP_MULTICAST_SNOOPING:
 		g_value_set_boolean (value, priv->multicast_snooping);
 		break;
@@ -1308,6 +1340,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_GROUP_FORWARD_MASK:
 		priv->group_forward_mask = (guint16) g_value_get_uint (value);
 		break;
+	case PROP_MULTICAST_HASH_MAX:
+		priv->multicast_hash_max = g_value_get_uint (value);
+		break;
 	case PROP_MULTICAST_SNOOPING:
 		priv->multicast_snooping = g_value_get_boolean (value);
 		break;
@@ -1359,6 +1394,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->forward_delay              = BRIDGE_FORWARD_DELAY_DEFAULT;
 	priv->hello_time                 = BRIDGE_HELLO_TIME_DEFAULT;
 	priv->max_age                    = BRIDGE_MAX_AGE_DEFAULT;
+	priv->multicast_hash_max         = BRIDGE_MULTICAST_HASH_MAX_DEFAULT;
 	priv->multicast_snooping         = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
 	priv->priority                   = BRIDGE_PRIORITY_DEFAULT;
 	priv->stp                        = BRIDGE_STP_DEFAULT;
@@ -1843,6 +1879,27 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	                          NM_SETTING_PARAM_INFERRABLE |
 	                          G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingBridge:multicast-hash-max:
+	 *
+	 * Set maximum size of multicast hash table (value must be a power of 2).
+	 **/
+	/* ---ifcfg-rh---
+	 * property: multicast-hash-max
+	 * variable: BRIDGING_OPTS: multicast_hash_max=
+	 * default: 4096
+	 * example: BRIDGING_OPTS="multicast_hash_max=8192"
+	 * ---end---
+	 *
+	 * Since: 1.26
+	 */
+	obj_properties[PROP_MULTICAST_HASH_MAX] =
+	    g_param_spec_uint (NM_SETTING_BRIDGE_MULTICAST_HASH_MAX, "", "",
+	                       NM_BR_MIN_MULTICAST_HASH_MAX, NM_BR_MAX_MULTICAST_HASH_MAX, BRIDGE_MULTICAST_HASH_MAX_DEFAULT,
+	                       G_PARAM_READWRITE |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE,
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index 6bd5100f26..696346ac74 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -31,6 +31,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_MAX_AGE                         "max-age"
 #define NM_SETTING_BRIDGE_AGEING_TIME                     "ageing-time"
 #define NM_SETTING_BRIDGE_GROUP_FORWARD_MASK              "group-forward-mask"
+#define NM_SETTING_BRIDGE_MULTICAST_HASH_MAX              "multicast-hash-max"
 #define NM_SETTING_BRIDGE_MULTICAST_SNOOPING              "multicast-snooping"
 #define NM_SETTING_BRIDGE_MULTICAST_ROUTER                "multicast-router"
 #define NM_SETTING_BRIDGE_MULTICAST_QUERIER               "multicast-querier"
@@ -140,6 +141,9 @@ gboolean nm_setting_bridge_get_multicast_query_use_ifaddr (const NMSettingBridge
 NM_AVAILABLE_IN_1_24
 gboolean nm_setting_bridge_get_multicast_querier (const NMSettingBridge *setting);
 
+NM_AVAILABLE_IN_1_26
+guint32 nm_setting_bridge_get_multicast_hash_max (const NMSettingBridge *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_BRIDGE_H__ */
diff --git a/libnm-core/tests/test-setting.c b/libnm-core/tests/test-setting.c
index cb8f41fb03..f77ba9fd17 100644
--- a/libnm-core/tests/test-setting.c
+++ b/libnm-core/tests/test-setting.c
@@ -1998,6 +1998,13 @@ test_bridge_verify (void)
 	test_verify_options_bridge (TRUE,
 	                            "multicast-snooping", "yes",
 	                            "multicast-router",   "disabled");
+	/* multicast-hash-max */
+	test_verify_options_bridge (TRUE,
+	                            "multicast-hash-max",   "1024");
+	test_verify_options_bridge (TRUE,
+	                            "multicast-hash-max",   "8192");
+	test_verify_options_bridge (FALSE,
+	                            "multicast-hash-max",   "3");
 }
 
 /*****************************************************************************/
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index b4af766a42..71d68b5219 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1698,5 +1698,6 @@ global:
 
 libnm_1_26_0 {
 global:
+	nm_setting_bridge_get_multicast_hash_max;
 	nm_setting_connection_get_mud_url;
 } libnm_1_24_0;
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index c6c54344f6..0d10cd17c2 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -274,6 +274,10 @@ static const Option master_options[] = {
 	                                                  NULL, NULL,
 	                                                  0, 0xFFFF, 0,
 	                                                  TRUE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,           "hash_max",
+	                                                  NULL, NULL,
+	                                                  NM_BR_MIN_MULTICAST_HASH_MAX, NM_BR_MAX_MULTICAST_HASH_MAX, 4096,
+	                                                  FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER,            "multicast_querier",
 	                                                  NULL, NULL,
 	                                                  0, 1, 0,
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index db9d0d4c76..0ede5aac22 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -5162,6 +5162,7 @@ handle_bridge_option (NMSetting *setting,
 		{ "hello_time",                 NM_SETTING_BRIDGE_HELLO_TIME,                 BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
 		{ "max_age",                    NM_SETTING_BRIDGE_MAX_AGE,                    BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
 		{ "ageing_time",                NM_SETTING_BRIDGE_AGEING_TIME,                BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_hash_max",         NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,         BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_querier",          NM_SETTING_BRIDGE_MULTICAST_QUERIER,          BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_query_use_ifaddr", NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR, BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_snooping",         NM_SETTING_BRIDGE_MULTICAST_SNOOPING,         BRIDGE_OPT_TYPE_OPTION },
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 52d59ec33f..0e82d105d2 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1501,6 +1501,13 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "group_fwd_mask=%u", i);
 	}
 
+	i = nm_setting_bridge_get_multicast_hash_max (s_bridge);
+	if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_HASH_MAX)) {
+		if (opts->len)
+			g_string_append_c (opts, ' ');
+		g_string_append_printf (opts, "multicast_hash_max=%u", i);
+	}
+
 	b = nm_setting_bridge_get_multicast_querier (s_bridge);
 	if (b != get_setting_default_boolean (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERIER)) {
 		if (opts->len)

From c49f20887a59c46ee1a3a2558e8fc2efc2b2d90e Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Tue, 21 Apr 2020 17:35:51 +0200
Subject: [PATCH 115/222] nm-setting-bridge: add 'multicast-last-member-count'
 bridge option

https://bugzilla.redhat.com/show_bug.cgi?id=1755768
---
 clients/common/nm-meta-setting-desc.c         |  4 +
 clients/common/settings-docs.h.in             |  1 +
 libnm-core/nm-setting-bridge.c                | 97 ++++++++++++++-----
 libnm-core/nm-setting-bridge.h                |  4 +
 libnm/libnm.ver                               |  1 +
 src/devices/nm-device-bridge.c                |  4 +
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    | 39 ++++----
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    |  8 ++
 8 files changed, 115 insertions(+), 43 deletions(-)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 4c96e3aaec..1a782b489d 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -4943,6 +4943,10 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	    .property_type =                &_pt_gobject_int,
 	    .hide_if_default =              TRUE,
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,
+	    .property_type =                &_pt_gobject_int,
+	    .hide_if_default =              TRUE,
+	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERIER,
 	    .property_type =                &_pt_gobject_bool,
 	    .hide_if_default =              TRUE,
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 2add72993c..c186bc40d2 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -120,6 +120,7 @@
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MAC_ADDRESS N_("If specified, the MAC address of bridge. When creating a new bridge, this MAC address will be set. If this field is left unspecified, the \"ethernet.cloned-mac-address\" is referred instead to generate the initial MAC address. Note that setting \"ethernet.cloned-mac-address\" anyway overwrites the MAC address of the bridge later while activating the bridge. Hence, this property is deprecated. Deprecated: 1")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MAX_AGE N_("The Spanning Tree Protocol (STP) maximum message age, in seconds.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_HASH_MAX N_("Set maximum size of multicast hash table (value must be a power of 2).")
+#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT N_("Set the number of queries the bridge will send before stopping forwarding a multicast group after a \"leave\" message has been received.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERIER N_("Enable or disable sending of multicast queries by the bridge. If not specified the option is disabled.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR N_("If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_ROUTER N_("Sets bridge's multicast router. multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not specified the default value is 'auto'.")
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 7739dd2afd..8cd8809f70 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -22,18 +22,19 @@
  * necessary for bridging connections.
  **/
 
-#define BRIDGE_AGEING_TIME_DEFAULT                300
-#define BRIDGE_FORWARD_DELAY_DEFAULT              15
-#define BRIDGE_HELLO_TIME_DEFAULT                 2
-#define BRIDGE_MAX_AGE_DEFAULT                    20
-#define BRIDGE_MULTICAST_HASH_MAX_DEFAULT         4096
-#define BRIDGE_MULTICAST_QUERIER_DEFAULT          FALSE
-#define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT FALSE
-#define BRIDGE_MULTICAST_SNOOPING_DEFAULT         TRUE
-#define BRIDGE_PRIORITY_DEFAULT                   0x8000
-#define BRIDGE_STP_DEFAULT                        TRUE
-#define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT          1
-#define BRIDGE_VLAN_STATS_ENABLED_DEFAULT         FALSE
+#define BRIDGE_AGEING_TIME_DEFAULT                         300
+#define BRIDGE_FORWARD_DELAY_DEFAULT                       15
+#define BRIDGE_HELLO_TIME_DEFAULT                          2
+#define BRIDGE_MAX_AGE_DEFAULT                             20
+#define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
+#define BRIDGE_MULTICAST_HASH_MAX_DEFAULT                  4096
+#define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
+#define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
+#define BRIDGE_MULTICAST_SNOOPING_DEFAULT                  TRUE
+#define BRIDGE_PRIORITY_DEFAULT                            0x8000
+#define BRIDGE_STP_DEFAULT                                 TRUE
+#define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT                   1
+#define BRIDGE_VLAN_STATS_ENABLED_DEFAULT                  FALSE
 
 /*****************************************************************************/
 
@@ -48,6 +49,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBridge,
 	PROP_GROUP_ADDRESS,
 	PROP_GROUP_FORWARD_MASK,
 	PROP_MULTICAST_HASH_MAX,
+	PROP_MULTICAST_LAST_MEMBER_COUNT,
 	PROP_MULTICAST_ROUTER,
 	PROP_MULTICAST_QUERIER,
 	PROP_MULTICAST_QUERY_USE_IFADDR,
@@ -67,6 +69,7 @@ typedef struct {
 	char *   vlan_protocol;
 	guint32  ageing_time;
 	guint32  multicast_hash_max;
+	guint32  multicast_last_member_count;
 	guint16  priority;
 	guint16  forward_delay;
 	guint16  hello_time;
@@ -1029,6 +1032,22 @@ nm_setting_bridge_get_multicast_hash_max (const NMSettingBridge *setting)
 	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_hash_max;
 }
 
+/**
+ * nm_setting_bridge_get_multicast_last_member_count:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:multicast-last-member-count property of the setting
+ *
+ * Since 1.26
+ **/
+guint32
+nm_setting_bridge_get_multicast_last_member_count (const NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_last_member_count;
+}
+
 /*****************************************************************************/
 
 static gboolean
@@ -1267,6 +1286,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_HASH_MAX:
 		g_value_set_uint (value, priv->multicast_hash_max);
 		break;
+	case PROP_MULTICAST_LAST_MEMBER_COUNT:
+		g_value_set_uint (value, priv->multicast_last_member_count);
+		break;
 	case PROP_MULTICAST_SNOOPING:
 		g_value_set_boolean (value, priv->multicast_snooping);
 		break;
@@ -1343,6 +1365,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_HASH_MAX:
 		priv->multicast_hash_max = g_value_get_uint (value);
 		break;
+	case PROP_MULTICAST_LAST_MEMBER_COUNT:
+		priv->multicast_last_member_count = g_value_get_uint (value);
+		break;
 	case PROP_MULTICAST_SNOOPING:
 		priv->multicast_snooping = g_value_get_boolean (value);
 		break;
@@ -1390,18 +1415,19 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 
 	priv->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
 
-	priv->ageing_time                = BRIDGE_AGEING_TIME_DEFAULT;
-	priv->forward_delay              = BRIDGE_FORWARD_DELAY_DEFAULT;
-	priv->hello_time                 = BRIDGE_HELLO_TIME_DEFAULT;
-	priv->max_age                    = BRIDGE_MAX_AGE_DEFAULT;
-	priv->multicast_hash_max         = BRIDGE_MULTICAST_HASH_MAX_DEFAULT;
-	priv->multicast_snooping         = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
-	priv->priority                   = BRIDGE_PRIORITY_DEFAULT;
-	priv->stp                        = BRIDGE_STP_DEFAULT;
-	priv->vlan_default_pvid          = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
-	priv->vlan_stats_enabled         = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
-	priv->multicast_query_use_ifaddr = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
-	priv->multicast_querier          = BRIDGE_MULTICAST_QUERIER_DEFAULT;
+	priv->ageing_time                 = BRIDGE_AGEING_TIME_DEFAULT;
+	priv->forward_delay               = BRIDGE_FORWARD_DELAY_DEFAULT;
+	priv->hello_time                  = BRIDGE_HELLO_TIME_DEFAULT;
+	priv->max_age                     = BRIDGE_MAX_AGE_DEFAULT;
+	priv->multicast_last_member_count = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT;
+	priv->multicast_hash_max          = BRIDGE_MULTICAST_HASH_MAX_DEFAULT;
+	priv->multicast_snooping          = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
+	priv->priority                    = BRIDGE_PRIORITY_DEFAULT;
+	priv->stp                         = BRIDGE_STP_DEFAULT;
+	priv->vlan_default_pvid           = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
+	priv->vlan_stats_enabled          = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
+	priv->multicast_query_use_ifaddr  = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
+	priv->multicast_querier           = BRIDGE_MULTICAST_QUERIER_DEFAULT;
 }
 
 /**
@@ -1900,6 +1926,29 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingBridge:multicast-last-member-count:
+	 *
+	 * Set the number of queries the bridge will send before
+	 * stopping forwarding a multicast group after a "leave"
+	 * message has been received.
+	 **/
+	/* ---ifcfg-rh---
+	 * property: multicast-last-member-count
+	 * variable: BRIDGING_OPTS: multicast_last_member_count=
+	 * default: 2
+	 * example: BRIDGING_OPTS="multicast_last_member_count=4"
+	 * ---end---
+	 *
+	 * Since: 1.26
+	 */
+	obj_properties[PROP_MULTICAST_LAST_MEMBER_COUNT] =
+	    g_param_spec_uint (NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT, "", "",
+	                       0, G_MAXUINT32, BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT,
+	                       G_PARAM_READWRITE |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE,
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index 696346ac74..1a1cacc966 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -32,6 +32,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_AGEING_TIME                     "ageing-time"
 #define NM_SETTING_BRIDGE_GROUP_FORWARD_MASK              "group-forward-mask"
 #define NM_SETTING_BRIDGE_MULTICAST_HASH_MAX              "multicast-hash-max"
+#define NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT     "multicast-last-member-count"
 #define NM_SETTING_BRIDGE_MULTICAST_SNOOPING              "multicast-snooping"
 #define NM_SETTING_BRIDGE_MULTICAST_ROUTER                "multicast-router"
 #define NM_SETTING_BRIDGE_MULTICAST_QUERIER               "multicast-querier"
@@ -144,6 +145,9 @@ gboolean nm_setting_bridge_get_multicast_querier (const NMSettingBridge *setting
 NM_AVAILABLE_IN_1_26
 guint32 nm_setting_bridge_get_multicast_hash_max (const NMSettingBridge *setting);
 
+NM_AVAILABLE_IN_1_26
+guint32 nm_setting_bridge_get_multicast_last_member_count (const NMSettingBridge *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_BRIDGE_H__ */
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 71d68b5219..c141fd3f3e 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1699,5 +1699,6 @@ global:
 libnm_1_26_0 {
 global:
 	nm_setting_bridge_get_multicast_hash_max;
+	nm_setting_bridge_get_multicast_last_member_count;
 	nm_setting_connection_get_mud_url;
 } libnm_1_24_0;
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 0d10cd17c2..1c65e07b63 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -278,6 +278,10 @@ static const Option master_options[] = {
 	                                                  NULL, NULL,
 	                                                  NM_BR_MIN_MULTICAST_HASH_MAX, NM_BR_MAX_MULTICAST_HASH_MAX, 4096,
 	                                                  FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,  "multicast_last_member_count",
+	                                                  NULL, NULL,
+	                                                  0, G_MAXUINT32, 2,
+	                                                  FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER,            "multicast_querier",
 	                                                  NULL, NULL,
 	                                                  0, 1, 0,
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 0ede5aac22..deaa94947d 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -5157,25 +5157,26 @@ handle_bridge_option (NMSetting *setting,
 		gboolean only_with_stp;
 		gboolean extended_bool;
 	} m/*etadata*/[] = {
-		{ "DELAY",                      NM_SETTING_BRIDGE_FORWARD_DELAY,              BRIDGE_OPT_TYPE_MAIN,        .only_with_stp = TRUE },
-		{ "priority",                   NM_SETTING_BRIDGE_PRIORITY,                   BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
-		{ "hello_time",                 NM_SETTING_BRIDGE_HELLO_TIME,                 BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
-		{ "max_age",                    NM_SETTING_BRIDGE_MAX_AGE,                    BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
-		{ "ageing_time",                NM_SETTING_BRIDGE_AGEING_TIME,                BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_hash_max",         NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,         BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_querier",          NM_SETTING_BRIDGE_MULTICAST_QUERIER,          BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_query_use_ifaddr", NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR, BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_snooping",         NM_SETTING_BRIDGE_MULTICAST_SNOOPING,         BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_router",           NM_SETTING_BRIDGE_MULTICAST_ROUTER,           BRIDGE_OPT_TYPE_OPTION },
-		{ "vlan_filtering",             NM_SETTING_BRIDGE_VLAN_FILTERING,             BRIDGE_OPT_TYPE_OPTION },
-		{ "default_pvid",               NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID,          BRIDGE_OPT_TYPE_OPTION },
-		{ "group_address",              NM_SETTING_BRIDGE_GROUP_ADDRESS,              BRIDGE_OPT_TYPE_OPTION },
-		{ "group_fwd_mask",             NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,         BRIDGE_OPT_TYPE_OPTION },
-		{ "vlan_protocol",              NM_SETTING_BRIDGE_VLAN_PROTOCOL,              BRIDGE_OPT_TYPE_OPTION },
-		{ "vlan_stats_enabled",         NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,         BRIDGE_OPT_TYPE_OPTION },
-		{ "priority",                   NM_SETTING_BRIDGE_PORT_PRIORITY,              BRIDGE_OPT_TYPE_PORT_OPTION },
-		{ "path_cost",                  NM_SETTING_BRIDGE_PORT_PATH_COST,             BRIDGE_OPT_TYPE_PORT_OPTION },
-		{ "hairpin_mode",               NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE,          BRIDGE_OPT_TYPE_PORT_OPTION, .extended_bool = TRUE, },
+		{ "DELAY",                       NM_SETTING_BRIDGE_FORWARD_DELAY,               BRIDGE_OPT_TYPE_MAIN,        .only_with_stp = TRUE },
+		{ "priority",                    NM_SETTING_BRIDGE_PRIORITY,                    BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
+		{ "hello_time",                  NM_SETTING_BRIDGE_HELLO_TIME,                  BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
+		{ "max_age",                     NM_SETTING_BRIDGE_MAX_AGE,                     BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
+		{ "ageing_time",                 NM_SETTING_BRIDGE_AGEING_TIME,                 BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_last_member_count", NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT, BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_hash_max",          NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,          BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_querier",           NM_SETTING_BRIDGE_MULTICAST_QUERIER,           BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_query_use_ifaddr",  NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,  BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_snooping",          NM_SETTING_BRIDGE_MULTICAST_SNOOPING,          BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_router",            NM_SETTING_BRIDGE_MULTICAST_ROUTER,            BRIDGE_OPT_TYPE_OPTION },
+		{ "vlan_filtering",              NM_SETTING_BRIDGE_VLAN_FILTERING,              BRIDGE_OPT_TYPE_OPTION },
+		{ "default_pvid",                NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID,           BRIDGE_OPT_TYPE_OPTION },
+		{ "group_address",               NM_SETTING_BRIDGE_GROUP_ADDRESS,               BRIDGE_OPT_TYPE_OPTION },
+		{ "group_fwd_mask",              NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,          BRIDGE_OPT_TYPE_OPTION },
+		{ "vlan_protocol",               NM_SETTING_BRIDGE_VLAN_PROTOCOL,               BRIDGE_OPT_TYPE_OPTION },
+		{ "vlan_stats_enabled",          NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,          BRIDGE_OPT_TYPE_OPTION },
+		{ "priority",                    NM_SETTING_BRIDGE_PORT_PRIORITY,               BRIDGE_OPT_TYPE_PORT_OPTION },
+		{ "path_cost",                   NM_SETTING_BRIDGE_PORT_PATH_COST,              BRIDGE_OPT_TYPE_PORT_OPTION },
+		{ "hairpin_mode",                NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE,           BRIDGE_OPT_TYPE_PORT_OPTION, .extended_bool = TRUE, },
 	};
 	const char *error_message = NULL;
 	int i;
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 0e82d105d2..d1c8416d83 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1501,6 +1501,7 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "group_fwd_mask=%u", i);
 	}
 
+
 	i = nm_setting_bridge_get_multicast_hash_max (s_bridge);
 	if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_HASH_MAX)) {
 		if (opts->len)
@@ -1508,6 +1509,13 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "multicast_hash_max=%u", i);
 	}
 
+	i = nm_setting_bridge_get_multicast_last_member_count (s_bridge);
+	if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT)) {
+		if (opts->len)
+			g_string_append_c (opts, ' ');
+		g_string_append_printf (opts, "multicast_last_member_count=%u", i);
+	}
+
 	b = nm_setting_bridge_get_multicast_querier (s_bridge);
 	if (b != get_setting_default_boolean (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERIER)) {
 		if (opts->len)

From 1c437090ff9f89be0da5abcb5d970a3c0f2b3a5c Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Tue, 21 Apr 2020 17:35:51 +0200
Subject: [PATCH 116/222] nm-setting-bridge: add
 'multicast-last-member-interval' bridge option

https://bugzilla.redhat.com/show_bug.cgi?id=1755768
---
 clients/common/nm-meta-setting-desc.c         |   4 +
 clients/common/settings-docs.h.in             |   1 +
 libnm-core/nm-setting-bridge.c                |  74 ++++++--
 libnm-core/nm-setting-bridge.h                |   4 +
 libnm/libnm.ver                               |   1 +
 src/devices/nm-device-bridge.c                | 175 ++++++++++--------
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |  51 +++--
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    |  25 +++
 8 files changed, 225 insertions(+), 110 deletions(-)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 1a782b489d..cad4a80f2b 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -4947,6 +4947,10 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	    .property_type =                &_pt_gobject_int,
 	    .hide_if_default =              TRUE,
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL,
+	    .property_type =                &_pt_gobject_int,
+	    .hide_if_default =              TRUE,
+	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERIER,
 	    .property_type =                &_pt_gobject_bool,
 	    .hide_if_default =              TRUE,
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index c186bc40d2..c00f0f8123 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -121,6 +121,7 @@
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MAX_AGE N_("The Spanning Tree Protocol (STP) maximum message age, in seconds.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_HASH_MAX N_("Set maximum size of multicast hash table (value must be a power of 2).")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT N_("Set the number of queries the bridge will send before stopping forwarding a multicast group after a \"leave\" message has been received.")
+#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL N_("Set interval (in deciseconds) between queries to find remaining members of a group, after a \"leave\" message is received.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERIER N_("Enable or disable sending of multicast queries by the bridge. If not specified the option is disabled.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR N_("If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_ROUTER N_("Sets bridge's multicast router. multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not specified the default value is 'auto'.")
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 8cd8809f70..4fd8984354 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -27,6 +27,7 @@
 #define BRIDGE_HELLO_TIME_DEFAULT                          2
 #define BRIDGE_MAX_AGE_DEFAULT                             20
 #define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
+#define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT      100
 #define BRIDGE_MULTICAST_HASH_MAX_DEFAULT                  4096
 #define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
@@ -50,6 +51,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBridge,
 	PROP_GROUP_FORWARD_MASK,
 	PROP_MULTICAST_HASH_MAX,
 	PROP_MULTICAST_LAST_MEMBER_COUNT,
+	PROP_MULTICAST_LAST_MEMBER_INTERVAL,
 	PROP_MULTICAST_ROUTER,
 	PROP_MULTICAST_QUERIER,
 	PROP_MULTICAST_QUERY_USE_IFADDR,
@@ -67,6 +69,7 @@ typedef struct {
 	char *   multicast_router;
 	char *   group_address;
 	char *   vlan_protocol;
+	guint64  multicast_last_member_interval;
 	guint32  ageing_time;
 	guint32  multicast_hash_max;
 	guint32  multicast_last_member_count;
@@ -1048,6 +1051,22 @@ nm_setting_bridge_get_multicast_last_member_count (const NMSettingBridge *settin
 	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_last_member_count;
 }
 
+/**
+ * nm_setting_bridge_get_multicast_last_member_interval:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:multicast-last-member-interval property of the setting
+ *
+ * Since 1.26
+ **/
+guint64
+nm_setting_bridge_get_multicast_last_member_interval (const NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_last_member_interval;
+}
+
 /*****************************************************************************/
 
 static gboolean
@@ -1289,6 +1308,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_LAST_MEMBER_COUNT:
 		g_value_set_uint (value, priv->multicast_last_member_count);
 		break;
+	case PROP_MULTICAST_LAST_MEMBER_INTERVAL:
+		g_value_set_uint64 (value, priv->multicast_last_member_interval);
+		break;
 	case PROP_MULTICAST_SNOOPING:
 		g_value_set_boolean (value, priv->multicast_snooping);
 		break;
@@ -1368,6 +1390,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_LAST_MEMBER_COUNT:
 		priv->multicast_last_member_count = g_value_get_uint (value);
 		break;
+	case PROP_MULTICAST_LAST_MEMBER_INTERVAL:
+		priv->multicast_last_member_interval = g_value_get_uint64 (value);
+		break;
 	case PROP_MULTICAST_SNOOPING:
 		priv->multicast_snooping = g_value_get_boolean (value);
 		break;
@@ -1415,19 +1440,20 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 
 	priv->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
 
-	priv->ageing_time                 = BRIDGE_AGEING_TIME_DEFAULT;
-	priv->forward_delay               = BRIDGE_FORWARD_DELAY_DEFAULT;
-	priv->hello_time                  = BRIDGE_HELLO_TIME_DEFAULT;
-	priv->max_age                     = BRIDGE_MAX_AGE_DEFAULT;
-	priv->multicast_last_member_count = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT;
-	priv->multicast_hash_max          = BRIDGE_MULTICAST_HASH_MAX_DEFAULT;
-	priv->multicast_snooping          = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
-	priv->priority                    = BRIDGE_PRIORITY_DEFAULT;
-	priv->stp                         = BRIDGE_STP_DEFAULT;
-	priv->vlan_default_pvid           = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
-	priv->vlan_stats_enabled          = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
-	priv->multicast_query_use_ifaddr  = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
-	priv->multicast_querier           = BRIDGE_MULTICAST_QUERIER_DEFAULT;
+	priv->ageing_time                    = BRIDGE_AGEING_TIME_DEFAULT;
+	priv->forward_delay                  = BRIDGE_FORWARD_DELAY_DEFAULT;
+	priv->hello_time                     = BRIDGE_HELLO_TIME_DEFAULT;
+	priv->max_age                        = BRIDGE_MAX_AGE_DEFAULT;
+	priv->multicast_last_member_count    = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT;
+	priv->multicast_last_member_interval = BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT;
+	priv->multicast_hash_max             = BRIDGE_MULTICAST_HASH_MAX_DEFAULT;
+	priv->multicast_snooping             = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
+	priv->priority                       = BRIDGE_PRIORITY_DEFAULT;
+	priv->stp                            = BRIDGE_STP_DEFAULT;
+	priv->vlan_default_pvid              = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
+	priv->vlan_stats_enabled             = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
+	priv->multicast_query_use_ifaddr     = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
+	priv->multicast_querier              = BRIDGE_MULTICAST_QUERIER_DEFAULT;
 }
 
 /**
@@ -1949,6 +1975,28 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingBridge:multicast-last-member-interval:
+	 *
+	 * Set interval (in deciseconds) between queries to find remaining
+	 * members of a group, after a "leave" message is received.
+	 **/
+	/* ---ifcfg-rh---
+	 * property: multicast-last-member-interval
+	 * variable: BRIDGING_OPTS: multicast_last_member_interval=
+	 * default: 100
+	 * example: BRIDGING_OPTS="multicast_last_member_interval=200"
+	 * ---end---
+	 *
+	 * Since: 1.26
+	 */
+	obj_properties[PROP_MULTICAST_LAST_MEMBER_INTERVAL] =
+	    g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL, "", "",
+	                         0, G_MAXUINT64, BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE,
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index 1a1cacc966..ebf250ab20 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -33,6 +33,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_GROUP_FORWARD_MASK              "group-forward-mask"
 #define NM_SETTING_BRIDGE_MULTICAST_HASH_MAX              "multicast-hash-max"
 #define NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT     "multicast-last-member-count"
+#define NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL  "multicast-last-member-interval"
 #define NM_SETTING_BRIDGE_MULTICAST_SNOOPING              "multicast-snooping"
 #define NM_SETTING_BRIDGE_MULTICAST_ROUTER                "multicast-router"
 #define NM_SETTING_BRIDGE_MULTICAST_QUERIER               "multicast-querier"
@@ -148,6 +149,9 @@ guint32 nm_setting_bridge_get_multicast_hash_max (const NMSettingBridge *setting
 NM_AVAILABLE_IN_1_26
 guint32 nm_setting_bridge_get_multicast_last_member_count (const NMSettingBridge *setting);
 
+NM_AVAILABLE_IN_1_26
+guint64 nm_setting_bridge_get_multicast_last_member_interval (const NMSettingBridge *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_BRIDGE_H__ */
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index c141fd3f3e..46bcc452bc 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1700,5 +1700,6 @@ libnm_1_26_0 {
 global:
 	nm_setting_bridge_get_multicast_hash_max;
 	nm_setting_bridge_get_multicast_last_member_count;
+	nm_setting_bridge_get_multicast_last_member_interval;
 	nm_setting_connection_get_mud_url;
 } libnm_1_24_0;
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 1c65e07b63..6db8f40928 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -237,79 +237,83 @@ typedef struct {
 	const char *sysname;
 	const char *(*to_sysfs) (GValue *value);
 	void (*from_sysfs) (const char *value, GValue *out);
-	uint nm_min;
-	uint nm_max;
-	uint nm_default;
+	guint64 nm_min;
+	guint64 nm_max;
+	guint64 nm_default;
 	bool default_if_zero;
 	bool user_hz_compensate;
 	bool only_with_stp;
 } Option;
 
 static const Option master_options[] = {
-	{ NM_SETTING_BRIDGE_STP,                          "stp_state", /* this must stay as the first item */
-	                                                  NULL, NULL,
-	                                                  0, 1, 1,
-	                                                  FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_PRIORITY,                     "priority",
-	                                                  NULL, NULL,
-	                                                  0, G_MAXUINT16, 0x8000,
-	                                                  TRUE, FALSE, TRUE },
-	{ NM_SETTING_BRIDGE_FORWARD_DELAY,                "forward_delay",
-	                                                  NULL, NULL,
-	                                                  0, NM_BR_MAX_FORWARD_DELAY, 15,
-	                                                  TRUE, TRUE, TRUE},
-	{ NM_SETTING_BRIDGE_HELLO_TIME,                   "hello_time",
-	                                                  NULL, NULL,
-	                                                  0, NM_BR_MAX_HELLO_TIME, 2,
-	                                                  TRUE, TRUE, TRUE },
-	{ NM_SETTING_BRIDGE_MAX_AGE,                      "max_age",
-	                                                  NULL, NULL,
-	                                                  0, NM_BR_MAX_MAX_AGE, 20,
-	                                                  TRUE, TRUE, TRUE },
-	{ NM_SETTING_BRIDGE_AGEING_TIME,                  "ageing_time",
-	                                                  NULL, NULL,
-	                                                  NM_BR_MIN_AGEING_TIME, NM_BR_MAX_AGEING_TIME, 300,
-	                                                  TRUE, TRUE, FALSE },
-	{ NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,           "group_fwd_mask",
-	                                                  NULL, NULL,
-	                                                  0, 0xFFFF, 0,
-	                                                  TRUE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,           "hash_max",
-	                                                  NULL, NULL,
-	                                                  NM_BR_MIN_MULTICAST_HASH_MAX, NM_BR_MAX_MULTICAST_HASH_MAX, 4096,
-	                                                  FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,  "multicast_last_member_count",
-	                                                  NULL, NULL,
-	                                                  0, G_MAXUINT32, 2,
-	                                                  FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER,            "multicast_querier",
-	                                                  NULL, NULL,
-	                                                  0, 1, 0,
-	                                                  FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,   "multicast_query_use_ifaddr",
-	                                                  NULL, NULL,
-	                                                  0, 1, 0,
-	                                                  FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_SNOOPING,           "multicast_snooping",
-	                                                  NULL, NULL,
-	                                                  0, 1, 1,
-	                                                  FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_ROUTER,             "multicast_router",
-	                                                  to_sysfs_multicast_router, from_sysfs_multicast_router,
-	                                                  0, 0, 0,
-	                                                  FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_GROUP_ADDRESS,                "group_addr",
-	                                                  to_sysfs_group_address, from_sysfs_group_address,
-	                                                  0, 0, 0,
-	                                                  FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_VLAN_PROTOCOL,                "vlan_protocol",
-	                                                  to_sysfs_vlan_protocol, from_sysfs_vlan_protocol,
-	                                                  0, 0, 0,
-	                                                  FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,           "vlan_stats_enabled",
-	                                                  NULL, NULL,
-	                                                  0, 1, 0,
-	                                                  FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_STP,                            "stp_state", /* this must stay as the first item */
+	                                                    NULL, NULL,
+	                                                    0, 1, 1,
+	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_PRIORITY,                       "priority",
+	                                                    NULL, NULL,
+	                                                    0, G_MAXUINT16, 0x8000,
+	                                                    TRUE, FALSE, TRUE },
+	{ NM_SETTING_BRIDGE_FORWARD_DELAY,                  "forward_delay",
+	                                                    NULL, NULL,
+	                                                    0, NM_BR_MAX_FORWARD_DELAY, 15,
+	                                                    TRUE, TRUE, TRUE},
+	{ NM_SETTING_BRIDGE_HELLO_TIME,                     "hello_time",
+	                                                    NULL, NULL,
+	                                                    0, NM_BR_MAX_HELLO_TIME, 2,
+	                                                    TRUE, TRUE, TRUE },
+	{ NM_SETTING_BRIDGE_MAX_AGE,                        "max_age",
+	                                                    NULL, NULL,
+	                                                    0, NM_BR_MAX_MAX_AGE, 20,
+	                                                    TRUE, TRUE, TRUE },
+	{ NM_SETTING_BRIDGE_AGEING_TIME,                    "ageing_time",
+	                                                    NULL, NULL,
+	                                                    NM_BR_MIN_AGEING_TIME, NM_BR_MAX_AGEING_TIME, 300,
+	                                                    TRUE, TRUE, FALSE },
+	{ NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,             "group_fwd_mask",
+	                                                    NULL, NULL,
+	                                                    0, 0xFFFF, 0,
+	                                                    TRUE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,             "hash_max",
+	                                                    NULL, NULL,
+	                                                    NM_BR_MIN_MULTICAST_HASH_MAX, NM_BR_MAX_MULTICAST_HASH_MAX, 4096,
+	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,    "multicast_last_member_count",
+	                                                    NULL, NULL,
+	                                                    0, G_MAXUINT32, 2,
+	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL, "multicast_last_member_interval",
+	                                                    NULL, NULL,
+	                                                    0, G_MAXUINT64, 100,
+	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER,              "multicast_querier",
+	                                                    NULL, NULL,
+	                                                    0, 1, 0,
+	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,     "multicast_query_use_ifaddr",
+	                                                    NULL, NULL,
+	                                                    0, 1, 0,
+	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_SNOOPING,             "multicast_snooping",
+	                                                    NULL, NULL,
+	                                                    0, 1, 1,
+	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_ROUTER,               "multicast_router",
+	                                                    to_sysfs_multicast_router, from_sysfs_multicast_router,
+	                                                    0, 0, 0,
+	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_GROUP_ADDRESS,                  "group_addr",
+	                                                    to_sysfs_group_address, from_sysfs_group_address,
+	                                                    0, 0, 0,
+	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_VLAN_PROTOCOL,                  "vlan_protocol",
+	                                                    to_sysfs_vlan_protocol, from_sysfs_vlan_protocol,
+	                                                    0, 0, 0,
+	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,             "vlan_stats_enabled",
+	                                                    NULL, NULL,
+	                                                    0, 1, 0,
+	                                                    FALSE, FALSE, FALSE },
 	{ NULL, NULL }
 };
 
@@ -357,11 +361,15 @@ commit_option (NMDevice *device, NMSetting *setting, const Option *option, gbool
 	case G_TYPE_BOOLEAN:
 		value = g_value_get_boolean (&val) ? "1" : "0";
 		break;
+	case G_TYPE_UINT64:
 	case G_TYPE_UINT: {
 			char value_buf[100];
-			guint uval;
+			guint64 uval;
 
-			uval = g_value_get_uint (&val);
+			if (pspec->value_type == G_TYPE_UINT64)
+				uval = g_value_get_uint64 (&val);
+			else
+				uval = (guint) g_value_get_uint (&val);
 
 			/* zero means "unspecified" for some NM properties but isn't in the
 			 * allowed kernel range, so reset the property to the default value.
@@ -370,7 +378,11 @@ commit_option (NMDevice *device, NMSetting *setting, const Option *option, gbool
 				g_value_unset (&val);
 				g_value_init (&val, G_PARAM_SPEC_VALUE_TYPE (pspec));
 				g_param_value_set_default (pspec, &val);
-				uval = g_value_get_uint (&val);
+
+				if (pspec->value_type == G_TYPE_UINT64)
+					uval = g_value_get_uint64 (&val);
+				else
+					uval = (guint) g_value_get_uint (&val);
 			}
 
 			/* Linux kernel bridge interfaces use 'centiseconds' for time-based values.
@@ -381,7 +393,11 @@ commit_option (NMDevice *device, NMSetting *setting, const Option *option, gbool
 			if (option->user_hz_compensate)
 				uval *= 100;
 
-			nm_sprintf_buf (value_buf, "%u", uval);
+			if (pspec->value_type == G_TYPE_UINT64)
+				nm_sprintf_buf (value_buf, "%"G_GUINT64_FORMAT, uval);
+			else
+				nm_sprintf_buf (value_buf, "%u", (guint) uval);
+
 			value = value_buf;
 		}
 		break;
@@ -507,8 +523,9 @@ update_connection (NMDevice *device, NMConnection *connection)
 		}
 
 		switch (pspec->value_type) {
+		case G_TYPE_UINT64:
 		case G_TYPE_UINT: {
-				guint uvalue;
+				guint64 uvalue;
 
 				/* See comments in set_sysfs_uint() about centiseconds. */
 				if (option->user_hz_compensate) {
@@ -518,12 +535,16 @@ update_connection (NMDevice *device, NMConnection *connection)
 					                                       option->nm_default * 100);
 					uvalue /= 100;
 				} else {
-					uvalue = _nm_utils_ascii_str_to_int64 (str, 10,
-					                                       option->nm_min,
-					                                       option->nm_max,
-					                                       option->nm_default);
+					uvalue = _nm_utils_ascii_str_to_uint64 (str, 10,
+					                                        option->nm_min,
+					                                        option->nm_max,
+					                                        option->nm_default);
 				}
-				g_value_set_uint (&value, uvalue);
+
+				if (pspec->value_type == G_TYPE_UINT64)
+					g_value_set_uint64(&value, uvalue);
+				else
+					g_value_set_uint (&value, (guint) uvalue);
 			}
 			break;
 		case G_TYPE_BOOLEAN: {
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index deaa94947d..e976f8a352 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -5157,26 +5157,27 @@ handle_bridge_option (NMSetting *setting,
 		gboolean only_with_stp;
 		gboolean extended_bool;
 	} m/*etadata*/[] = {
-		{ "DELAY",                       NM_SETTING_BRIDGE_FORWARD_DELAY,               BRIDGE_OPT_TYPE_MAIN,        .only_with_stp = TRUE },
-		{ "priority",                    NM_SETTING_BRIDGE_PRIORITY,                    BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
-		{ "hello_time",                  NM_SETTING_BRIDGE_HELLO_TIME,                  BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
-		{ "max_age",                     NM_SETTING_BRIDGE_MAX_AGE,                     BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
-		{ "ageing_time",                 NM_SETTING_BRIDGE_AGEING_TIME,                 BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_last_member_count", NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT, BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_hash_max",          NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,          BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_querier",           NM_SETTING_BRIDGE_MULTICAST_QUERIER,           BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_query_use_ifaddr",  NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,  BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_snooping",          NM_SETTING_BRIDGE_MULTICAST_SNOOPING,          BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_router",            NM_SETTING_BRIDGE_MULTICAST_ROUTER,            BRIDGE_OPT_TYPE_OPTION },
-		{ "vlan_filtering",              NM_SETTING_BRIDGE_VLAN_FILTERING,              BRIDGE_OPT_TYPE_OPTION },
-		{ "default_pvid",                NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID,           BRIDGE_OPT_TYPE_OPTION },
-		{ "group_address",               NM_SETTING_BRIDGE_GROUP_ADDRESS,               BRIDGE_OPT_TYPE_OPTION },
-		{ "group_fwd_mask",              NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,          BRIDGE_OPT_TYPE_OPTION },
-		{ "vlan_protocol",               NM_SETTING_BRIDGE_VLAN_PROTOCOL,               BRIDGE_OPT_TYPE_OPTION },
-		{ "vlan_stats_enabled",          NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,          BRIDGE_OPT_TYPE_OPTION },
-		{ "priority",                    NM_SETTING_BRIDGE_PORT_PRIORITY,               BRIDGE_OPT_TYPE_PORT_OPTION },
-		{ "path_cost",                   NM_SETTING_BRIDGE_PORT_PATH_COST,              BRIDGE_OPT_TYPE_PORT_OPTION },
-		{ "hairpin_mode",                NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE,           BRIDGE_OPT_TYPE_PORT_OPTION, .extended_bool = TRUE, },
+		{ "DELAY",                          NM_SETTING_BRIDGE_FORWARD_DELAY,                  BRIDGE_OPT_TYPE_MAIN,        .only_with_stp = TRUE },
+		{ "priority",                       NM_SETTING_BRIDGE_PRIORITY,                       BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
+		{ "hello_time",                     NM_SETTING_BRIDGE_HELLO_TIME,                     BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
+		{ "max_age",                        NM_SETTING_BRIDGE_MAX_AGE,                        BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
+		{ "ageing_time",                    NM_SETTING_BRIDGE_AGEING_TIME,                    BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_last_member_count",    NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,    BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_last_member_interval", NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL, BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_hash_max",             NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,             BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_querier",              NM_SETTING_BRIDGE_MULTICAST_QUERIER,              BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_query_use_ifaddr",     NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,     BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_snooping",             NM_SETTING_BRIDGE_MULTICAST_SNOOPING,             BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_router",               NM_SETTING_BRIDGE_MULTICAST_ROUTER,               BRIDGE_OPT_TYPE_OPTION },
+		{ "vlan_filtering",                 NM_SETTING_BRIDGE_VLAN_FILTERING,                 BRIDGE_OPT_TYPE_OPTION },
+		{ "default_pvid",                   NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID,              BRIDGE_OPT_TYPE_OPTION },
+		{ "group_address",                  NM_SETTING_BRIDGE_GROUP_ADDRESS,                  BRIDGE_OPT_TYPE_OPTION },
+		{ "group_fwd_mask",                 NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,             BRIDGE_OPT_TYPE_OPTION },
+		{ "vlan_protocol",                  NM_SETTING_BRIDGE_VLAN_PROTOCOL,                  BRIDGE_OPT_TYPE_OPTION },
+		{ "vlan_stats_enabled",             NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,             BRIDGE_OPT_TYPE_OPTION },
+		{ "priority",                       NM_SETTING_BRIDGE_PORT_PRIORITY,                  BRIDGE_OPT_TYPE_PORT_OPTION },
+		{ "path_cost",                      NM_SETTING_BRIDGE_PORT_PATH_COST,                 BRIDGE_OPT_TYPE_PORT_OPTION },
+		{ "hairpin_mode",                   NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE,              BRIDGE_OPT_TYPE_PORT_OPTION, .extended_bool = TRUE, },
 	};
 	const char *error_message = NULL;
 	int i;
@@ -5229,6 +5230,16 @@ handle_bridge_option (NMSetting *setting,
 				goto warn;
 			}
 			return;
+		case G_TYPE_UINT64: {
+				guint64 vu64;
+
+				vu64 = _nm_utils_ascii_str_to_uint64 (value, 10, 0, G_MAXUINT64, 0);
+				if (!nm_g_object_set_property_uint64 (G_OBJECT (setting), m[i].property_name, vu64, NULL)) {
+					error_message = "number is out of range";
+					goto warn;
+				}
+			}
+			return;
 		case G_TYPE_STRING:
 			nm_g_object_set_property_string (G_OBJECT (setting), m[i].property_name, value, NULL);
 			return;
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index d1c8416d83..66850dfc21 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1379,6 +1379,23 @@ get_setting_default_uint (NMSetting *setting, const char *prop)
 	return ret;
 }
 
+static guint64
+get_setting_default_uint64 (NMSetting *setting, const char *prop)
+{
+	GParamSpec *pspec;
+	GValue val = G_VALUE_INIT;
+	guint32 ret = 0;
+
+	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), prop);
+	g_assert (pspec);
+	g_value_init (&val, pspec->value_type);
+	g_param_value_set_default (pspec, &val);
+	g_assert (G_VALUE_HOLDS_UINT64 (&val));
+	ret = g_value_get_uint64 (&val);
+	g_value_unset (&val);
+	return ret;
+}
+
 static gboolean
 get_setting_default_boolean (NMSetting *setting, const char *prop)
 {
@@ -1437,6 +1454,7 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 {
 	NMSettingBridge *s_bridge;
 	guint32 i;
+	guint64 u64;
 	gboolean b;
 	const char *s;
 	GString *opts;
@@ -1516,6 +1534,13 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "multicast_last_member_count=%u", i);
 	}
 
+	u64 = nm_setting_bridge_get_multicast_last_member_interval (s_bridge);
+	if (u64 != get_setting_default_uint64 (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL)) {
+		if (opts->len)
+			g_string_append_c (opts, ' ');
+		g_string_append_printf (opts, "multicast_last_member_interval=%"G_GUINT64_FORMAT, u64);
+	}
+
 	b = nm_setting_bridge_get_multicast_querier (s_bridge);
 	if (b != get_setting_default_boolean (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERIER)) {
 		if (opts->len)

From c1bc1570f3c0b1e9f436e9f3a25d34501892329a Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Tue, 21 Apr 2020 17:35:51 +0200
Subject: [PATCH 117/222] nm-setting-bridge: add
 'multicast-membership-interval' bridge option

https://bugzilla.redhat.com/show_bug.cgi?id=1755768
---
 clients/common/nm-meta-setting-desc.c         |  4 ++
 clients/common/settings-docs.h.in             |  1 +
 libnm-core/nm-setting-bridge.c                | 49 +++++++++++++++++++
 libnm-core/nm-setting-bridge.h                |  4 ++
 libnm/libnm.ver                               |  1 +
 src/devices/nm-device-bridge.c                |  4 ++
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |  1 +
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    |  7 +++
 8 files changed, 71 insertions(+)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index cad4a80f2b..c0c3b1ffa2 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -4951,6 +4951,10 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	    .property_type =                &_pt_gobject_int,
 	    .hide_if_default =              TRUE,
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL,
+	    .property_type =                &_pt_gobject_int,
+	    .hide_if_default =              TRUE,
+	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERIER,
 	    .property_type =                &_pt_gobject_bool,
 	    .hide_if_default =              TRUE,
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index c00f0f8123..e34eb9b1d6 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -122,6 +122,7 @@
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_HASH_MAX N_("Set maximum size of multicast hash table (value must be a power of 2).")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT N_("Set the number of queries the bridge will send before stopping forwarding a multicast group after a \"leave\" message has been received.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL N_("Set interval (in deciseconds) between queries to find remaining members of a group, after a \"leave\" message is received.")
+#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL N_("Set delay (in deciseconds) after which the bridge will leave a group, if no membership reports for this group are received.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERIER N_("Enable or disable sending of multicast queries by the bridge. If not specified the option is disabled.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR N_("If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_ROUTER N_("Sets bridge's multicast router. multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not specified the default value is 'auto'.")
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 4fd8984354..c6e0c25792 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -28,6 +28,7 @@
 #define BRIDGE_MAX_AGE_DEFAULT                             20
 #define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
 #define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT      100
+#define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT       26000
 #define BRIDGE_MULTICAST_HASH_MAX_DEFAULT                  4096
 #define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
@@ -52,6 +53,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBridge,
 	PROP_MULTICAST_HASH_MAX,
 	PROP_MULTICAST_LAST_MEMBER_COUNT,
 	PROP_MULTICAST_LAST_MEMBER_INTERVAL,
+	PROP_MULTICAST_MEMBERSHIP_INTERVAL,
 	PROP_MULTICAST_ROUTER,
 	PROP_MULTICAST_QUERIER,
 	PROP_MULTICAST_QUERY_USE_IFADDR,
@@ -70,6 +72,7 @@ typedef struct {
 	char *   group_address;
 	char *   vlan_protocol;
 	guint64  multicast_last_member_interval;
+	guint64  multicast_membership_interval;
 	guint32  ageing_time;
 	guint32  multicast_hash_max;
 	guint32  multicast_last_member_count;
@@ -1067,6 +1070,22 @@ nm_setting_bridge_get_multicast_last_member_interval (const NMSettingBridge *set
 	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_last_member_interval;
 }
 
+/**
+ * nm_setting_bridge_get_multicast_membership_interval:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:multicast-membership-interval property of the setting
+ *
+ * Since 1.26
+ **/
+guint64
+nm_setting_bridge_get_multicast_membership_interval (const NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_membership_interval;
+}
+
 /*****************************************************************************/
 
 static gboolean
@@ -1311,6 +1330,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_LAST_MEMBER_INTERVAL:
 		g_value_set_uint64 (value, priv->multicast_last_member_interval);
 		break;
+	case PROP_MULTICAST_MEMBERSHIP_INTERVAL:
+		g_value_set_uint64 (value, priv->multicast_membership_interval);
+		break;
 	case PROP_MULTICAST_SNOOPING:
 		g_value_set_boolean (value, priv->multicast_snooping);
 		break;
@@ -1393,6 +1415,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_LAST_MEMBER_INTERVAL:
 		priv->multicast_last_member_interval = g_value_get_uint64 (value);
 		break;
+	case PROP_MULTICAST_MEMBERSHIP_INTERVAL:
+		priv->multicast_membership_interval = g_value_get_uint64 (value);
+		break;
 	case PROP_MULTICAST_SNOOPING:
 		priv->multicast_snooping = g_value_get_boolean (value);
 		break;
@@ -1446,6 +1471,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->max_age                        = BRIDGE_MAX_AGE_DEFAULT;
 	priv->multicast_last_member_count    = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT;
 	priv->multicast_last_member_interval = BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT;
+	priv->multicast_membership_interval  = BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT;
 	priv->multicast_hash_max             = BRIDGE_MULTICAST_HASH_MAX_DEFAULT;
 	priv->multicast_snooping             = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
 	priv->priority                       = BRIDGE_PRIORITY_DEFAULT;
@@ -1997,6 +2023,29 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	                         NM_SETTING_PARAM_INFERRABLE |
 	                         G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingBridge:multicast-membership-interval:
+	 *
+	 * Set delay (in deciseconds) after which the bridge will
+	 * leave a group, if no membership reports for this
+	 * group are received.
+	 **/
+	/* ---ifcfg-rh---
+	 * property: multicast-membership-interval
+	 * variable: BRIDGING_OPTS: multicast_membership_interval=
+	 * default: 26000
+	 * example: BRIDGING_OPTS="multicast_membership_interval=16000"
+	 * ---end---
+	 *
+	 * Since: 1.26
+	 */
+	obj_properties[PROP_MULTICAST_MEMBERSHIP_INTERVAL] =
+	    g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL, "", "",
+	                         0, G_MAXUINT64, BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE,
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index ebf250ab20..195adc80c2 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -34,6 +34,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_MULTICAST_HASH_MAX              "multicast-hash-max"
 #define NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT     "multicast-last-member-count"
 #define NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL  "multicast-last-member-interval"
+#define NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL   "multicast-membership-interval"
 #define NM_SETTING_BRIDGE_MULTICAST_SNOOPING              "multicast-snooping"
 #define NM_SETTING_BRIDGE_MULTICAST_ROUTER                "multicast-router"
 #define NM_SETTING_BRIDGE_MULTICAST_QUERIER               "multicast-querier"
@@ -152,6 +153,9 @@ guint32 nm_setting_bridge_get_multicast_last_member_count (const NMSettingBridge
 NM_AVAILABLE_IN_1_26
 guint64 nm_setting_bridge_get_multicast_last_member_interval (const NMSettingBridge *setting);
 
+NM_AVAILABLE_IN_1_26
+guint64 nm_setting_bridge_get_multicast_membership_interval (const NMSettingBridge *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_BRIDGE_H__ */
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 46bcc452bc..668edb35e1 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1701,5 +1701,6 @@ global:
 	nm_setting_bridge_get_multicast_hash_max;
 	nm_setting_bridge_get_multicast_last_member_count;
 	nm_setting_bridge_get_multicast_last_member_interval;
+	nm_setting_bridge_get_multicast_membership_interval;
 	nm_setting_connection_get_mud_url;
 } libnm_1_24_0;
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 6db8f40928..0b1af30afb 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -286,6 +286,10 @@ static const Option master_options[] = {
 	                                                    NULL, NULL,
 	                                                    0, G_MAXUINT64, 100,
 	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL, "multicast_membership_interval",
+	                                                    NULL, NULL,
+	                                                    0, G_MAXUINT64, 26000,
+	                                                    FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER,              "multicast_querier",
 	                                                    NULL, NULL,
 	                                                    0, 1, 0,
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index e976f8a352..9cbbc57ca8 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -5164,6 +5164,7 @@ handle_bridge_option (NMSetting *setting,
 		{ "ageing_time",                    NM_SETTING_BRIDGE_AGEING_TIME,                    BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_last_member_count",    NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,    BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_last_member_interval", NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL, BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_membership_interval",  NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL,  BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_hash_max",             NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,             BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_querier",              NM_SETTING_BRIDGE_MULTICAST_QUERIER,              BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_query_use_ifaddr",     NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,     BRIDGE_OPT_TYPE_OPTION },
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 66850dfc21..712478d5ef 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1541,6 +1541,13 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "multicast_last_member_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
+	u64 = nm_setting_bridge_get_multicast_membership_interval (s_bridge);
+	if (u64 != get_setting_default_uint64 (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL)) {
+		if (opts->len)
+			g_string_append_c (opts, ' ');
+		g_string_append_printf (opts, "multicast_membership_interval=%"G_GUINT64_FORMAT, u64);
+	}
+
 	b = nm_setting_bridge_get_multicast_querier (s_bridge);
 	if (b != get_setting_default_boolean (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERIER)) {
 		if (opts->len)

From b9b9a95395b19b2d8176c1cbebb9aab693ef8027 Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Tue, 21 Apr 2020 17:35:51 +0200
Subject: [PATCH 118/222] nm-setting-bridge: add 'multicast-querier-interval'
 bridge option

https://bugzilla.redhat.com/show_bug.cgi?id=1755768
---
 clients/common/nm-meta-setting-desc.c         |  4 ++
 clients/common/settings-docs.h.in             |  1 +
 libnm-core/nm-setting-bridge.c                | 48 +++++++++++++++++++
 libnm-core/nm-setting-bridge.h                |  4 ++
 libnm/libnm.ver                               |  1 +
 src/devices/nm-device-bridge.c                |  4 ++
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |  1 +
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    |  7 +++
 8 files changed, 70 insertions(+)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index c0c3b1ffa2..2740de9d59 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -4959,6 +4959,10 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	    .property_type =                &_pt_gobject_bool,
 	    .hide_if_default =              TRUE,
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL,
+	    .property_type =                &_pt_gobject_int,
+	    .hide_if_default =              TRUE,
+	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,
 	    .property_type =                &_pt_gobject_bool,
 	    .hide_if_default =              TRUE,
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index e34eb9b1d6..778b8ef1cf 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -124,6 +124,7 @@
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL N_("Set interval (in deciseconds) between queries to find remaining members of a group, after a \"leave\" message is received.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL N_("Set delay (in deciseconds) after which the bridge will leave a group, if no membership reports for this group are received.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERIER N_("Enable or disable sending of multicast queries by the bridge. If not specified the option is disabled.")
+#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL N_("If no queries are seen after this delay (in deciseconds) has passed, the bridge will start to send its own queries.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR N_("If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_ROUTER N_("Sets bridge's multicast router. multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not specified the default value is 'auto'.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_SNOOPING N_("Controls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.")
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index c6e0c25792..30ae2068c5 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -29,6 +29,7 @@
 #define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
 #define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT      100
 #define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT       26000
+#define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT          25500
 #define BRIDGE_MULTICAST_HASH_MAX_DEFAULT                  4096
 #define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
@@ -56,6 +57,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBridge,
 	PROP_MULTICAST_MEMBERSHIP_INTERVAL,
 	PROP_MULTICAST_ROUTER,
 	PROP_MULTICAST_QUERIER,
+	PROP_MULTICAST_QUERIER_INTERVAL,
 	PROP_MULTICAST_QUERY_USE_IFADDR,
 	PROP_MULTICAST_SNOOPING,
 	PROP_VLAN_FILTERING,
@@ -73,6 +75,7 @@ typedef struct {
 	char *   vlan_protocol;
 	guint64  multicast_last_member_interval;
 	guint64  multicast_membership_interval;
+	guint64  multicast_querier_interval;
 	guint32  ageing_time;
 	guint32  multicast_hash_max;
 	guint32  multicast_last_member_count;
@@ -1086,6 +1089,22 @@ nm_setting_bridge_get_multicast_membership_interval (const NMSettingBridge *sett
 	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_membership_interval;
 }
 
+/**
+ * nm_setting_bridge_get_multicast_querier_interval:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:multicast-querier-interval property of the setting
+ *
+ * Since 1.26
+ **/
+guint64
+nm_setting_bridge_get_multicast_querier_interval (const NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_querier_interval;
+}
+
 /*****************************************************************************/
 
 static gboolean
@@ -1342,6 +1361,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_QUERIER:
 		g_value_set_boolean (value, priv->multicast_querier);
 		break;
+	case PROP_MULTICAST_QUERIER_INTERVAL:
+		g_value_set_uint64 (value, priv->multicast_querier_interval);
+		break;
 	case PROP_MULTICAST_QUERY_USE_IFADDR:
 		g_value_set_boolean (value, priv->multicast_query_use_ifaddr);
 		break;
@@ -1428,6 +1450,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_QUERIER:
 		priv->multicast_querier = g_value_get_boolean (value);
 		break;
+	case PROP_MULTICAST_QUERIER_INTERVAL:
+		priv->multicast_querier_interval = g_value_get_uint64 (value);
+		break;
 	case PROP_MULTICAST_QUERY_USE_IFADDR:
 		priv->multicast_query_use_ifaddr = g_value_get_boolean (value);
 		break;
@@ -1480,6 +1505,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->vlan_stats_enabled             = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
 	priv->multicast_query_use_ifaddr     = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
 	priv->multicast_querier              = BRIDGE_MULTICAST_QUERIER_DEFAULT;
+	priv->multicast_querier_interval     = BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT;
 }
 
 /**
@@ -2046,6 +2072,28 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	                         NM_SETTING_PARAM_INFERRABLE |
 	                         G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingBridge:multicast-querier-interval:
+	 *
+	 * If no queries are seen after this delay (in deciseconds) has passed,
+	 * the bridge will start to send its own queries.
+	 **/
+	/* ---ifcfg-rh---
+	 * property: multicast-querier-interval
+	 * variable: BRIDGING_OPTS: multicast_querier_interval=
+	 * default: 25500
+	 * example: BRIDGING_OPTS="multicast_querier_interval=20000"
+	 * ---end---
+	 *
+	 * Since: 1.26
+	 */
+	obj_properties[PROP_MULTICAST_QUERIER_INTERVAL] =
+	    g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL, "", "",
+	                         0, G_MAXUINT64, BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE,
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index 195adc80c2..26e6188ec3 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -38,6 +38,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_MULTICAST_SNOOPING              "multicast-snooping"
 #define NM_SETTING_BRIDGE_MULTICAST_ROUTER                "multicast-router"
 #define NM_SETTING_BRIDGE_MULTICAST_QUERIER               "multicast-querier"
+#define NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL      "multicast-querier-interval"
 #define NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR      "multicast-query-use-ifaddr"
 #define NM_SETTING_BRIDGE_VLAN_FILTERING                  "vlan-filtering"
 #define NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID               "vlan-default-pvid"
@@ -156,6 +157,9 @@ guint64 nm_setting_bridge_get_multicast_last_member_interval (const NMSettingBri
 NM_AVAILABLE_IN_1_26
 guint64 nm_setting_bridge_get_multicast_membership_interval (const NMSettingBridge *setting);
 
+NM_AVAILABLE_IN_1_26
+guint64 nm_setting_bridge_get_multicast_querier_interval (const NMSettingBridge *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_BRIDGE_H__ */
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 668edb35e1..8cfc021986 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1702,5 +1702,6 @@ global:
 	nm_setting_bridge_get_multicast_last_member_count;
 	nm_setting_bridge_get_multicast_last_member_interval;
 	nm_setting_bridge_get_multicast_membership_interval;
+	nm_setting_bridge_get_multicast_querier_interval;
 	nm_setting_connection_get_mud_url;
 } libnm_1_24_0;
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 0b1af30afb..cab1706112 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -294,6 +294,10 @@ static const Option master_options[] = {
 	                                                    NULL, NULL,
 	                                                    0, 1, 0,
 	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL,     "multicast_querier_interval",
+	                                                    NULL, NULL,
+	                                                    0, G_MAXUINT64, 25500,
+	                                                    FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,     "multicast_query_use_ifaddr",
 	                                                    NULL, NULL,
 	                                                    0, 1, 0,
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 9cbbc57ca8..8ebfb0f544 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -5167,6 +5167,7 @@ handle_bridge_option (NMSetting *setting,
 		{ "multicast_membership_interval",  NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL,  BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_hash_max",             NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,             BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_querier",              NM_SETTING_BRIDGE_MULTICAST_QUERIER,              BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_querier_interval",     NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL,     BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_query_use_ifaddr",     NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,     BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_snooping",             NM_SETTING_BRIDGE_MULTICAST_SNOOPING,             BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_router",               NM_SETTING_BRIDGE_MULTICAST_ROUTER,               BRIDGE_OPT_TYPE_OPTION },
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 712478d5ef..0b5936e7e0 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1555,6 +1555,13 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "multicast_querier=%u", (guint) b);
 	}
 
+	u64 = nm_setting_bridge_get_multicast_querier_interval (s_bridge);
+	if (u64 != get_setting_default_uint64 (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL)) {
+		if (opts->len)
+			g_string_append_c (opts, ' ');
+		g_string_append_printf (opts, "multicast_querier_interval=%"G_GUINT64_FORMAT, u64);
+	}
+
 	b = nm_setting_bridge_get_multicast_query_use_ifaddr (s_bridge);
 	if (b != get_setting_default_boolean (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR)) {
 		if (opts->len)

From 9842c55503fe5a986bde2e0579d22a62c647b8a7 Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Tue, 21 Apr 2020 17:35:51 +0200
Subject: [PATCH 119/222] nm-setting-bridge: add 'multicast-query-interval'
 bridge option

https://bugzilla.redhat.com/show_bug.cgi?id=1755768
---
 clients/common/nm-meta-setting-desc.c         |  4 ++
 clients/common/settings-docs.h.in             |  1 +
 libnm-core/nm-setting-bridge.c                | 48 +++++++++++++++++++
 libnm-core/nm-setting-bridge.h                |  4 ++
 libnm/libnm.ver                               |  1 +
 src/devices/nm-device-bridge.c                |  4 ++
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |  1 +
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    |  7 +++
 8 files changed, 70 insertions(+)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 2740de9d59..4d4c7bd471 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -4963,6 +4963,10 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	    .property_type =                &_pt_gobject_int,
 	    .hide_if_default =              TRUE,
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL,
+	    .property_type =                &_pt_gobject_int,
+	    .hide_if_default =              TRUE,
+	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,
 	    .property_type =                &_pt_gobject_bool,
 	    .hide_if_default =              TRUE,
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 778b8ef1cf..b8e7e349a1 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -125,6 +125,7 @@
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL N_("Set delay (in deciseconds) after which the bridge will leave a group, if no membership reports for this group are received.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERIER N_("Enable or disable sending of multicast queries by the bridge. If not specified the option is disabled.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL N_("If no queries are seen after this delay (in deciseconds) has passed, the bridge will start to send its own queries.")
+#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL N_("Interval (in deciseconds) between queries sent by the bridge after the end of the startup phase.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR N_("If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_ROUTER N_("Sets bridge's multicast router. multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not specified the default value is 'auto'.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_SNOOPING N_("Controls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.")
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 30ae2068c5..73b9029272 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -32,6 +32,7 @@
 #define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT          25500
 #define BRIDGE_MULTICAST_HASH_MAX_DEFAULT                  4096
 #define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
+#define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT            12500
 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
 #define BRIDGE_MULTICAST_SNOOPING_DEFAULT                  TRUE
 #define BRIDGE_PRIORITY_DEFAULT                            0x8000
@@ -58,6 +59,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBridge,
 	PROP_MULTICAST_ROUTER,
 	PROP_MULTICAST_QUERIER,
 	PROP_MULTICAST_QUERIER_INTERVAL,
+	PROP_MULTICAST_QUERY_INTERVAL,
 	PROP_MULTICAST_QUERY_USE_IFADDR,
 	PROP_MULTICAST_SNOOPING,
 	PROP_VLAN_FILTERING,
@@ -76,6 +78,7 @@ typedef struct {
 	guint64  multicast_last_member_interval;
 	guint64  multicast_membership_interval;
 	guint64  multicast_querier_interval;
+	guint64  multicast_query_interval;
 	guint32  ageing_time;
 	guint32  multicast_hash_max;
 	guint32  multicast_last_member_count;
@@ -1105,6 +1108,22 @@ nm_setting_bridge_get_multicast_querier_interval (const NMSettingBridge *setting
 	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_querier_interval;
 }
 
+/**
+ * nm_setting_bridge_get_multicast_query_interval:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:multicast-query-interval property of the setting
+ *
+ * Since 1.26
+ **/
+guint64
+nm_setting_bridge_get_multicast_query_interval (const NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_query_interval;
+}
+
 /*****************************************************************************/
 
 static gboolean
@@ -1364,6 +1383,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_QUERIER_INTERVAL:
 		g_value_set_uint64 (value, priv->multicast_querier_interval);
 		break;
+	case PROP_MULTICAST_QUERY_INTERVAL:
+		g_value_set_uint64 (value, priv->multicast_query_interval);
+		break;
 	case PROP_MULTICAST_QUERY_USE_IFADDR:
 		g_value_set_boolean (value, priv->multicast_query_use_ifaddr);
 		break;
@@ -1453,6 +1475,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_QUERIER_INTERVAL:
 		priv->multicast_querier_interval = g_value_get_uint64 (value);
 		break;
+	case PROP_MULTICAST_QUERY_INTERVAL:
+		priv->multicast_query_interval = g_value_get_uint64 (value);
+		break;
 	case PROP_MULTICAST_QUERY_USE_IFADDR:
 		priv->multicast_query_use_ifaddr = g_value_get_boolean (value);
 		break;
@@ -1503,6 +1528,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->stp                            = BRIDGE_STP_DEFAULT;
 	priv->vlan_default_pvid              = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
 	priv->vlan_stats_enabled             = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
+	priv->multicast_query_interval       = BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT;
 	priv->multicast_query_use_ifaddr     = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
 	priv->multicast_querier              = BRIDGE_MULTICAST_QUERIER_DEFAULT;
 	priv->multicast_querier_interval     = BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT;
@@ -2094,6 +2120,28 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	                         NM_SETTING_PARAM_INFERRABLE |
 	                         G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingBridge:multicast-query-interval:
+	 *
+	 * Interval (in deciseconds) between queries sent
+	 * by the bridge after the end of the startup phase.
+	 **/
+	/* ---ifcfg-rh---
+	 * property: multicast-query-interval
+	 * variable: BRIDGING_OPTS: multicast_query_interval=
+	 * default: 12500
+	 * example: BRIDGING_OPTS="multicast_query_interval=22500"
+	 * ---end---
+	 *
+	 * Since: 1.26
+	 */
+	obj_properties[PROP_MULTICAST_QUERY_INTERVAL] =
+	    g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL, "", "",
+	                         0, G_MAXUINT64, BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE,
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index 26e6188ec3..ff66d73641 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -39,6 +39,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_MULTICAST_ROUTER                "multicast-router"
 #define NM_SETTING_BRIDGE_MULTICAST_QUERIER               "multicast-querier"
 #define NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL      "multicast-querier-interval"
+#define NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL        "multicast-query-interval"
 #define NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR      "multicast-query-use-ifaddr"
 #define NM_SETTING_BRIDGE_VLAN_FILTERING                  "vlan-filtering"
 #define NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID               "vlan-default-pvid"
@@ -160,6 +161,9 @@ guint64 nm_setting_bridge_get_multicast_membership_interval (const NMSettingBrid
 NM_AVAILABLE_IN_1_26
 guint64 nm_setting_bridge_get_multicast_querier_interval (const NMSettingBridge *setting);
 
+NM_AVAILABLE_IN_1_26
+guint64 nm_setting_bridge_get_multicast_query_interval (const NMSettingBridge *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_BRIDGE_H__ */
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 8cfc021986..a80fae90e4 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1703,5 +1703,6 @@ global:
 	nm_setting_bridge_get_multicast_last_member_interval;
 	nm_setting_bridge_get_multicast_membership_interval;
 	nm_setting_bridge_get_multicast_querier_interval;
+	nm_setting_bridge_get_multicast_query_interval;
 	nm_setting_connection_get_mud_url;
 } libnm_1_24_0;
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index cab1706112..2faf4ec8ef 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -298,6 +298,10 @@ static const Option master_options[] = {
 	                                                    NULL, NULL,
 	                                                    0, G_MAXUINT64, 25500,
 	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL,       "multicast_query_interval",
+	                                                    NULL, NULL,
+	                                                    0, G_MAXUINT64, 12500,
+	                                                    FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,     "multicast_query_use_ifaddr",
 	                                                    NULL, NULL,
 	                                                    0, 1, 0,
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 8ebfb0f544..e063a44313 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -5168,6 +5168,7 @@ handle_bridge_option (NMSetting *setting,
 		{ "multicast_hash_max",             NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,             BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_querier",              NM_SETTING_BRIDGE_MULTICAST_QUERIER,              BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_querier_interval",     NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL,     BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_query_interval",       NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL,       BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_query_use_ifaddr",     NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,     BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_snooping",             NM_SETTING_BRIDGE_MULTICAST_SNOOPING,             BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_router",               NM_SETTING_BRIDGE_MULTICAST_ROUTER,               BRIDGE_OPT_TYPE_OPTION },
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 0b5936e7e0..fb19ae1ac1 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1562,6 +1562,13 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "multicast_querier_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
+	u64 = nm_setting_bridge_get_multicast_query_interval (s_bridge);
+	if (u64 != get_setting_default_uint64 (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL)) {
+		if (opts->len)
+			g_string_append_c (opts, ' ');
+		g_string_append_printf (opts, "multicast_query_interval=%"G_GUINT64_FORMAT, u64);
+	}
+
 	b = nm_setting_bridge_get_multicast_query_use_ifaddr (s_bridge);
 	if (b != get_setting_default_boolean (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR)) {
 		if (opts->len)

From 62facc59e87804d4b257917b4fffd71471b5f481 Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Tue, 21 Apr 2020 17:35:51 +0200
Subject: [PATCH 120/222] nm-setting-bridge: add
 'multicast-query-response-interval' bridge option

https://bugzilla.redhat.com/show_bug.cgi?id=1755768
---
 clients/common/nm-meta-setting-desc.c         |   4 +
 clients/common/settings-docs.h.in             |   1 +
 libnm-core/nm-setting-bridge.c                |  82 +++++++--
 libnm-core/nm-setting-bridge.h                |  52 +++---
 libnm/libnm.ver                               |   1 +
 src/devices/nm-device-bridge.c                | 164 +++++++++---------
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |  49 +++---
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    |   7 +
 8 files changed, 215 insertions(+), 145 deletions(-)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 4d4c7bd471..1ce67e6605 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -4967,6 +4967,10 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	    .property_type =                &_pt_gobject_int,
 	    .hide_if_default =              TRUE,
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL,
+	    .property_type =                &_pt_gobject_int,
+	    .hide_if_default =              TRUE,
+	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,
 	    .property_type =                &_pt_gobject_bool,
 	    .hide_if_default =              TRUE,
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index b8e7e349a1..a016f6c2c1 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -126,6 +126,7 @@
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERIER N_("Enable or disable sending of multicast queries by the bridge. If not specified the option is disabled.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL N_("If no queries are seen after this delay (in deciseconds) has passed, the bridge will start to send its own queries.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL N_("Interval (in deciseconds) between queries sent by the bridge after the end of the startup phase.")
+#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL N_("Set the Max Response Time/Max Response Delay (in deciseconds) for IGMP/MLD queries sent by the bridge.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR N_("If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_ROUTER N_("Sets bridge's multicast router. multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not specified the default value is 'auto'.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_SNOOPING N_("Controls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.")
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 73b9029272..39d53340b7 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -33,6 +33,7 @@
 #define BRIDGE_MULTICAST_HASH_MAX_DEFAULT                  4096
 #define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
 #define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT            12500
+#define BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT   1000
 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
 #define BRIDGE_MULTICAST_SNOOPING_DEFAULT                  TRUE
 #define BRIDGE_PRIORITY_DEFAULT                            0x8000
@@ -60,6 +61,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBridge,
 	PROP_MULTICAST_QUERIER,
 	PROP_MULTICAST_QUERIER_INTERVAL,
 	PROP_MULTICAST_QUERY_INTERVAL,
+	PROP_MULTICAST_QUERY_RESPONSE_INTERVAL,
 	PROP_MULTICAST_QUERY_USE_IFADDR,
 	PROP_MULTICAST_SNOOPING,
 	PROP_VLAN_FILTERING,
@@ -79,6 +81,7 @@ typedef struct {
 	guint64  multicast_membership_interval;
 	guint64  multicast_querier_interval;
 	guint64  multicast_query_interval;
+	guint64  multicast_query_response_interval;
 	guint32  ageing_time;
 	guint32  multicast_hash_max;
 	guint32  multicast_last_member_count;
@@ -1124,6 +1127,22 @@ nm_setting_bridge_get_multicast_query_interval (const NMSettingBridge *setting)
 	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_query_interval;
 }
 
+/**
+ * nm_setting_bridge_get_multicast_query_response_interval:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:multicast-query-response-interval property of the setting
+ *
+ * Since 1.26
+ **/
+guint64
+nm_setting_bridge_get_multicast_query_response_interval (const NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_query_response_interval;
+}
+
 /*****************************************************************************/
 
 static gboolean
@@ -1386,6 +1405,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_QUERY_INTERVAL:
 		g_value_set_uint64 (value, priv->multicast_query_interval);
 		break;
+	case PROP_MULTICAST_QUERY_RESPONSE_INTERVAL:
+		g_value_set_uint64 (value, priv->multicast_query_response_interval);
+		break;
 	case PROP_MULTICAST_QUERY_USE_IFADDR:
 		g_value_set_boolean (value, priv->multicast_query_use_ifaddr);
 		break;
@@ -1478,6 +1500,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_QUERY_INTERVAL:
 		priv->multicast_query_interval = g_value_get_uint64 (value);
 		break;
+	case PROP_MULTICAST_QUERY_RESPONSE_INTERVAL:
+		priv->multicast_query_response_interval = g_value_get_uint64 (value);
+		break;
 	case PROP_MULTICAST_QUERY_USE_IFADDR:
 		priv->multicast_query_use_ifaddr = g_value_get_boolean (value);
 		break;
@@ -1515,23 +1540,24 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 
 	priv->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
 
-	priv->ageing_time                    = BRIDGE_AGEING_TIME_DEFAULT;
-	priv->forward_delay                  = BRIDGE_FORWARD_DELAY_DEFAULT;
-	priv->hello_time                     = BRIDGE_HELLO_TIME_DEFAULT;
-	priv->max_age                        = BRIDGE_MAX_AGE_DEFAULT;
-	priv->multicast_last_member_count    = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT;
-	priv->multicast_last_member_interval = BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT;
-	priv->multicast_membership_interval  = BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT;
-	priv->multicast_hash_max             = BRIDGE_MULTICAST_HASH_MAX_DEFAULT;
-	priv->multicast_snooping             = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
-	priv->priority                       = BRIDGE_PRIORITY_DEFAULT;
-	priv->stp                            = BRIDGE_STP_DEFAULT;
-	priv->vlan_default_pvid              = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
-	priv->vlan_stats_enabled             = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
-	priv->multicast_query_interval       = BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT;
-	priv->multicast_query_use_ifaddr     = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
-	priv->multicast_querier              = BRIDGE_MULTICAST_QUERIER_DEFAULT;
-	priv->multicast_querier_interval     = BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT;
+	priv->ageing_time                       = BRIDGE_AGEING_TIME_DEFAULT;
+	priv->forward_delay                     = BRIDGE_FORWARD_DELAY_DEFAULT;
+	priv->hello_time                        = BRIDGE_HELLO_TIME_DEFAULT;
+	priv->max_age                           = BRIDGE_MAX_AGE_DEFAULT;
+	priv->multicast_last_member_count       = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT;
+	priv->multicast_last_member_interval    = BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT;
+	priv->multicast_membership_interval     = BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT;
+	priv->multicast_hash_max                = BRIDGE_MULTICAST_HASH_MAX_DEFAULT;
+	priv->multicast_snooping                = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
+	priv->priority                          = BRIDGE_PRIORITY_DEFAULT;
+	priv->stp                               = BRIDGE_STP_DEFAULT;
+	priv->vlan_default_pvid                 = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
+	priv->vlan_stats_enabled                = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
+	priv->multicast_query_interval          = BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT;
+	priv->multicast_query_response_interval = BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT;
+	priv->multicast_query_use_ifaddr        = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
+	priv->multicast_querier                 = BRIDGE_MULTICAST_QUERIER_DEFAULT;
+	priv->multicast_querier_interval        = BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT;
 }
 
 /**
@@ -2142,6 +2168,28 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	                         NM_SETTING_PARAM_INFERRABLE |
 	                         G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingBridge:multicast-query-response-interval:
+	 *
+	 * Set the Max Response Time/Max Response Delay
+	 * (in deciseconds) for IGMP/MLD queries sent by the bridge.
+	 **/
+	/* ---ifcfg-rh---
+	 * property: multicast-query-response-interval
+	 * variable: BRIDGING_OPTS: multicast_query_response_interval=
+	 * default: 1000
+	 * example: BRIDGING_OPTS="multicast_query_response_interval=2000"
+	 * ---end---
+	 *
+	 * Since: 1.26
+	 */
+	obj_properties[PROP_MULTICAST_QUERY_RESPONSE_INTERVAL] =
+	    g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL, "", "",
+	                         0, G_MAXUINT64, BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE,
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index ff66d73641..136ed0bdda 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -23,30 +23,31 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
 
-#define NM_SETTING_BRIDGE_MAC_ADDRESS                     "mac-address"
-#define NM_SETTING_BRIDGE_STP                             "stp"
-#define NM_SETTING_BRIDGE_PRIORITY                        "priority"
-#define NM_SETTING_BRIDGE_FORWARD_DELAY                   "forward-delay"
-#define NM_SETTING_BRIDGE_HELLO_TIME                      "hello-time"
-#define NM_SETTING_BRIDGE_MAX_AGE                         "max-age"
-#define NM_SETTING_BRIDGE_AGEING_TIME                     "ageing-time"
-#define NM_SETTING_BRIDGE_GROUP_FORWARD_MASK              "group-forward-mask"
-#define NM_SETTING_BRIDGE_MULTICAST_HASH_MAX              "multicast-hash-max"
-#define NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT     "multicast-last-member-count"
-#define NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL  "multicast-last-member-interval"
-#define NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL   "multicast-membership-interval"
-#define NM_SETTING_BRIDGE_MULTICAST_SNOOPING              "multicast-snooping"
-#define NM_SETTING_BRIDGE_MULTICAST_ROUTER                "multicast-router"
-#define NM_SETTING_BRIDGE_MULTICAST_QUERIER               "multicast-querier"
-#define NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL      "multicast-querier-interval"
-#define NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL        "multicast-query-interval"
-#define NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR      "multicast-query-use-ifaddr"
-#define NM_SETTING_BRIDGE_VLAN_FILTERING                  "vlan-filtering"
-#define NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID               "vlan-default-pvid"
-#define NM_SETTING_BRIDGE_VLANS                           "vlans"
-#define NM_SETTING_BRIDGE_GROUP_ADDRESS                   "group-address"
-#define NM_SETTING_BRIDGE_VLAN_PROTOCOL                   "vlan-protocol"
-#define NM_SETTING_BRIDGE_VLAN_STATS_ENABLED              "vlan-stats-enabled"
+#define NM_SETTING_BRIDGE_MAC_ADDRESS                       "mac-address"
+#define NM_SETTING_BRIDGE_STP                               "stp"
+#define NM_SETTING_BRIDGE_PRIORITY                          "priority"
+#define NM_SETTING_BRIDGE_FORWARD_DELAY                     "forward-delay"
+#define NM_SETTING_BRIDGE_HELLO_TIME                        "hello-time"
+#define NM_SETTING_BRIDGE_MAX_AGE                           "max-age"
+#define NM_SETTING_BRIDGE_AGEING_TIME                       "ageing-time"
+#define NM_SETTING_BRIDGE_GROUP_FORWARD_MASK                "group-forward-mask"
+#define NM_SETTING_BRIDGE_MULTICAST_HASH_MAX                "multicast-hash-max"
+#define NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT       "multicast-last-member-count"
+#define NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL    "multicast-last-member-interval"
+#define NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL     "multicast-membership-interval"
+#define NM_SETTING_BRIDGE_MULTICAST_SNOOPING                "multicast-snooping"
+#define NM_SETTING_BRIDGE_MULTICAST_ROUTER                  "multicast-router"
+#define NM_SETTING_BRIDGE_MULTICAST_QUERIER                 "multicast-querier"
+#define NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL        "multicast-querier-interval"
+#define NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL          "multicast-query-interval"
+#define NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL "multicast-query-response-interval"
+#define NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR        "multicast-query-use-ifaddr"
+#define NM_SETTING_BRIDGE_VLAN_FILTERING                    "vlan-filtering"
+#define NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID                 "vlan-default-pvid"
+#define NM_SETTING_BRIDGE_VLANS                             "vlans"
+#define NM_SETTING_BRIDGE_GROUP_ADDRESS                     "group-address"
+#define NM_SETTING_BRIDGE_VLAN_PROTOCOL                     "vlan-protocol"
+#define NM_SETTING_BRIDGE_VLAN_STATS_ENABLED                "vlan-stats-enabled"
 
 #define NM_BRIDGE_VLAN_VID_MIN            1
 #define NM_BRIDGE_VLAN_VID_MAX            4094
@@ -164,6 +165,9 @@ guint64 nm_setting_bridge_get_multicast_querier_interval (const NMSettingBridge
 NM_AVAILABLE_IN_1_26
 guint64 nm_setting_bridge_get_multicast_query_interval (const NMSettingBridge *setting);
 
+NM_AVAILABLE_IN_1_26
+guint64 nm_setting_bridge_get_multicast_query_response_interval (const NMSettingBridge *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_BRIDGE_H__ */
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index a80fae90e4..39d36ef141 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1704,5 +1704,6 @@ global:
 	nm_setting_bridge_get_multicast_membership_interval;
 	nm_setting_bridge_get_multicast_querier_interval;
 	nm_setting_bridge_get_multicast_query_interval;
+	nm_setting_bridge_get_multicast_query_response_interval;
 	nm_setting_connection_get_mud_url;
 } libnm_1_24_0;
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 2faf4ec8ef..34b5ab7176 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -246,86 +246,90 @@ typedef struct {
 } Option;
 
 static const Option master_options[] = {
-	{ NM_SETTING_BRIDGE_STP,                            "stp_state", /* this must stay as the first item */
-	                                                    NULL, NULL,
-	                                                    0, 1, 1,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_PRIORITY,                       "priority",
-	                                                    NULL, NULL,
-	                                                    0, G_MAXUINT16, 0x8000,
-	                                                    TRUE, FALSE, TRUE },
-	{ NM_SETTING_BRIDGE_FORWARD_DELAY,                  "forward_delay",
-	                                                    NULL, NULL,
-	                                                    0, NM_BR_MAX_FORWARD_DELAY, 15,
-	                                                    TRUE, TRUE, TRUE},
-	{ NM_SETTING_BRIDGE_HELLO_TIME,                     "hello_time",
-	                                                    NULL, NULL,
-	                                                    0, NM_BR_MAX_HELLO_TIME, 2,
-	                                                    TRUE, TRUE, TRUE },
-	{ NM_SETTING_BRIDGE_MAX_AGE,                        "max_age",
-	                                                    NULL, NULL,
-	                                                    0, NM_BR_MAX_MAX_AGE, 20,
-	                                                    TRUE, TRUE, TRUE },
-	{ NM_SETTING_BRIDGE_AGEING_TIME,                    "ageing_time",
-	                                                    NULL, NULL,
-	                                                    NM_BR_MIN_AGEING_TIME, NM_BR_MAX_AGEING_TIME, 300,
-	                                                    TRUE, TRUE, FALSE },
-	{ NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,             "group_fwd_mask",
-	                                                    NULL, NULL,
-	                                                    0, 0xFFFF, 0,
-	                                                    TRUE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,             "hash_max",
-	                                                    NULL, NULL,
-	                                                    NM_BR_MIN_MULTICAST_HASH_MAX, NM_BR_MAX_MULTICAST_HASH_MAX, 4096,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,    "multicast_last_member_count",
-	                                                    NULL, NULL,
-	                                                    0, G_MAXUINT32, 2,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL, "multicast_last_member_interval",
-	                                                    NULL, NULL,
-	                                                    0, G_MAXUINT64, 100,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL, "multicast_membership_interval",
-	                                                    NULL, NULL,
-	                                                    0, G_MAXUINT64, 26000,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER,              "multicast_querier",
-	                                                    NULL, NULL,
-	                                                    0, 1, 0,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL,     "multicast_querier_interval",
-	                                                    NULL, NULL,
-	                                                    0, G_MAXUINT64, 25500,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL,       "multicast_query_interval",
-	                                                    NULL, NULL,
-	                                                    0, G_MAXUINT64, 12500,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,     "multicast_query_use_ifaddr",
-	                                                    NULL, NULL,
-	                                                    0, 1, 0,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_SNOOPING,             "multicast_snooping",
-	                                                    NULL, NULL,
-	                                                    0, 1, 1,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_ROUTER,               "multicast_router",
-	                                                    to_sysfs_multicast_router, from_sysfs_multicast_router,
-	                                                    0, 0, 0,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_GROUP_ADDRESS,                  "group_addr",
-	                                                    to_sysfs_group_address, from_sysfs_group_address,
-	                                                    0, 0, 0,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_VLAN_PROTOCOL,                  "vlan_protocol",
-	                                                    to_sysfs_vlan_protocol, from_sysfs_vlan_protocol,
-	                                                    0, 0, 0,
-	                                                    FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,             "vlan_stats_enabled",
-	                                                    NULL, NULL,
-	                                                    0, 1, 0,
-	                                                    FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_STP,                                     "stp_state", /* this must stay as the first item */
+	                                                             NULL, NULL,
+	                                                             0, 1, 1,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_PRIORITY,                                "priority",
+	                                                             NULL, NULL,
+	                                                             0, G_MAXUINT16, 0x8000,
+	                                                             TRUE, FALSE, TRUE },
+	{ NM_SETTING_BRIDGE_FORWARD_DELAY,                           "forward_delay",
+	                                                             NULL, NULL,
+	                                                             0, NM_BR_MAX_FORWARD_DELAY, 15,
+	                                                             TRUE, TRUE, TRUE},
+	{ NM_SETTING_BRIDGE_HELLO_TIME,                              "hello_time",
+	                                                             NULL, NULL,
+	                                                             0, NM_BR_MAX_HELLO_TIME, 2,
+	                                                             TRUE, TRUE, TRUE },
+	{ NM_SETTING_BRIDGE_MAX_AGE,                                 "max_age",
+	                                                             NULL, NULL,
+	                                                             0, NM_BR_MAX_MAX_AGE, 20,
+	                                                             TRUE, TRUE, TRUE },
+	{ NM_SETTING_BRIDGE_AGEING_TIME,                             "ageing_time",
+	                                                             NULL, NULL,
+	                                                             NM_BR_MIN_AGEING_TIME, NM_BR_MAX_AGEING_TIME, 300,
+	                                                             TRUE, TRUE, FALSE },
+	{ NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,                      "group_fwd_mask",
+	                                                             NULL, NULL,
+	                                                             0, 0xFFFF, 0,
+	                                                             TRUE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,                      "hash_max",
+	                                                             NULL, NULL,
+	                                                             NM_BR_MIN_MULTICAST_HASH_MAX, NM_BR_MAX_MULTICAST_HASH_MAX, 4096,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,             "multicast_last_member_count",
+	                                                             NULL, NULL,
+	                                                             0, G_MAXUINT32, 2,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL,          "multicast_last_member_interval",
+	                                                             NULL, NULL,
+	                                                             0, G_MAXUINT64, 100,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL,           "multicast_membership_interval",
+	                                                             NULL, NULL,
+	                                                             0, G_MAXUINT64, 26000,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER,                       "multicast_querier",
+	                                                             NULL, NULL,
+	                                                             0, 1, 0,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL,              "multicast_querier_interval",
+	                                                             NULL, NULL,
+	                                                             0, G_MAXUINT64, 25500,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL,                "multicast_query_interval",
+	                                                             NULL, NULL,
+	                                                             0, G_MAXUINT64, 12500,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL,       "multicast_query_response_interval",
+	                                                             NULL, NULL,
+	                                                             0, G_MAXUINT64, 1000,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,              "multicast_query_use_ifaddr",
+	                                                             NULL, NULL,
+	                                                             0, 1, 0,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_SNOOPING,                      "multicast_snooping",
+	                                                             NULL, NULL,
+	                                                             0, 1, 1,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_ROUTER,                        "multicast_router",
+	                                                             to_sysfs_multicast_router, from_sysfs_multicast_router,
+	                                                             0, 0, 0,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_GROUP_ADDRESS,                           "group_addr",
+	                                                             to_sysfs_group_address, from_sysfs_group_address,
+	                                                             0, 0, 0,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_VLAN_PROTOCOL,                           "vlan_protocol",
+	                                                             to_sysfs_vlan_protocol, from_sysfs_vlan_protocol,
+	                                                             0, 0, 0,
+	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,                      "vlan_stats_enabled",
+	                                                             NULL, NULL,
+	                                                             0, 1, 0,
+	                                                             FALSE, FALSE, FALSE },
 	{ NULL, NULL }
 };
 
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index e063a44313..e4503acb94 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -5157,30 +5157,31 @@ handle_bridge_option (NMSetting *setting,
 		gboolean only_with_stp;
 		gboolean extended_bool;
 	} m/*etadata*/[] = {
-		{ "DELAY",                          NM_SETTING_BRIDGE_FORWARD_DELAY,                  BRIDGE_OPT_TYPE_MAIN,        .only_with_stp = TRUE },
-		{ "priority",                       NM_SETTING_BRIDGE_PRIORITY,                       BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
-		{ "hello_time",                     NM_SETTING_BRIDGE_HELLO_TIME,                     BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
-		{ "max_age",                        NM_SETTING_BRIDGE_MAX_AGE,                        BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
-		{ "ageing_time",                    NM_SETTING_BRIDGE_AGEING_TIME,                    BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_last_member_count",    NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,    BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_last_member_interval", NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL, BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_membership_interval",  NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL,  BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_hash_max",             NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,             BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_querier",              NM_SETTING_BRIDGE_MULTICAST_QUERIER,              BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_querier_interval",     NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL,     BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_query_interval",       NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL,       BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_query_use_ifaddr",     NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,     BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_snooping",             NM_SETTING_BRIDGE_MULTICAST_SNOOPING,             BRIDGE_OPT_TYPE_OPTION },
-		{ "multicast_router",               NM_SETTING_BRIDGE_MULTICAST_ROUTER,               BRIDGE_OPT_TYPE_OPTION },
-		{ "vlan_filtering",                 NM_SETTING_BRIDGE_VLAN_FILTERING,                 BRIDGE_OPT_TYPE_OPTION },
-		{ "default_pvid",                   NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID,              BRIDGE_OPT_TYPE_OPTION },
-		{ "group_address",                  NM_SETTING_BRIDGE_GROUP_ADDRESS,                  BRIDGE_OPT_TYPE_OPTION },
-		{ "group_fwd_mask",                 NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,             BRIDGE_OPT_TYPE_OPTION },
-		{ "vlan_protocol",                  NM_SETTING_BRIDGE_VLAN_PROTOCOL,                  BRIDGE_OPT_TYPE_OPTION },
-		{ "vlan_stats_enabled",             NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,             BRIDGE_OPT_TYPE_OPTION },
-		{ "priority",                       NM_SETTING_BRIDGE_PORT_PRIORITY,                  BRIDGE_OPT_TYPE_PORT_OPTION },
-		{ "path_cost",                      NM_SETTING_BRIDGE_PORT_PATH_COST,                 BRIDGE_OPT_TYPE_PORT_OPTION },
-		{ "hairpin_mode",                   NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE,              BRIDGE_OPT_TYPE_PORT_OPTION, .extended_bool = TRUE, },
+		{ "DELAY",                             NM_SETTING_BRIDGE_FORWARD_DELAY,                     BRIDGE_OPT_TYPE_MAIN,        .only_with_stp = TRUE },
+		{ "priority",                          NM_SETTING_BRIDGE_PRIORITY,                          BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
+		{ "hello_time",                        NM_SETTING_BRIDGE_HELLO_TIME,                        BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
+		{ "max_age",                           NM_SETTING_BRIDGE_MAX_AGE,                           BRIDGE_OPT_TYPE_OPTION,      .only_with_stp = TRUE },
+		{ "ageing_time",                       NM_SETTING_BRIDGE_AGEING_TIME,                       BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_last_member_count",       NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,       BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_last_member_interval",    NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL,    BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_membership_interval",     NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL,     BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_hash_max",                NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,                BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_querier",                 NM_SETTING_BRIDGE_MULTICAST_QUERIER,                 BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_querier_interval",        NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL,        BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_query_interval",          NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL,          BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_query_response_interval", NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL, BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_query_use_ifaddr",        NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,        BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_snooping",                NM_SETTING_BRIDGE_MULTICAST_SNOOPING,                BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_router",                  NM_SETTING_BRIDGE_MULTICAST_ROUTER,                  BRIDGE_OPT_TYPE_OPTION },
+		{ "vlan_filtering",                    NM_SETTING_BRIDGE_VLAN_FILTERING,                    BRIDGE_OPT_TYPE_OPTION },
+		{ "default_pvid",                      NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID,                 BRIDGE_OPT_TYPE_OPTION },
+		{ "group_address",                     NM_SETTING_BRIDGE_GROUP_ADDRESS,                     BRIDGE_OPT_TYPE_OPTION },
+		{ "group_fwd_mask",                    NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,                BRIDGE_OPT_TYPE_OPTION },
+		{ "vlan_protocol",                     NM_SETTING_BRIDGE_VLAN_PROTOCOL,                     BRIDGE_OPT_TYPE_OPTION },
+		{ "vlan_stats_enabled",                NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,                BRIDGE_OPT_TYPE_OPTION },
+		{ "priority",                          NM_SETTING_BRIDGE_PORT_PRIORITY,                     BRIDGE_OPT_TYPE_PORT_OPTION },
+		{ "path_cost",                         NM_SETTING_BRIDGE_PORT_PATH_COST,                    BRIDGE_OPT_TYPE_PORT_OPTION },
+		{ "hairpin_mode",                      NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE,                 BRIDGE_OPT_TYPE_PORT_OPTION, .extended_bool = TRUE, },
 	};
 	const char *error_message = NULL;
 	int i;
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index fb19ae1ac1..234d459847 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1569,6 +1569,13 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "multicast_query_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
+	u64 = nm_setting_bridge_get_multicast_query_response_interval (s_bridge);
+	if (u64 != get_setting_default_uint64 (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL)) {
+		if (opts->len)
+			g_string_append_c (opts, ' ');
+		g_string_append_printf (opts, "multicast_query_response_interval=%"G_GUINT64_FORMAT, u64);
+	}
+
 	b = nm_setting_bridge_get_multicast_query_use_ifaddr (s_bridge);
 	if (b != get_setting_default_boolean (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR)) {
 		if (opts->len)

From abe660f780910e64d0d6d49794496e109d6c3033 Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Tue, 21 Apr 2020 17:35:51 +0200
Subject: [PATCH 121/222] nm-setting-bridge: add
 'multicast-startup-query-count' bridge option

https://bugzilla.redhat.com/show_bug.cgi?id=1755768
---
 clients/common/nm-meta-setting-desc.c         |  4 ++
 clients/common/settings-docs.h.in             |  1 +
 libnm-core/nm-setting-bridge.c                | 47 +++++++++++++++++++
 libnm-core/nm-setting-bridge.h                |  4 ++
 libnm/libnm.ver                               |  1 +
 src/devices/nm-device-bridge.c                |  4 ++
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |  1 +
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    |  7 +++
 8 files changed, 69 insertions(+)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 1ce67e6605..9c4dfb0bc4 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -4981,6 +4981,10 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	    .prompt =                       N_("Enable IGMP snooping [no]"),
 	    .property_type =                &_pt_gobject_bool,
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT,
+	    .property_type =                &_pt_gobject_int,
+	    .hide_if_default =              TRUE,
+	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_ROUTER,
 	    .property_type =                &_pt_gobject_string,
 	    .hide_if_default =              TRUE,
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index a016f6c2c1..eff2c94f02 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -130,6 +130,7 @@
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR N_("If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_ROUTER N_("Sets bridge's multicast router. multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not specified the default value is 'auto'.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_SNOOPING N_("Controls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.")
+#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT N_("Set the number of IGMP queries to send during startup phase.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_PRIORITY N_("Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are \"better\"; the lowest priority bridge will be elected the root bridge.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_STP N_("Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID N_("The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames.")
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 39d53340b7..40e87e62c5 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -36,6 +36,7 @@
 #define BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT   1000
 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
 #define BRIDGE_MULTICAST_SNOOPING_DEFAULT                  TRUE
+#define BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT       2
 #define BRIDGE_PRIORITY_DEFAULT                            0x8000
 #define BRIDGE_STP_DEFAULT                                 TRUE
 #define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT                   1
@@ -64,6 +65,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBridge,
 	PROP_MULTICAST_QUERY_RESPONSE_INTERVAL,
 	PROP_MULTICAST_QUERY_USE_IFADDR,
 	PROP_MULTICAST_SNOOPING,
+	PROP_MULTICAST_STARTUP_QUERY_COUNT,
 	PROP_VLAN_FILTERING,
 	PROP_VLAN_DEFAULT_PVID,
 	PROP_VLAN_PROTOCOL,
@@ -85,6 +87,7 @@ typedef struct {
 	guint32  ageing_time;
 	guint32  multicast_hash_max;
 	guint32  multicast_last_member_count;
+	guint32  multicast_startup_query_count;
 	guint16  priority;
 	guint16  forward_delay;
 	guint16  hello_time;
@@ -1143,6 +1146,22 @@ nm_setting_bridge_get_multicast_query_response_interval (const NMSettingBridge *
 	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_query_response_interval;
 }
 
+/**
+ * nm_setting_bridge_get_multicast_startup_query_count:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:multicast-query-response-interval property of the setting
+ *
+ * Since 1.26
+ **/
+guint32
+nm_setting_bridge_get_multicast_startup_query_count (const NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_startup_query_count;
+}
+
 /*****************************************************************************/
 
 static gboolean
@@ -1411,6 +1430,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_QUERY_USE_IFADDR:
 		g_value_set_boolean (value, priv->multicast_query_use_ifaddr);
 		break;
+	case PROP_MULTICAST_STARTUP_QUERY_COUNT:
+		g_value_set_uint (value, priv->multicast_startup_query_count);
+		break;
 	case PROP_VLAN_FILTERING:
 		g_value_set_boolean (value, priv->vlan_filtering);
 		break;
@@ -1506,6 +1528,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_QUERY_USE_IFADDR:
 		priv->multicast_query_use_ifaddr = g_value_get_boolean (value);
 		break;
+	case PROP_MULTICAST_STARTUP_QUERY_COUNT:
+		priv->multicast_startup_query_count = g_value_get_uint (value);
+		break;
 	case PROP_VLAN_FILTERING:
 		priv->vlan_filtering = g_value_get_boolean (value);
 		break;
@@ -1558,6 +1583,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->multicast_query_use_ifaddr        = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
 	priv->multicast_querier                 = BRIDGE_MULTICAST_QUERIER_DEFAULT;
 	priv->multicast_querier_interval        = BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT;
+	priv->multicast_startup_query_count     = BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT;
 }
 
 /**
@@ -2190,6 +2216,27 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	                         NM_SETTING_PARAM_INFERRABLE |
 	                         G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingBridge:multicast-startup-query-count:
+	 *
+	 * Set the number of IGMP queries to send during startup phase.
+	 **/
+	/* ---ifcfg-rh---
+	 * property: multicast-startup-query-count
+	 * variable: BRIDGING_OPTS: multicast_startup_query_count=
+	 * default: 2
+	 * example: BRIDGING_OPTS="multicast_startup_query_count=4"
+	 * ---end---
+	 *
+	 * Since: 1.26
+	 */
+	obj_properties[PROP_MULTICAST_STARTUP_QUERY_COUNT] =
+	    g_param_spec_uint (NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT, "", "",
+	                       0, G_MAXUINT32, BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT,
+	                       G_PARAM_READWRITE |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE,
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index 136ed0bdda..13b0f762e0 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -42,6 +42,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL          "multicast-query-interval"
 #define NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL "multicast-query-response-interval"
 #define NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR        "multicast-query-use-ifaddr"
+#define NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT     "multicast-startup-query-count"
 #define NM_SETTING_BRIDGE_VLAN_FILTERING                    "vlan-filtering"
 #define NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID                 "vlan-default-pvid"
 #define NM_SETTING_BRIDGE_VLANS                             "vlans"
@@ -168,6 +169,9 @@ guint64 nm_setting_bridge_get_multicast_query_interval (const NMSettingBridge *s
 NM_AVAILABLE_IN_1_26
 guint64 nm_setting_bridge_get_multicast_query_response_interval (const NMSettingBridge *setting);
 
+NM_AVAILABLE_IN_1_26
+guint32 nm_setting_bridge_get_multicast_startup_query_count (const NMSettingBridge *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_BRIDGE_H__ */
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 39d36ef141..66e11d31e5 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1705,5 +1705,6 @@ global:
 	nm_setting_bridge_get_multicast_querier_interval;
 	nm_setting_bridge_get_multicast_query_interval;
 	nm_setting_bridge_get_multicast_query_response_interval;
+	nm_setting_bridge_get_multicast_startup_query_count;
 	nm_setting_connection_get_mud_url;
 } libnm_1_24_0;
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 34b5ab7176..fb5b3d6171 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -318,6 +318,10 @@ static const Option master_options[] = {
 	                                                             to_sysfs_multicast_router, from_sysfs_multicast_router,
 	                                                             0, 0, 0,
 	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT,           "multicast_startup_query_count",
+	                                                             NULL, NULL,
+	                                                             0, G_MAXUINT32, 2,
+	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_GROUP_ADDRESS,                           "group_addr",
 	                                                             to_sysfs_group_address, from_sysfs_group_address,
 	                                                             0, 0, 0,
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index e4503acb94..f3deca1891 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -5173,6 +5173,7 @@ handle_bridge_option (NMSetting *setting,
 		{ "multicast_query_use_ifaddr",        NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,        BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_snooping",                NM_SETTING_BRIDGE_MULTICAST_SNOOPING,                BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_router",                  NM_SETTING_BRIDGE_MULTICAST_ROUTER,                  BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_startup_query_count",     NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT,     BRIDGE_OPT_TYPE_OPTION },
 		{ "vlan_filtering",                    NM_SETTING_BRIDGE_VLAN_FILTERING,                    BRIDGE_OPT_TYPE_OPTION },
 		{ "default_pvid",                      NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID,                 BRIDGE_OPT_TYPE_OPTION },
 		{ "group_address",                     NM_SETTING_BRIDGE_GROUP_ADDRESS,                     BRIDGE_OPT_TYPE_OPTION },
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 234d459847..d2bdb21376 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1590,6 +1590,13 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "multicast_snooping=%u", (guint32) b);
 	}
 
+	i = nm_setting_bridge_get_multicast_startup_query_count (s_bridge);
+	if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT)) {
+		if (opts->len)
+			g_string_append_c (opts, ' ');
+		g_string_append_printf (opts, "multicast_startup_query_count=%u", i);
+	}
+
 	s = nm_setting_bridge_get_multicast_router (s_bridge);
 	if (s) {
 		if (opts->len)

From 05d9381060dca9fcac5f6bac5498fd584a9ae1f1 Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Tue, 21 Apr 2020 17:35:51 +0200
Subject: [PATCH 122/222] nm-setting-bridge: add
 'multicast-startup-query-interval' bridge option

https://bugzilla.redhat.com/show_bug.cgi?id=1755768
---
 clients/common/nm-meta-setting-desc.c         |  4 ++
 clients/common/settings-docs.h.in             |  1 +
 libnm-core/nm-setting-bridge.c                | 48 +++++++++++++++++++
 libnm-core/nm-setting-bridge.h                |  4 ++
 libnm/libnm.ver                               |  1 +
 src/devices/nm-device-bridge.c                |  4 ++
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |  1 +
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    |  7 +++
 8 files changed, 70 insertions(+)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 9c4dfb0bc4..d2082fdaee 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -4985,6 +4985,10 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	    .property_type =                &_pt_gobject_int,
 	    .hide_if_default =              TRUE,
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL,
+	    .property_type =                &_pt_gobject_int,
+	    .hide_if_default =              TRUE,
+	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_ROUTER,
 	    .property_type =                &_pt_gobject_string,
 	    .hide_if_default =              TRUE,
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index eff2c94f02..8b3c964919 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -131,6 +131,7 @@
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_ROUTER N_("Sets bridge's multicast router. multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not specified the default value is 'auto'.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_SNOOPING N_("Controls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT N_("Set the number of IGMP queries to send during startup phase.")
+#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL N_("Sets the time (in deciseconds) between queries sent out at startup to determine membership information.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_PRIORITY N_("Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are \"better\"; the lowest priority bridge will be elected the root bridge.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_STP N_("Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.")
 #define DESCRIBE_DOC_NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID N_("The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames.")
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 40e87e62c5..2b6d1ef5d5 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -37,6 +37,7 @@
 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
 #define BRIDGE_MULTICAST_SNOOPING_DEFAULT                  TRUE
 #define BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT       2
+#define BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT    3125
 #define BRIDGE_PRIORITY_DEFAULT                            0x8000
 #define BRIDGE_STP_DEFAULT                                 TRUE
 #define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT                   1
@@ -66,6 +67,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBridge,
 	PROP_MULTICAST_QUERY_USE_IFADDR,
 	PROP_MULTICAST_SNOOPING,
 	PROP_MULTICAST_STARTUP_QUERY_COUNT,
+	PROP_MULTICAST_STARTUP_QUERY_INTERVAL,
 	PROP_VLAN_FILTERING,
 	PROP_VLAN_DEFAULT_PVID,
 	PROP_VLAN_PROTOCOL,
@@ -84,6 +86,7 @@ typedef struct {
 	guint64  multicast_querier_interval;
 	guint64  multicast_query_interval;
 	guint64  multicast_query_response_interval;
+	guint64  multicast_startup_query_interval;
 	guint32  ageing_time;
 	guint32  multicast_hash_max;
 	guint32  multicast_last_member_count;
@@ -1162,6 +1165,22 @@ nm_setting_bridge_get_multicast_startup_query_count (const NMSettingBridge *sett
 	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_startup_query_count;
 }
 
+/**
+ * nm_setting_bridge_get_multicast_startup_query_interval:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:multicast-startup-query-interval property of the setting
+ *
+ * Since 1.26
+ **/
+guint64
+nm_setting_bridge_get_multicast_startup_query_interval (const NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_startup_query_interval;
+}
+
 /*****************************************************************************/
 
 static gboolean
@@ -1433,6 +1452,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_STARTUP_QUERY_COUNT:
 		g_value_set_uint (value, priv->multicast_startup_query_count);
 		break;
+	case PROP_MULTICAST_STARTUP_QUERY_INTERVAL:
+		g_value_set_uint64 (value, priv->multicast_startup_query_interval);
+		break;
 	case PROP_VLAN_FILTERING:
 		g_value_set_boolean (value, priv->vlan_filtering);
 		break;
@@ -1531,6 +1553,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_STARTUP_QUERY_COUNT:
 		priv->multicast_startup_query_count = g_value_get_uint (value);
 		break;
+	case PROP_MULTICAST_STARTUP_QUERY_INTERVAL:
+		priv->multicast_startup_query_interval = g_value_get_uint64 (value);
+		break;
 	case PROP_VLAN_FILTERING:
 		priv->vlan_filtering = g_value_get_boolean (value);
 		break;
@@ -1584,6 +1609,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->multicast_querier                 = BRIDGE_MULTICAST_QUERIER_DEFAULT;
 	priv->multicast_querier_interval        = BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT;
 	priv->multicast_startup_query_count     = BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT;
+	priv->multicast_startup_query_interval  = BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT;
 }
 
 /**
@@ -2237,6 +2263,28 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingBridge:multicast-startup-query-interval:
+	 *
+	 * Sets the time (in deciseconds) between queries sent out
+	 * at startup to determine membership information.
+	 **/
+	/* ---ifcfg-rh---
+	 * property: multicast-startup-query-interval
+	 * variable: BRIDGING_OPTS: multicast_startup_query_interval=
+	 * default: 3125
+	 * example: BRIDGING_OPTS="multicast_startup_query_interval=4000"
+	 * ---end---
+	 *
+	 * Since: 1.26
+	 */
+	obj_properties[PROP_MULTICAST_STARTUP_QUERY_INTERVAL] =
+	    g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL, "", "",
+	                         0, G_MAXUINT64, BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE,
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index 13b0f762e0..5f0ef0b321 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -43,6 +43,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL "multicast-query-response-interval"
 #define NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR        "multicast-query-use-ifaddr"
 #define NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT     "multicast-startup-query-count"
+#define NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL  "multicast-startup-query-interval"
 #define NM_SETTING_BRIDGE_VLAN_FILTERING                    "vlan-filtering"
 #define NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID                 "vlan-default-pvid"
 #define NM_SETTING_BRIDGE_VLANS                             "vlans"
@@ -172,6 +173,9 @@ guint64 nm_setting_bridge_get_multicast_query_response_interval (const NMSetting
 NM_AVAILABLE_IN_1_26
 guint32 nm_setting_bridge_get_multicast_startup_query_count (const NMSettingBridge *setting);
 
+NM_AVAILABLE_IN_1_26
+guint64 nm_setting_bridge_get_multicast_startup_query_interval (const NMSettingBridge *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_BRIDGE_H__ */
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 66e11d31e5..b691becb13 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1706,5 +1706,6 @@ global:
 	nm_setting_bridge_get_multicast_query_interval;
 	nm_setting_bridge_get_multicast_query_response_interval;
 	nm_setting_bridge_get_multicast_startup_query_count;
+	nm_setting_bridge_get_multicast_startup_query_interval;
 	nm_setting_connection_get_mud_url;
 } libnm_1_24_0;
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index fb5b3d6171..1727eb8c67 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -322,6 +322,10 @@ static const Option master_options[] = {
 	                                                             NULL, NULL,
 	                                                             0, G_MAXUINT32, 2,
 	                                                             FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL,        "multicast_startup_query_interval",
+	                                                             NULL, NULL,
+	                                                             0, G_MAXUINT64, 3125,
+	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_GROUP_ADDRESS,                           "group_addr",
 	                                                             to_sysfs_group_address, from_sysfs_group_address,
 	                                                             0, 0, 0,
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index f3deca1891..d8b4d79bb7 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -5174,6 +5174,7 @@ handle_bridge_option (NMSetting *setting,
 		{ "multicast_snooping",                NM_SETTING_BRIDGE_MULTICAST_SNOOPING,                BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_router",                  NM_SETTING_BRIDGE_MULTICAST_ROUTER,                  BRIDGE_OPT_TYPE_OPTION },
 		{ "multicast_startup_query_count",     NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT,     BRIDGE_OPT_TYPE_OPTION },
+		{ "multicast_startup_query_interval",  NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL,  BRIDGE_OPT_TYPE_OPTION },
 		{ "vlan_filtering",                    NM_SETTING_BRIDGE_VLAN_FILTERING,                    BRIDGE_OPT_TYPE_OPTION },
 		{ "default_pvid",                      NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID,                 BRIDGE_OPT_TYPE_OPTION },
 		{ "group_address",                     NM_SETTING_BRIDGE_GROUP_ADDRESS,                     BRIDGE_OPT_TYPE_OPTION },
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index d2bdb21376..a9bc091655 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1597,6 +1597,13 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "multicast_startup_query_count=%u", i);
 	}
 
+	u64 = nm_setting_bridge_get_multicast_startup_query_interval (s_bridge);
+	if (u64 != get_setting_default_uint64 (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL)) {
+		if (opts->len)
+			g_string_append_c (opts, ' ');
+		g_string_append_printf (opts, "multicast_startup_query_interval=%"G_GUINT64_FORMAT, u64);
+	}
+
 	s = nm_setting_bridge_get_multicast_router (s_bridge);
 	if (s) {
 		if (opts->len)

From 05fd2a9272faf8a57116d1624e1a32b4aa9f2994 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 29 Apr 2020 22:07:47 +0200
Subject: [PATCH 123/222] device: fix scope of variable in commit_option()

---
 src/devices/nm-device-bridge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 1727eb8c67..4ca3b5b043 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -364,6 +364,7 @@ commit_option (NMDevice *device, NMSetting *setting, const Option *option, gbool
 	nm_auto_unset_gvalue GValue val = G_VALUE_INIT;
 	GParamSpec *pspec;
 	const char *value;
+	char value_buf[100];
 
 	if (slave)
 		nm_assert (NM_IS_SETTING_BRIDGE_PORT (setting));
@@ -387,7 +388,6 @@ commit_option (NMDevice *device, NMSetting *setting, const Option *option, gbool
 		break;
 	case G_TYPE_UINT64:
 	case G_TYPE_UINT: {
-			char value_buf[100];
 			guint64 uval;
 
 			if (pspec->value_type == G_TYPE_UINT64)

From f14cc584d5f7448e7c5b798ba990795cb6f59b89 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Mon, 4 May 2020 10:02:16 +0200
Subject: [PATCH 124/222] initrd: add command line option to specify initrd
 data directory

---
 man/nm-initrd-generator.xml      | 14 ++++++++++++++
 src/initrd/nm-initrd-generator.c | 20 +++++++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml
index df2cf12a4b..c3594a4e2a 100644
--- a/man/nm-initrd-generator.xml
+++ b/man/nm-initrd-generator.xml
@@ -74,6 +74,20 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>
+          <group choice='plain'>
+            <arg choice='plain'><option>-i</option></arg>
+            <arg choice='plain'><option>--initrd-data-dir</option></arg>
+          </group>
+          <arg choice='plain'><replaceable>path</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Output directory for initrd data (e.g. hostname).</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>
           <group choice='plain'>
diff --git a/src/initrd/nm-initrd-generator.c b/src/initrd/nm-initrd-generator.c
index dccb21f87f..974213ba17 100644
--- a/src/initrd/nm-initrd-generator.c
+++ b/src/initrd/nm-initrd-generator.c
@@ -64,24 +64,27 @@ err_out:
 }
 
 #define DEFAULT_SYSFS_DIR        "/sys"
+#define DEFAULT_INITRD_DATA_DIR  NMRUNDIR "/initrd"
 
 int
 main (int argc, char *argv[])
 {
 	GHashTable *connections;
 	gs_free char *connections_dir = NULL;
+	gs_free char *initrd_dir = NULL;
 	gs_free char *sysfs_dir = NULL;
 	gboolean dump_to_stdout = FALSE;
 	gs_strfreev char **remaining = NULL;
 	GOptionEntry option_entries[] = {
-		{ "connections-dir", 'c', 0, G_OPTION_ARG_FILENAME, &connections_dir, "Output connection directory", NM_KEYFILE_PATH_NAME_RUN },
-		{ "sysfs-dir", 'd', 0, G_OPTION_ARG_FILENAME, &sysfs_dir, "The sysfs mount point", DEFAULT_SYSFS_DIR },
-		{ "stdout", 's', 0, G_OPTION_ARG_NONE, &dump_to_stdout, "Dump connections to standard output", NULL },
-		{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &remaining, NULL, NULL },
+		{ "connections-dir",  'c',  0, G_OPTION_ARG_FILENAME,     &connections_dir, "Output connection directory",         NM_KEYFILE_PATH_NAME_RUN },
+		{ "initrd-data-dir",  'i',  0, G_OPTION_ARG_FILENAME,     &initrd_dir,      "Output initrd data directory",        DEFAULT_INITRD_DATA_DIR },
+		{ "sysfs-dir",        'd',  0, G_OPTION_ARG_FILENAME,     &sysfs_dir,       "The sysfs mount point",               DEFAULT_SYSFS_DIR },
+		{ "stdout",           's',  0, G_OPTION_ARG_NONE,         &dump_to_stdout,  "Dump connections to standard output", NULL },
+		{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &remaining,       NULL,                                  NULL },
 		{ NULL }
 	};
 	GOptionContext *option_context;
-	GError *error = NULL;
+	gs_free_error GError *error = NULL;
 	int errsv;
 
 	option_context = g_option_context_new ("-- [ip=...] [rd.route=...] [bridge=...] [bond=...] [team=...] [vlan=...] "
@@ -108,6 +111,8 @@ main (int argc, char *argv[])
 		connections_dir = g_strdup (NM_KEYFILE_PATH_NAME_RUN);
 	if (!sysfs_dir)
 		sysfs_dir = g_strdup (DEFAULT_SYSFS_DIR);
+	if (!initrd_dir)
+		initrd_dir = g_strdup (DEFAULT_INITRD_DATA_DIR);
 	if (dump_to_stdout)
 		nm_clear_g_free (&connections_dir);
 
@@ -121,5 +126,10 @@ main (int argc, char *argv[])
 	g_hash_table_foreach (connections, output_conn, connections_dir);
 	g_hash_table_destroy (connections);
 
+	if (g_mkdir_with_parents (initrd_dir, 0755) != 0) {
+		errsv = errno;
+		_LOGW (LOGD_CORE, "%s: %s", initrd_dir, nm_strerror_native (errsv));
+		return 1;
+	}
 	return 0;
 }

From ff70adf873efb698d57c0990811dad66bdaacf79 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Mon, 4 May 2020 10:03:21 +0200
Subject: [PATCH 125/222] initrd: save hostname to a file in /run

Save the hostname read from command line to a file in /run so that it
can be applied later by the NM dracut module.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/419
---
 src/initrd/nm-initrd-generator.c       | 20 +++++-
 src/initrd/nm-initrd-generator.h       |  2 +-
 src/initrd/nmi-cmdline-reader.c        | 16 ++++-
 src/initrd/tests/test-cmdline-reader.c | 97 +++++++++++++++++++-------
 4 files changed, 108 insertions(+), 27 deletions(-)

diff --git a/src/initrd/nm-initrd-generator.c b/src/initrd/nm-initrd-generator.c
index 974213ba17..a04ffb7d4f 100644
--- a/src/initrd/nm-initrd-generator.c
+++ b/src/initrd/nm-initrd-generator.c
@@ -85,6 +85,7 @@ main (int argc, char *argv[])
 	};
 	GOptionContext *option_context;
 	gs_free_error GError *error = NULL;
+	gs_free char *hostname = NULL;
 	int errsv;
 
 	option_context = g_option_context_new ("-- [ip=...] [rd.route=...] [bridge=...] [bond=...] [team=...] [vlan=...] "
@@ -122,7 +123,10 @@ main (int argc, char *argv[])
 		return 1;
 	}
 
-	connections = nmi_cmdline_reader_parse (sysfs_dir, (const char *const*) remaining);
+	connections = nmi_cmdline_reader_parse (sysfs_dir,
+	                                        (const char *const*) remaining,
+	                                        &hostname);
+
 	g_hash_table_foreach (connections, output_conn, connections_dir);
 	g_hash_table_destroy (connections);
 
@@ -131,5 +135,19 @@ main (int argc, char *argv[])
 		_LOGW (LOGD_CORE, "%s: %s", initrd_dir, nm_strerror_native (errsv));
 		return 1;
 	}
+
+	if (hostname) {
+		gs_free char *hostname_file = NULL;
+		gs_free char *data = NULL;
+
+		hostname_file = g_strdup_printf ("%s/hostname", initrd_dir);
+		data = g_strdup_printf ("%s\n", hostname);
+
+		if (!g_file_set_contents (hostname_file, data, strlen (data), &error)) {
+			_LOGW (LOGD_CORE, "%s: %s", hostname_file, error->message);
+			return 1;
+		}
+	}
+
 	return 0;
 }
diff --git a/src/initrd/nm-initrd-generator.h b/src/initrd/nm-initrd-generator.h
index cba383d1e0..9719992125 100644
--- a/src/initrd/nm-initrd-generator.h
+++ b/src/initrd/nm-initrd-generator.h
@@ -28,6 +28,6 @@ gboolean nmi_ibft_update_connection_from_nic (NMConnection *connection, GHashTab
 
 NMConnection *nmi_dt_reader_parse (const char *sysfs_dir);
 
-GHashTable *nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv);
+GHashTable *nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv, char **hostname);
 
 #endif  /* __NM_INITRD_GENERATOR_H__ */
diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
index 2eb6d7e5be..cf8cddc392 100644
--- a/src/initrd/nmi-cmdline-reader.c
+++ b/src/initrd/nmi-cmdline-reader.c
@@ -7,6 +7,7 @@
 
 #include "nm-core-internal.h"
 #include "nm-initrd-generator.h"
+#include "systemd/nm-sd-utils-shared.h"
 
 /*****************************************************************************/
 
@@ -22,6 +23,7 @@ typedef struct {
 	GPtrArray *array;
 	NMConnection *bootdev_connection;   /* connection for bootdev=$ifname */
 	NMConnection *default_connection;   /* connection not bound to any ifname */
+	char *hostname;
 } Reader;
 
 static Reader *
@@ -45,6 +47,7 @@ reader_destroy (Reader *reader, gboolean free_hash)
 
 	g_ptr_array_unref (reader->array);
 	hash = g_steal_pointer (&reader->hash);
+	nm_clear_g_free (&reader->hostname);
 	nm_g_slice_free (reader);
 	if (!free_hash)
 		return g_steal_pointer (&hash);
@@ -345,6 +348,14 @@ reader_parse_ip (Reader *reader, const char *sysfs_dir, char *argument)
 			ifname = tmp;
 		}
 
+		if (client_hostname && !nm_sd_hostname_is_valid (client_hostname, FALSE))
+			client_hostname = NULL;
+
+		if (client_hostname) {
+			g_free (reader->hostname);
+			reader->hostname = g_strdup (client_hostname);
+		}
+
 		/* <ifname>:{none|off|dhcp|on|any|dhcp6|auto6|ibft} */
 
 		kind = get_word (&argument, ':');
@@ -875,7 +886,7 @@ reader_add_nameservers (Reader *reader, GPtrArray *nameservers)
 }
 
 GHashTable *
-nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv)
+nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv, char **hostname)
 {
 	Reader *reader;
 	const char *tag;
@@ -1013,5 +1024,8 @@ nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv)
 		reader_set_ignore_auto_dns (reader);
 
 	g_hash_table_foreach (reader->hash, _normalize_conn, NULL);
+
+	NM_SET_OUT (hostname, g_steal_pointer (&reader->hostname));
+
 	return reader_destroy (reader, FALSE);
 }
diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
index b2b06e27c3..65f279a92f 100644
--- a/src/initrd/tests/test-cmdline-reader.c
+++ b/src/initrd/tests/test-cmdline-reader.c
@@ -30,10 +30,12 @@ test_auto (void)
 	NMSettingWired *s_wired;
 	NMSettingIPConfig *s_ip4;
 	NMSettingIPConfig *s_ip6;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "default_connection");
 	g_assert (connection);
@@ -81,10 +83,12 @@ test_if_auto_with_mtu (void)
 	NMSettingWired *s_wired;
 	NMSettingIPConfig *s_ip4;
 	NMSettingIPConfig *s_ip6;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "eth0");
 	g_assert (connection);
@@ -115,10 +119,13 @@ test_if_dhcp6 (void)
 	NMConnection *connection;
 	NMSettingIPConfig *s_ip4;
 	NMSettingIPConfig *s_ip6;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
+	g_assert_cmpstr (hostname, ==, NULL);
+
 	connection = g_hash_table_lookup (connections, "eth1");
 	g_assert (connection);
 	nmtst_assert_connection_verifies_without_normalization (connection);
@@ -145,10 +152,12 @@ test_if_auto_with_mtu_and_mac (void)
 	NMSettingWired *s_wired;
 	NMSettingIPConfig *s_ip4;
 	NMSettingIPConfig *s_ip6;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "eth2");
 	g_assert (connection);
@@ -183,10 +192,12 @@ test_if_ip4_manual (void)
 	NMConnection *connection;
 	NMSettingIPConfig *s_ip4;
 	NMIPAddress *ip_addr;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
+	g_assert_cmpstr (hostname, ==, "hostname1.example.com");
 
 	connection = g_hash_table_lookup (connections, "eth3");
 	g_assert (connection);
@@ -237,10 +248,12 @@ test_if_ip6_manual (void)
 	NMConnection *connection;
 	NMSettingIPConfig *s_ip6;
 	NMIPAddress *ip_addr;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
+	g_assert_cmpstr (hostname, ==, "hostname0.example.com");
 
 	connection = g_hash_table_lookup (connections, "eth4");
 	g_assert (connection);
@@ -274,10 +287,12 @@ test_multiple_merge (void)
 	NMSettingIPConfig *s_ip4;
 	NMSettingIPConfig *s_ip6;
 	NMIPAddress *ip_addr;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "eth0");
 	g_assert (connection);
@@ -317,10 +332,12 @@ test_multiple_bootdev (void)
 	NMConnection *connection;
 	NMSettingIPConfig *s_ip4;
 	NMSettingIPConfig *s_ip6;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "eth3");
 	g_assert (connection);
@@ -344,10 +361,12 @@ test_bootdev (void)
 	const char *const*ARGV = NM_MAKE_STRV ("vlan=vlan2:ens5", "bootdev=ens3");
 	NMConnection *connection;
 	NMSettingConnection *s_con;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "ens3");
 	g_assert (connection);
@@ -384,10 +403,12 @@ test_some_more (void)
 	NMSettingIPConfig *s_ip4;
 	NMSettingIPConfig *s_ip6;
 	NMIPRoute *ip_route;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "eth1");
 	g_assert (connection);
@@ -466,10 +487,12 @@ test_bond (void)
 	NMSettingBond *s_bond;
 	NMIPRoute *ip_route;
 	const char *master_uuid;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 3);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "bong0");
 	g_assert (connection);
@@ -545,10 +568,12 @@ test_bond_default (void)
 	NMSettingIPConfig *s_ip6;
 	NMSettingBond *s_bond;
 	const char *master_uuid;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "bond0");
 
@@ -606,10 +631,12 @@ test_bridge (void)
 	NMSettingBridge *s_bridge;
 	NMIPRoute *ip_route;
 	const char *master_uuid;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 3);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "bridge0");
 	g_assert (connection);
@@ -682,10 +709,12 @@ test_bridge_default (void)
 	NMSettingIPConfig *s_ip6;
 	NMSettingBridge *s_bridge;
 	const char *master_uuid;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "br0");
 
@@ -740,10 +769,12 @@ test_team (void)
 	NMSettingIPConfig *s_ip6;
 	NMSettingTeam *s_team;
 	const char *master_uuid;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 3);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "team0");
 	g_assert (connection);
@@ -806,10 +837,12 @@ test_ibft_ip_dev (void)
 	gs_unref_hashtable GHashTable *connections = NULL;
 	NMSettingConnection *s_con;
 	NMConnection *connection;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "eth0");
 	g_assert (connection);
@@ -825,10 +858,12 @@ _test_ibft_ip (const char *const*ARGV)
 {
 	gs_unref_hashtable GHashTable *connections = NULL;
 	NMConnection *connection;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "ibft0");
 	g_assert (connection);
@@ -864,10 +899,12 @@ test_ignore_extra (void)
 {
 	gs_unref_hashtable GHashTable *connections = NULL;
 	const char *const*ARGV = NM_MAKE_STRV ("blabla", "extra", "lalala");
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 0);
+	g_assert_cmpstr (hostname, ==, NULL);
 }
 
 static void
@@ -886,10 +923,12 @@ test_rd_znet (void)
 		{ .name = "portno", .value_str = "1" },
 	};
 	int i_s390_options_keys;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
+	g_assert_cmpstr (hostname, ==, "foo.example.com");
 
 	connection = g_hash_table_lookup (connections, "enc800");
 	g_assert (NM_IS_CONNECTION (connection));
@@ -963,10 +1002,12 @@ test_rd_znet_legacy (void)
 	                                             "net.ifnames=0");
 	NMConnection *connection;
 	NMSettingConnection *s_con;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
+	g_assert_cmpstr (hostname, ==, "foo.example.com");
 
 	connection = g_hash_table_lookup (connections, "eth0");
 	g_assert (NM_IS_CONNECTION (connection));
@@ -1001,10 +1042,12 @@ test_bootif (void)
 	NMSettingWired *s_wired;
 	NMSettingIPConfig *s_ip4;
 	NMSettingIPConfig *s_ip6;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "default_connection");
 	g_assert (connection);
@@ -1037,10 +1080,12 @@ test_bootif_hwtype (void)
 	NMSettingWired *s_wired;
 	NMSettingIPConfig *s_ip4;
 	NMSettingIPConfig *s_ip6;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
+	g_assert_cmpstr (hostname, ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "eth0");
 	g_assert (connection);
@@ -1100,10 +1145,12 @@ test_nameserver (void)
 	                                       "nameserver=[2606:4700:4700::1111]");
 	NMConnection *connection;
 	NMSettingIPConfig *s_ip;
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 3);
+	g_assert_cmpstr (hostname, ==, "foo.example.com");
 
 	connection = g_hash_table_lookup (connections, "eth0");
 	g_assert (connection);
@@ -1140,10 +1187,12 @@ test_bootif_off (void)
 {
 	gs_unref_hashtable GHashTable *connections = NULL;
 	const char *const*ARGV = NM_MAKE_STRV ("BOOTIF=01-00-53-AB-cd-02-03", "rd.bootif=0");
+	gs_free char *hostname = NULL;
 
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
 	g_assert (connections);
 	g_assert_cmpint (g_hash_table_size (connections), ==, 0);
+	g_assert_cmpstr (hostname, ==, NULL);
 }
 
 NMTST_DEFINE ();

From 93d7a9b005ff8d2c577efd36d4cf28d0e776c426 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Mon, 4 May 2020 09:57:51 +0200
Subject: [PATCH 126/222] initrd: parse rd.peerdns early

Instead of generating connections and then apply the rd.peerdns to
them, parse the option early and set it when each connection is
created.
---
 src/initrd/nmi-cmdline-reader.c | 50 ++++++++++++---------------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
index cf8cddc392..9cac8661a1 100644
--- a/src/initrd/nmi-cmdline-reader.c
+++ b/src/initrd/nmi-cmdline-reader.c
@@ -24,6 +24,9 @@ typedef struct {
 	NMConnection *bootdev_connection;   /* connection for bootdev=$ifname */
 	NMConnection *default_connection;   /* connection not bound to any ifname */
 	char *hostname;
+
+	/* Parameters to be set for all connections */
+	gboolean ignore_auto_dns;
 } Reader;
 
 static Reader *
@@ -89,6 +92,7 @@ reader_create_connection (Reader *reader,
 	g_object_set (setting,
 	              NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
 	              NM_SETTING_IP_CONFIG_MAY_FAIL, TRUE,
+	              NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, reader->ignore_auto_dns,
 	              NULL);
 
 	setting = nm_setting_ip6_config_new ();
@@ -97,6 +101,7 @@ reader_create_connection (Reader *reader,
 	              NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
 	              NM_SETTING_IP_CONFIG_MAY_FAIL, TRUE,
 	              NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, (int) NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64,
+	              NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, reader->ignore_auto_dns,
 	              NULL);
 
 	setting = nm_setting_connection_new ();
@@ -818,27 +823,6 @@ _normalize_conn (gpointer key, gpointer value, gpointer user_data)
 	nm_connection_normalize (connection, NULL, NULL, NULL);
 }
 
-static void
-reader_set_ignore_auto_dns (Reader *reader)
-{
-	GHashTableIter iter;
-	NMConnection *connection;
-	NMSettingIPConfig *s_ip = NULL;
-
-	g_hash_table_iter_init (&iter, reader->hash);
-	while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &connection)) {
-		s_ip = nm_connection_get_setting_ip4_config (connection);
-		g_object_set (s_ip,
-		              NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, TRUE,
-		              NULL);
-
-		s_ip = nm_connection_get_setting_ip6_config (connection);
-		g_object_set (s_ip,
-		              NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, TRUE,
-		              NULL);
-	}
-}
-
 static void
 reader_add_nameservers (Reader *reader, GPtrArray *nameservers)
 {
@@ -897,16 +881,23 @@ nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv, char **
 	gboolean net_ifnames = TRUE;
 	gs_unref_ptrarray GPtrArray *nameservers = NULL;
 	gs_unref_ptrarray GPtrArray *routes = NULL;
-	gboolean ignore_auto_dns = FALSE;
 	int i;
 
 	reader = reader_new ();
 
 	for (i = 0; argv[i]; i++) {
-		if (strcmp (argv[i], "net.ifnames=0") == 0)
-			net_ifnames = FALSE;
-		else if (g_str_has_prefix (argv[i], "net.ifnames="))
-			net_ifnames = TRUE;
+		gs_free char *argument_clone = NULL;
+		char *argument;
+
+		argument_clone = g_strdup (argv[i]);
+		argument = argument_clone;
+
+		tag = get_word (&argument, '=');
+
+		if (strcmp (tag, "net.ifnames") == 0)
+			net_ifnames = strcmp (argument, "0") != 0;
+		else if (strcmp (tag, "rd.peerdns") == 0)
+			reader->ignore_auto_dns = !_nm_utils_ascii_str_to_bool (argument, TRUE);
 	}
 
 	for (i = 0; argv[i]; i++) {
@@ -944,9 +935,7 @@ nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv, char **
 			}
 			if (argument && *argument)
 				_LOGW (LOGD_CORE, "Ignoring extra: '%s'.", argument);
-		} else if (strcmp (tag, "rd.peerdns") == 0)
-			ignore_auto_dns = !_nm_utils_ascii_str_to_bool (argument, TRUE);
-		else if (strcmp (tag, "rd.iscsi.ibft") == 0 && _nm_utils_ascii_str_to_bool (argument, TRUE))
+		} else if (strcmp (tag, "rd.iscsi.ibft") == 0 && _nm_utils_ascii_str_to_bool (argument, TRUE))
 			reader_read_all_connections_from_fw (reader, sysfs_dir);
 		else if (strcmp (tag, "rd.bootif") == 0)
 			ignore_bootif = !_nm_utils_ascii_str_to_bool (argument, TRUE);
@@ -1020,9 +1009,6 @@ nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv, char **
 	if (nameservers)
 		reader_add_nameservers (reader, nameservers);
 
-	if (ignore_auto_dns)
-		reader_set_ignore_auto_dns (reader);
-
 	g_hash_table_foreach (reader->hash, _normalize_conn, NULL);
 
 	NM_SET_OUT (hostname, g_steal_pointer (&reader->hostname));

From fbf54ab1829ecf97b0a22f09eaa3424001c0bb74 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Mon, 4 May 2020 10:26:21 +0200
Subject: [PATCH 127/222] initrd: parse 'rd.net.timeout.dhcp' option

---
 man/nm-initrd-generator.xml            | 1 +
 src/initrd/nmi-cmdline-reader.c        | 7 +++++++
 src/initrd/tests/test-cmdline-reader.c | 7 ++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml
index c3594a4e2a..66d9b3ce05 100644
--- a/man/nm-initrd-generator.xml
+++ b/man/nm-initrd-generator.xml
@@ -132,6 +132,7 @@
             <member><option>nameserver</option></member>
             <member><option>rd.peerdns</option></member>
             <member><option>rd.bootif</option></member>
+            <member><option>rd.net.timeout.dhcp</option></member>
             <member><option>BOOTIF</option></member>
           </simplelist>
 
diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
index 9cac8661a1..2f6afefcb7 100644
--- a/src/initrd/nmi-cmdline-reader.c
+++ b/src/initrd/nmi-cmdline-reader.c
@@ -27,6 +27,7 @@ typedef struct {
 
 	/* Parameters to be set for all connections */
 	gboolean ignore_auto_dns;
+	int dhcp_timeout;
 } Reader;
 
 static Reader *
@@ -93,6 +94,7 @@ reader_create_connection (Reader *reader,
 	              NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
 	              NM_SETTING_IP_CONFIG_MAY_FAIL, TRUE,
 	              NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, reader->ignore_auto_dns,
+	              NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, reader->dhcp_timeout,
 	              NULL);
 
 	setting = nm_setting_ip6_config_new ();
@@ -102,6 +104,7 @@ reader_create_connection (Reader *reader,
 	              NM_SETTING_IP_CONFIG_MAY_FAIL, TRUE,
 	              NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, (int) NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64,
 	              NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, reader->ignore_auto_dns,
+	              NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, reader->dhcp_timeout,
 	              NULL);
 
 	setting = nm_setting_connection_new ();
@@ -898,6 +901,10 @@ nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv, char **
 			net_ifnames = strcmp (argument, "0") != 0;
 		else if (strcmp (tag, "rd.peerdns") == 0)
 			reader->ignore_auto_dns = !_nm_utils_ascii_str_to_bool (argument, TRUE);
+		else if (strcmp (tag, "rd.net.timeout.dhcp") == 0) {
+			reader->dhcp_timeout = _nm_utils_ascii_str_to_int64 (argument,
+			                                                     10, 0, G_MAXINT32, 0);
+		}
 	}
 
 	for (i = 0; argv[i]; i++) {
diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
index 65f279a92f..4c972e7384 100644
--- a/src/initrd/tests/test-cmdline-reader.c
+++ b/src/initrd/tests/test-cmdline-reader.c
@@ -623,7 +623,9 @@ static void
 test_bridge (void)
 {
 	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("bridge=bridge0:eth0,eth1", "rd.route=192.0.2.53::bridge0");
+	const char *const*ARGV = NM_MAKE_STRV ("bridge=bridge0:eth0,eth1",
+	                                       "rd.route=192.0.2.53::bridge0",
+	                                       "rd.net.timeout.dhcp=10");
 	NMConnection *connection;
 	NMSettingConnection *s_con;
 	NMSettingIPConfig *s_ip4;
@@ -653,6 +655,7 @@ test_bridge (void)
 	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 0);
 	g_assert (!nm_setting_ip_config_get_gateway (s_ip4));
 	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip4), ==, 1);
+	g_assert_cmpint (nm_setting_ip_config_get_dhcp_timeout(s_ip4), ==, 10);
 	ip_route = nm_setting_ip_config_get_route (s_ip4, 0);
 	g_assert_cmpstr (nm_ip_route_get_dest (ip_route), ==, "192.0.2.53");
 	g_assert_cmpint (nm_ip_route_get_family (ip_route), ==, AF_INET);
@@ -667,6 +670,8 @@ test_bridge (void)
 	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 0);
 	g_assert (!nm_setting_ip_config_get_gateway (s_ip6));
 	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip6), ==, 0);
+	g_assert_cmpint (nm_setting_ip_config_get_dhcp_timeout(s_ip6), ==, 10);
+
 
 	s_bridge = nm_connection_get_setting_bridge (connection);
 	g_assert (s_bridge);

From 2035353dabcdd8870bb0ab4e823728ac3f67ca11 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Mon, 4 May 2020 11:08:18 +0200
Subject: [PATCH 128/222] man: initrd: describe differences from network-legacy
 module

---
 man/nm-initrd-generator.xml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml
index 66d9b3ce05..37f5ffdf4b 100644
--- a/man/nm-initrd-generator.xml
+++ b/man/nm-initrd-generator.xml
@@ -143,6 +143,34 @@
     </variablelist>
   </refsect1>
 
+  <refsect1 id='differences_from_network_legacy'><title>Differences from the network-legacy dracut module</title>
+
+    <para><command>nm-initrd-generator</command> generates a set of
+    connections that are then configured by the NetworkManager
+    instance running in the initrd. There are some differences in
+    behavior compared to the network-legacy dracut module:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>When an interface is configured with a static address
+        and a gateway, the network-legacy module waits that the
+        gateway responds to arping requests before proceeding, while
+        NetworkManager doesn't.</para>
+      </listitem>
+
+      <listitem>
+        <para>network-legacy configures interfaces one by one in the
+        order in which they are announced by udev. If multiple
+        interfaces specify a hostname (from command line or from
+        DHCP), the one from the last interface activated wins. With
+        NetworkManager, hostnames from command line have higher
+        precedence over ones from DHCP, and the last that appears in
+        the command line wins.</para>
+      </listitem>
+
+    </itemizedlist>
+  </refsect1>
+
   <refsect1 id='exit_status'><title>Exit Status</title>
     <para><command>nm-initrd-generator</command> exits with status 0. It ignores unrecognized
     options and prints an error message if it encounters a malformed option.</para>

From 9a7a66b7b20281c3bfec049493a5306f4c5d4ca0 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Wed, 6 May 2020 09:46:44 +0300
Subject: [PATCH 129/222] po: update Ukrainian (uk) translation

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/493
---
 po/uk.po | 1143 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 602 insertions(+), 541 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index a17fb323d8..396ba69ceb 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/NetworkMan"
 "ager/issues\n"
-"POT-Creation-Date: 2020-05-04 03:36+0000\n"
-"PO-Revision-Date: 2020-05-04 14:31+0300\n"
+"POT-Creation-Date: 2020-05-05 15:43+0000\n"
+"PO-Revision-Date: 2020-05-05 21:38+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -4752,7 +4752,7 @@ msgid "invalid option '%s', use a combination of [%s]"
 msgstr "некоректний параметр «%s», скористайтеся комбінацією [%s]"
 
 #: ../clients/common/nm-meta-setting-desc.c:1595
-#: ../shared/nm-keyfile/nm-keyfile.c:927
+#: ../shared/nm-keyfile/nm-keyfile.c:920
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr ""
@@ -5289,9 +5289,9 @@ msgid "Username"
 msgstr "Користувач"
 
 #: ../clients/common/nm-meta-setting-desc.c:4799
-#: ../clients/common/nm-meta-setting-desc.c:5047
-#: ../clients/common/nm-meta-setting-desc.c:5448
-#: ../clients/common/nm-meta-setting-desc.c:6388
+#: ../clients/common/nm-meta-setting-desc.c:5083
+#: ../clients/common/nm-meta-setting-desc.c:5484
+#: ../clients/common/nm-meta-setting-desc.c:6424
 msgid "Password [none]"
 msgstr "Пароль [типово немає]"
 
@@ -5300,11 +5300,11 @@ msgid "Bluetooth device address"
 msgstr "Адреса пристрою Bluetooth"
 
 #: ../clients/common/nm-meta-setting-desc.c:4893
-#: ../clients/common/nm-meta-setting-desc.c:5501
-#: ../clients/common/nm-meta-setting-desc.c:7096
-#: ../clients/common/nm-meta-setting-desc.c:7134
-#: ../clients/common/nm-meta-setting-desc.c:7316
-#: ../clients/common/nm-meta-setting-desc.c:7546
+#: ../clients/common/nm-meta-setting-desc.c:5537
+#: ../clients/common/nm-meta-setting-desc.c:7132
+#: ../clients/common/nm-meta-setting-desc.c:7170
+#: ../clients/common/nm-meta-setting-desc.c:7352
+#: ../clients/common/nm-meta-setting-desc.c:7582
 msgid "MAC [none]"
 msgstr "MAC [типово немає]"
 
@@ -5336,29 +5336,29 @@ msgstr "Час застарівання MAC-адреси [типово 300]"
 msgid "Group forward mask [0]"
 msgstr "Маска групового переспрямовування [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4953
+#: ../clients/common/nm-meta-setting-desc.c:4981
 msgid "Enable IGMP snooping [no]"
 msgstr "Увімкнути підглядання IGMP [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5003
+#: ../clients/common/nm-meta-setting-desc.c:5039
 msgid "Bridge port priority [32]"
 msgstr "Пріоритетний порт містка [типово 32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5009
+#: ../clients/common/nm-meta-setting-desc.c:5045
 msgid "Bridge port STP path cost [100]"
 msgstr "Вартість маршруту STP порту містка [типово 100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5015
+#: ../clients/common/nm-meta-setting-desc.c:5051
 msgid "Hairpin [no]"
 msgstr "Початкова зона [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5041
-#: ../clients/common/nm-meta-setting-desc.c:5442
-#: ../clients/common/nm-meta-setting-desc.c:6942
+#: ../clients/common/nm-meta-setting-desc.c:5077
+#: ../clients/common/nm-meta-setting-desc.c:5478
+#: ../clients/common/nm-meta-setting-desc.c:6978
 msgid "Username [none]"
 msgstr "Користувач [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5143
+#: ../clients/common/nm-meta-setting-desc.c:5179
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -5373,7 +5373,7 @@ msgstr ""
 "\n"
 "Приклад: alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5196
+#: ../clients/common/nm-meta-setting-desc.c:5232
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -5394,7 +5394,7 @@ msgstr ""
 "\n"
 "Приклад: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5219
+#: ../clients/common/nm-meta-setting-desc.c:5255
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
@@ -5410,25 +5410,25 @@ msgstr ""
 "«unknown» — дозволити NetworkManager вибирати значення за допомогою "
 "евристики\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5458
+#: ../clients/common/nm-meta-setting-desc.c:5494
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:5510
-#: ../clients/common/nm-meta-setting-desc.c:7165
-#: ../clients/common/nm-meta-setting-desc.c:7356
+#: ../clients/common/nm-meta-setting-desc.c:5546
+#: ../clients/common/nm-meta-setting-desc.c:7201
+#: ../clients/common/nm-meta-setting-desc.c:7392
 msgid "MTU [auto]"
 msgstr "MTU [типово авто]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5529
+#: ../clients/common/nm-meta-setting-desc.c:5565
 msgid "P_KEY [none]"
 msgstr "P_KEY [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5538
+#: ../clients/common/nm-meta-setting-desc.c:5574
 msgid "Parent interface [none]"
 msgstr "Батьківський інтерфейс [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5565
+#: ../clients/common/nm-meta-setting-desc.c:5601
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5438,11 +5438,11 @@ msgstr ""
 "\n"
 "Приклад: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5613
+#: ../clients/common/nm-meta-setting-desc.c:5649
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "Адреса IPv4 (IP[/plen]) [немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5615
+#: ../clients/common/nm-meta-setting-desc.c:5651
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5456,11 +5456,11 @@ msgstr ""
 "\n"
 "Приклад: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5634
+#: ../clients/common/nm-meta-setting-desc.c:5670
 msgid "IPv4 gateway [none]"
 msgstr "Шлюз IPv4 [немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5642
+#: ../clients/common/nm-meta-setting-desc.c:5678
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5483,7 +5483,7 @@ msgstr ""
 "Приклади: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5682
+#: ../clients/common/nm-meta-setting-desc.c:5718
 msgid ""
 "Enter a list of IPv4 routing rules formatted as:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
@@ -5493,7 +5493,7 @@ msgstr ""
 "  priority [пріоритетність] [from [джерело]] [to [призначення]], ,...\n"
 "\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5773
+#: ../clients/common/nm-meta-setting-desc.c:5809
 msgid ""
 "Enter a list of IPv6 addresses of DNS servers.  If the IPv6 configuration "
 "method is 'auto' these DNS servers are appended to those (if any) returned "
@@ -5514,11 +5514,11 @@ msgstr ""
 "\n"
 "Приклад: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5827
+#: ../clients/common/nm-meta-setting-desc.c:5863
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "Адреса IPv6 (IP[/plen]) [немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5829
+#: ../clients/common/nm-meta-setting-desc.c:5865
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5532,11 +5532,11 @@ msgstr ""
 "\n"
 "Приклад: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5848
+#: ../clients/common/nm-meta-setting-desc.c:5884
 msgid "IPv6 gateway [none]"
 msgstr "Шлюз IPv6 [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5856
+#: ../clients/common/nm-meta-setting-desc.c:5892
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5561,7 +5561,7 @@ msgstr ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5896
+#: ../clients/common/nm-meta-setting-desc.c:5932
 msgid ""
 "Enter a list of IPv6 routing rules formatted as:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
@@ -5571,170 +5571,170 @@ msgstr ""
 "  priority [пріоритетність] [from [джерело]] [to [призначення]], ,...\n"
 "\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6003
-#: ../clients/common/nm-meta-setting-desc.c:6995
+#: ../clients/common/nm-meta-setting-desc.c:6039
+#: ../clients/common/nm-meta-setting-desc.c:7031
 msgid "Parent device [none]"
 msgstr "Батьківський пристрій [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6009
+#: ../clients/common/nm-meta-setting-desc.c:6045
 msgid "Local endpoint [none]"
 msgstr "Локальна кінцева точка [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6016
-#: ../clients/common/nm-meta-setting-desc.c:7015
+#: ../clients/common/nm-meta-setting-desc.c:6052
+#: ../clients/common/nm-meta-setting-desc.c:7051
 msgid "Remote"
 msgstr "Віддалений"
 
-#: ../clients/common/nm-meta-setting-desc.c:6061
+#: ../clients/common/nm-meta-setting-desc.c:6097
 msgid "MACsec parent device or connection UUID"
 msgstr "Батьківський пристрій MACsec або UUID з'єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:6082
+#: ../clients/common/nm-meta-setting-desc.c:6118
 msgid "Enable encryption [yes]"
 msgstr "Увімкнути шифрування [типово «так»]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6088
+#: ../clients/common/nm-meta-setting-desc.c:6124
 #: ../clients/common/nm-secret-agent-simple.c:917
 msgid "MKA CAK"
 msgstr "MKA CAK"
 
-#: ../clients/common/nm-meta-setting-desc.c:6098
+#: ../clients/common/nm-meta-setting-desc.c:6134
 msgid "MKA_CKN"
 msgstr "MKA_CKN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6104
+#: ../clients/common/nm-meta-setting-desc.c:6140
 msgid "SCI port [1]"
 msgstr "Порт SCI [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6130
+#: ../clients/common/nm-meta-setting-desc.c:6166
 msgid "MACVLAN parent device or connection UUID"
 msgstr "Батьківський пристрій MACVLAN або UUID з'єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:6151
+#: ../clients/common/nm-meta-setting-desc.c:6187
 msgid "Tap [no]"
 msgstr "Tap [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6186
-#: ../clients/common/nm-meta-setting-desc.c:7270
+#: ../clients/common/nm-meta-setting-desc.c:6222
+#: ../clients/common/nm-meta-setting-desc.c:7306
 #: ../clients/tui/nmt-page-wifi.c:213
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6195
+#: ../clients/common/nm-meta-setting-desc.c:6231
 msgid "OLPC Mesh channel [1]"
 msgstr "Канал OLPC Mesh [типово 1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6204
+#: ../clients/common/nm-meta-setting-desc.c:6240
 msgid "DHCP anycast MAC address [none]"
 msgstr "MAC-адреса довільного надсилання (anycast) DHCP [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6369
+#: ../clients/common/nm-meta-setting-desc.c:6405
 msgid "PPPoE parent device"
 msgstr "Батьківський пристрій PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:6375
+#: ../clients/common/nm-meta-setting-desc.c:6411
 msgid "Service [none]"
 msgstr "Служба [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6382
+#: ../clients/common/nm-meta-setting-desc.c:6418
 msgid "PPPoE username"
 msgstr "Користувач PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:6418
+#: ../clients/common/nm-meta-setting-desc.c:6454
 msgid "Browser only [no]"
 msgstr "Лише навігатор [типово «ні»]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6424
+#: ../clients/common/nm-meta-setting-desc.c:6460
 msgid "PAC URL"
 msgstr "Адреса PAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:6430
+#: ../clients/common/nm-meta-setting-desc.c:6466
 msgid "PAC script"
 msgstr "Скрипт PAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:6554
-#: ../clients/common/nm-meta-setting-desc.c:6742
+#: ../clients/common/nm-meta-setting-desc.c:6590
+#: ../clients/common/nm-meta-setting-desc.c:6778
 msgid "Team JSON configuration [none]"
 msgstr "Налаштування JSON команди [немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6845
+#: ../clients/common/nm-meta-setting-desc.c:6881
 msgid "User ID [none]"
 msgstr "Ідентифікатор користувача [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6851
+#: ../clients/common/nm-meta-setting-desc.c:6887
 msgid "Group ID [none]"
 msgstr "Ідентифікатор групи [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6857
+#: ../clients/common/nm-meta-setting-desc.c:6893
 msgid "Enable PI [no]"
 msgstr "Увімкнути PI [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6863
+#: ../clients/common/nm-meta-setting-desc.c:6899
 msgid "Enable VNET header [no]"
 msgstr "Увімкнути заголовок VNET [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6869
+#: ../clients/common/nm-meta-setting-desc.c:6905
 msgid "Enable multi queue [no]"
 msgstr "Увімкнути декілька черг [типово ні]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6882
+#: ../clients/common/nm-meta-setting-desc.c:6918
 msgid "VLAN parent device or connection UUID"
 msgstr "Батьківський пристрій VLAN або UUID з'єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:6889
+#: ../clients/common/nm-meta-setting-desc.c:6925
 msgid "VLAN ID (<0-4094>)"
 msgstr "Ід. VLAN (<0-4094>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:6895
+#: ../clients/common/nm-meta-setting-desc.c:6931
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "Прапорці VLAN (<0-7>) [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6904
+#: ../clients/common/nm-meta-setting-desc.c:6940
 msgid "Ingress priority maps [none]"
 msgstr "Відображення пріоритетності вхідного доступу [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6914
+#: ../clients/common/nm-meta-setting-desc.c:6950
 msgid "Egress priority maps [none]"
 msgstr "Відображення пріоритетності вихідного доступу [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6982
+#: ../clients/common/nm-meta-setting-desc.c:7018
 msgid "Table [0]"
 msgstr "Таблиця [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7002
+#: ../clients/common/nm-meta-setting-desc.c:7038
 msgid "VXLAN ID"
 msgstr "Ід. VXLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7008
+#: ../clients/common/nm-meta-setting-desc.c:7044
 msgid "Local address [none]"
 msgstr "Локальна адреса [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7021
+#: ../clients/common/nm-meta-setting-desc.c:7057
 msgid "Minimum source port [0]"
 msgstr "Мінімальний порт джерела [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7027
+#: ../clients/common/nm-meta-setting-desc.c:7063
 msgid "Maximum source port [0]"
 msgstr "Максимальний порт джерела [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7033
+#: ../clients/common/nm-meta-setting-desc.c:7069
 msgid "Destination port [8472]"
 msgstr "Порт призначення [типово 8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7073
+#: ../clients/common/nm-meta-setting-desc.c:7109
 msgid "Peer"
 msgstr "Вузол"
 
-#: ../clients/common/nm-meta-setting-desc.c:7103
+#: ../clients/common/nm-meta-setting-desc.c:7139
 msgid "WiMAX NSP name"
 msgstr "Назва NSP WiMAX"
 
-#: ../clients/common/nm-meta-setting-desc.c:7140
-#: ../clients/common/nm-meta-setting-desc.c:7321
+#: ../clients/common/nm-meta-setting-desc.c:7176
+#: ../clients/common/nm-meta-setting-desc.c:7357
 msgid "Cloned MAC [none]"
 msgstr "Клонований MAC [типово немає]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7173
+#: ../clients/common/nm-meta-setting-desc.c:7209
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -5744,7 +5744,7 @@ msgstr ""
 "\n"
 "Приклад: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7495
+#: ../clients/common/nm-meta-setting-desc.c:7531
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
@@ -5752,221 +5752,221 @@ msgstr ""
 "Вкажіть тип ключів WEP. Можливі значення: 0 або unknown (невідомо), 1 або "
 "key (ключ) та 2 або passphrase (пароль).\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7554
+#: ../clients/common/nm-meta-setting-desc.c:7590
 msgid "Short address (<0x0000-0xffff>)"
 msgstr "Коротка адреса (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7570
+#: ../clients/common/nm-meta-setting-desc.c:7606
 msgid "PAN Identifier (<0x0000-0xffff>)"
 msgstr "Ідентифікатор PAN (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7585
+#: ../clients/common/nm-meta-setting-desc.c:7621
 msgid "Page (<default|0-31>)"
 msgstr "Сторінка (<default|0-31>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7599
+#: ../clients/common/nm-meta-setting-desc.c:7635
 msgid "Channel (<default|0-26>)"
 msgstr "Канал (<default|0-26>)"
 
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7734
+#: ../clients/common/nm-meta-setting-desc.c:7770
 msgid "6LOWPAN settings"
 msgstr "Параметри 6LOWPAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7735
+#: ../clients/common/nm-meta-setting-desc.c:7771
 msgid "802-1x settings"
 msgstr "Параметри 802-1x"
 
-#: ../clients/common/nm-meta-setting-desc.c:7736
+#: ../clients/common/nm-meta-setting-desc.c:7772
 #: ../src/devices/adsl/nm-device-adsl.c:117
 msgid "ADSL connection"
 msgstr "З'єднання ADSL"
 
-#: ../clients/common/nm-meta-setting-desc.c:7737
+#: ../clients/common/nm-meta-setting-desc.c:7773
 msgid "bluetooth connection"
 msgstr "з'єднання bluetooth"
 
-#: ../clients/common/nm-meta-setting-desc.c:7738
+#: ../clients/common/nm-meta-setting-desc.c:7774
 msgid "Bond device"
 msgstr "Пристрій Bond"
 
-#: ../clients/common/nm-meta-setting-desc.c:7739
+#: ../clients/common/nm-meta-setting-desc.c:7775
 msgid "Bridge device"
 msgstr "Пристрій містка"
 
-#: ../clients/common/nm-meta-setting-desc.c:7740
+#: ../clients/common/nm-meta-setting-desc.c:7776
 msgid "Bridge port"
 msgstr "Порт містка"
 
-#: ../clients/common/nm-meta-setting-desc.c:7741
+#: ../clients/common/nm-meta-setting-desc.c:7777
 msgid "CDMA mobile broadband connection"
 msgstr "мобільне широкосмугове з'єднання CDMA"
 
-#: ../clients/common/nm-meta-setting-desc.c:7742
+#: ../clients/common/nm-meta-setting-desc.c:7778
 msgid "General settings"
 msgstr "Загальні параметри"
 
-#: ../clients/common/nm-meta-setting-desc.c:7743
+#: ../clients/common/nm-meta-setting-desc.c:7779
 msgid "DCB settings"
 msgstr "Параметри DCB"
 
-#: ../clients/common/nm-meta-setting-desc.c:7744
+#: ../clients/common/nm-meta-setting-desc.c:7780
 msgid "Dummy settings"
 msgstr "Фіктивні параметри"
 
-#: ../clients/common/nm-meta-setting-desc.c:7745
+#: ../clients/common/nm-meta-setting-desc.c:7781
 msgid "Ethtool settings"
 msgstr "Параметри Ethtool"
 
-#: ../clients/common/nm-meta-setting-desc.c:7746
+#: ../clients/common/nm-meta-setting-desc.c:7782
 msgid "Generic settings"
 msgstr "Загальні параметри"
 
-#: ../clients/common/nm-meta-setting-desc.c:7747
+#: ../clients/common/nm-meta-setting-desc.c:7783
 msgid "GSM mobile broadband connection"
 msgstr "мобільне широкосмугове з'єднання GSM"
 
-#: ../clients/common/nm-meta-setting-desc.c:7748
+#: ../clients/common/nm-meta-setting-desc.c:7784
 #: ../src/devices/nm-device-infiniband.c:158
 msgid "InfiniBand connection"
 msgstr "З'єднання InfiniBand"
 
-#: ../clients/common/nm-meta-setting-desc.c:7749
+#: ../clients/common/nm-meta-setting-desc.c:7785
 msgid "IPv4 protocol"
 msgstr "Протокол IPv4"
 
-#: ../clients/common/nm-meta-setting-desc.c:7750
+#: ../clients/common/nm-meta-setting-desc.c:7786
 msgid "IPv6 protocol"
 msgstr "Протокол IPv6"
 
-#: ../clients/common/nm-meta-setting-desc.c:7751
+#: ../clients/common/nm-meta-setting-desc.c:7787
 msgid "IP-tunnel settings"
 msgstr "Параметри IP-тунелювання"
 
-#: ../clients/common/nm-meta-setting-desc.c:7752
+#: ../clients/common/nm-meta-setting-desc.c:7788
 msgid "MACsec connection"
 msgstr "З'єднання MACsec"
 
-#: ../clients/common/nm-meta-setting-desc.c:7753
+#: ../clients/common/nm-meta-setting-desc.c:7789
 msgid "macvlan connection"
 msgstr "З'єднання MACVLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7754
+#: ../clients/common/nm-meta-setting-desc.c:7790
 msgid "Match"
 msgstr "Відповідність"
 
-#: ../clients/common/nm-meta-setting-desc.c:7755
+#: ../clients/common/nm-meta-setting-desc.c:7791
 msgid "OLPC Mesh connection"
 msgstr "З'єднання OLPC Mesh"
 
-#: ../clients/common/nm-meta-setting-desc.c:7756
+#: ../clients/common/nm-meta-setting-desc.c:7792
 msgid "Open vSwitch bridge settings"
 msgstr "Параметри містка Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7757
+#: ../clients/common/nm-meta-setting-desc.c:7793
 msgid "Open vSwitch DPDK interface settings"
 msgstr "Параметри інтерфейсу Open vSwitch DPDK"
 
-#: ../clients/common/nm-meta-setting-desc.c:7758
+#: ../clients/common/nm-meta-setting-desc.c:7794
 msgid "Open vSwitch interface settings"
 msgstr "Параметри інтерфейсу Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7759
+#: ../clients/common/nm-meta-setting-desc.c:7795
 msgid "Open vSwitch patch interface settings"
 msgstr "Параметри інтерфейсу латок Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7760
+#: ../clients/common/nm-meta-setting-desc.c:7796
 msgid "Open vSwitch port settings"
 msgstr "Параметри портів Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7761
+#: ../clients/common/nm-meta-setting-desc.c:7797
 msgid "PPP settings"
 msgstr "Параметри PPP"
 
-#: ../clients/common/nm-meta-setting-desc.c:7762
+#: ../clients/common/nm-meta-setting-desc.c:7798
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:7763
+#: ../clients/common/nm-meta-setting-desc.c:7799
 msgid "Proxy"
 msgstr "Проксі"
 
-#: ../clients/common/nm-meta-setting-desc.c:7764
+#: ../clients/common/nm-meta-setting-desc.c:7800
 msgid "Serial settings"
 msgstr "Параметри послідовного з'єднання"
 
-#: ../clients/common/nm-meta-setting-desc.c:7765
+#: ../clients/common/nm-meta-setting-desc.c:7801
 msgid "SR-IOV settings"
 msgstr "Параметри SR-IOV"
 
-#: ../clients/common/nm-meta-setting-desc.c:7766
+#: ../clients/common/nm-meta-setting-desc.c:7802
 msgid "Traffic controls"
 msgstr "Засоби керування обміном даними"
 
-#: ../clients/common/nm-meta-setting-desc.c:7767
+#: ../clients/common/nm-meta-setting-desc.c:7803
 msgid "Team device"
 msgstr "Пристрій Team"
 
-#: ../clients/common/nm-meta-setting-desc.c:7768
+#: ../clients/common/nm-meta-setting-desc.c:7804
 msgid "Team port"
 msgstr "Порт Team"
 
-#: ../clients/common/nm-meta-setting-desc.c:7769
+#: ../clients/common/nm-meta-setting-desc.c:7805
 msgid "Tun device"
 msgstr "Пристрій TUN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7770
+#: ../clients/common/nm-meta-setting-desc.c:7806
 msgid "User settings"
 msgstr "Параметри користувача"
 
-#: ../clients/common/nm-meta-setting-desc.c:7771
+#: ../clients/common/nm-meta-setting-desc.c:7807
 #: ../src/devices/nm-device-vlan.c:385
 msgid "VLAN connection"
 msgstr "З'єднання VLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7772 ../src/nm-manager.c:5683
+#: ../clients/common/nm-meta-setting-desc.c:7808 ../src/nm-manager.c:5683
 msgid "VPN connection"
 msgstr "З'єднання VPN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7773
+#: ../clients/common/nm-meta-setting-desc.c:7809
 #: ../src/devices/nm-device-vrf.c:175
 msgid "VRF connection"
 msgstr "З'єднання VRF"
 
-#: ../clients/common/nm-meta-setting-desc.c:7774
+#: ../clients/common/nm-meta-setting-desc.c:7810
 #: ../src/devices/nm-device-vxlan.c:354
 msgid "VXLAN connection"
 msgstr "З'єднання VXLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7775
+#: ../clients/common/nm-meta-setting-desc.c:7811
 msgid "Wi-Fi P2P connection"
 msgstr "З'єднання P2P Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7776
+#: ../clients/common/nm-meta-setting-desc.c:7812
 msgid "WiMAX connection"
 msgstr "З'єднання WiMAX"
 
-#: ../clients/common/nm-meta-setting-desc.c:7777
+#: ../clients/common/nm-meta-setting-desc.c:7813
 msgid "Wired Ethernet"
 msgstr "Дротовий Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:7778
+#: ../clients/common/nm-meta-setting-desc.c:7814
 msgid "WireGuard VPN settings"
 msgstr "Параметри VPN WireGuard"
 
-#: ../clients/common/nm-meta-setting-desc.c:7779
+#: ../clients/common/nm-meta-setting-desc.c:7815
 msgid "Wi-Fi connection"
 msgstr "З'єднання Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7780
+#: ../clients/common/nm-meta-setting-desc.c:7816
 msgid "Wi-Fi security settings"
 msgstr "Параметри захисту Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7781
+#: ../clients/common/nm-meta-setting-desc.c:7817
 msgid "WPAN settings"
 msgstr "Параметри WPAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:8158
+#: ../clients/common/nm-meta-setting-desc.c:8194
 msgid "name"
 msgstr "назва"
 
@@ -6928,9 +6928,9 @@ msgstr ""
 
 #: ../clients/common/settings-docs.h.in:61
 #: ../clients/common/settings-docs.h.in:107
-#: ../clients/common/settings-docs.h.in:140
-#: ../clients/common/settings-docs.h.in:190
-#: ../clients/common/settings-docs.h.in:309
+#: ../clients/common/settings-docs.h.in:149
+#: ../clients/common/settings-docs.h.in:199
+#: ../clients/common/settings-docs.h.in:318
 msgid "Flags indicating how to handle the \"password\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «password»."
 
@@ -7264,7 +7264,7 @@ msgid "PIN used for EAP authentication methods."
 msgstr "PIN, який використовується для методів розпізнавання EAP."
 
 #: ../clients/common/settings-docs.h.in:85
-#: ../clients/common/settings-docs.h.in:192
+#: ../clients/common/settings-docs.h.in:201
 msgid "Flags indicating how to handle the \"pin\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «pin»."
 
@@ -7684,6 +7684,37 @@ msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
 msgstr "Максимальний вік повідомлення за протоколом STP, у секундах."
 
 #: ../clients/common/settings-docs.h.in:122
+msgid "Set maximum size of multicast hash table (value must be a power of 2)."
+msgstr ""
+"Встановити максимальний розмір таблиці хешів універсальної трансляції"
+" (значення має бути степенем 2)."
+
+#: ../clients/common/settings-docs.h.in:123
+msgid ""
+"Set the number of queries the bridge will send before stopping forwarding a "
+"multicast group after a \"leave\" message has been received."
+msgstr ""
+"Встановити кількість запитів, які місток надсилатиме, перш ніж припинити"
+" переспрямовування групи універсальної трансляції після отримання"
+" повідомлення «leave»."
+
+#: ../clients/common/settings-docs.h.in:124
+msgid ""
+"Set interval (in deciseconds) between queries to find remaining members of a "
+"group, after a \"leave\" message is received."
+msgstr ""
+"Встановити інтервал (у децисекундах) між запитами для пошуку решти учасників"
+" групи після отримання повідомлення «leave»."
+
+#: ../clients/common/settings-docs.h.in:125
+msgid ""
+"Set delay (in deciseconds) after which the bridge will leave a group, if no "
+"membership reports for this group are received."
+msgstr ""
+"Встановити затримку (у децисекундах), після якої місток полишить групу, якщо"
+" не буде отримано звітів щодо членства для цієї групи."
+
+#: ../clients/common/settings-docs.h.in:126
 msgid ""
 "Enable or disable sending of multicast queries by the bridge. If not "
 "specified the option is disabled."
@@ -7691,7 +7722,31 @@ msgstr ""
 "Увімкнути або вимкнути надсилання запитів універсальної трансляції містком. "
 "Якщо не вказано, вважається вимкненим."
 
-#: ../clients/common/settings-docs.h.in:123
+#: ../clients/common/settings-docs.h.in:127
+msgid ""
+"If no queries are seen after this delay (in deciseconds) has passed, the "
+"bridge will start to send its own queries."
+msgstr ""
+"Якщо протягом цього часу затримки (у децисекундах) не буде передано жодного"
+" запиту, місток почне надсилати власні запити."
+
+#: ../clients/common/settings-docs.h.in:128
+msgid ""
+"Interval (in deciseconds) between queries sent by the bridge after the end "
+"of the startup phase."
+msgstr ""
+"Інтервал (у децисекундах) між запитами, які буде надіслано містком після"
+" завершення початкової фази."
+
+#: ../clients/common/settings-docs.h.in:129
+msgid ""
+"Set the Max Response Time/Max Response Delay (in deciseconds) for IGMP/MLD "
+"queries sent by the bridge."
+msgstr ""
+"Встановити максимальний час на відповідь та максимальну затримку відповіді (у"
+" децисекундах) для запитів IGMP/MLD, які буде надіслано містком."
+
+#: ../clients/common/settings-docs.h.in:130
 msgid ""
 "If enabled the bridge's own IP address is used as the source address for "
 "IGMP queries otherwise the default of 0.0.0.0 is used."
@@ -7699,7 +7754,7 @@ msgstr ""
 "Якщо увімкнено, як адресу джерела для запитів IGMP буде використано власну "
 "IP-адресу містка. Якщо вимкнено, буде використано типову адресу 0.0.0.0."
 
-#: ../clients/common/settings-docs.h.in:124
+#: ../clients/common/settings-docs.h.in:131
 msgid ""
 "Sets bridge's multicast router. multicast-snooping must be enabled for this "
 "option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not "
@@ -7709,7 +7764,7 @@ msgstr ""
 "спрацював, має бути увімкнено multicast-snooping. Підтримувані значення: "
 "«auto», «disabled», «enabled». Якщо не вказано, типовим значенням є «auto»."
 
-#: ../clients/common/settings-docs.h.in:125
+#: ../clients/common/settings-docs.h.in:132
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -7719,7 +7774,20 @@ msgstr ""
 "стеження було автоматично вимкнено через конфлікти хешування, система може "
 "відмовити у вмиканні цієї можливості, аж доки конфлікти не буде усунено."
 
-#: ../clients/common/settings-docs.h.in:126
+#: ../clients/common/settings-docs.h.in:133
+msgid "Set the number of IGMP queries to send during startup phase."
+msgstr ""
+"Встановити кількість запитів IGMP, які слід надіслати під час початкової фази."
+
+#: ../clients/common/settings-docs.h.in:134
+msgid ""
+"Sets the time (in deciseconds) between queries sent out at startup to "
+"determine membership information."
+msgstr ""
+"Встановити час (у децисекундах) між надсиланнями запитів під час запуску для"
+" визначення інформації щодо членства."
+
+#: ../clients/common/settings-docs.h.in:135
 msgid ""
 "Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower "
 "values are \"better\"; the lowest priority bridge will be elected the root "
@@ -7729,14 +7797,14 @@ msgstr ""
 "пріоритетнішими; місток із найменшим значенням пріоритетності буде вибрано "
 "як кореневий місток."
 
-#: ../clients/common/settings-docs.h.in:127
+#: ../clients/common/settings-docs.h.in:136
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
 msgstr ""
 "Керує тим, чи увімкнено протокол пересування ієрархією (STP) для цього "
 "містка."
 
-#: ../clients/common/settings-docs.h.in:128
+#: ../clients/common/settings-docs.h.in:137
 msgid ""
 "The default PVID for the ports of the bridge, that is the VLAN id assigned "
 "to incoming untagged frames."
@@ -7744,11 +7812,11 @@ msgstr ""
 "Типовий PVID для портів містка. Це ідентифікатор VLAN, який пов'язано із "
 "вхідними кадрами без міток."
 
-#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.h.in:138
 msgid "Control whether VLAN filtering is enabled on the bridge."
 msgstr "Керування тим, чи увімкнено фільтрування VLAN на містку."
 
-#: ../clients/common/settings-docs.h.in:130
+#: ../clients/common/settings-docs.h.in:139
 msgid ""
 "If specified, the protocol used for VLAN filtering. Supported values are: "
 "'802.1Q', '802.1ad'. If not specified the default value is '802.1Q'."
@@ -7757,11 +7825,11 @@ msgstr ""
 "Підтримувані значення: «802.1Q», «802.1ad». Якщо не вказано, типовим "
 "значенням буде «802.1Q»."
 
-#: ../clients/common/settings-docs.h.in:131
+#: ../clients/common/settings-docs.h.in:140
 msgid "Controls whether per-VLAN stats accounting is enabled."
 msgstr "Керує тим, чи увімкнено облік статистичних даних для окремих VLAN."
 
-#: ../clients/common/settings-docs.h.in:132
+#: ../clients/common/settings-docs.h.in:141
 msgid ""
 "Array of bridge VLAN objects. In addition to the VLANs specified here, the "
 "bridge will also have the default-pvid VLAN configured  by the bridge.vlan-"
@@ -7778,7 +7846,7 @@ msgstr ""
 "від 1 до 4094, або діапазон, який визначається парою ідентифікаторів, які "
 "відокремлено дефісом."
 
-#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.h.in:142
 msgid ""
 "Enables or disables \"hairpin mode\" for the port, which allows frames to be "
 "sent back out through the port the frame was received on."
@@ -7786,19 +7854,19 @@ msgstr ""
 "Вмикає або вимикає «режим початкової зони» для порту, що уможливлює зворотне "
 "надсилання кадрів крізь порт, з якого було отримано кадр."
 
-#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.h.in:143
 msgid ""
 "The Spanning Tree Protocol (STP) port cost for destinations via this port."
 msgstr ""
 "Вартість порту у протоколі пересування ієрархією (STP) для призначень, що "
 "маршрутизуються через цей порт."
 
-#: ../clients/common/settings-docs.h.in:135
+#: ../clients/common/settings-docs.h.in:144
 msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
 msgstr ""
 "Пріоритетність протоколу пересування ієрархією (STP) цього порту містка."
 
-#: ../clients/common/settings-docs.h.in:136
+#: ../clients/common/settings-docs.h.in:145
 msgid ""
 "Array of bridge VLAN objects. In addition to the VLANs specified here, the "
 "port will also have the default-pvid VLAN configured on the bridge by the "
@@ -7815,9 +7883,9 @@ msgstr ""
 "від 1 до 4094, або діапазон, який визначається парою ідентифікаторів, які "
 "відокремлено дефісом."
 
-#: ../clients/common/settings-docs.h.in:137
-#: ../clients/common/settings-docs.h.in:186
-#: ../clients/common/settings-docs.h.in:197
+#: ../clients/common/settings-docs.h.in:146
+#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.h.in:206
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
@@ -7825,7 +7893,7 @@ msgstr ""
 "Якщо має ненульове значення, передавати пакети лише вказаного або меншого "
 "розміру, розбиваючи великі пакети на декілька кадрів."
 
-#: ../clients/common/settings-docs.h.in:138
+#: ../clients/common/settings-docs.h.in:147
 msgid ""
 "The number to dial to establish the connection to the CDMA-based mobile "
 "broadband network, if any.  If not specified, the default number (#777) is "
@@ -7835,8 +7903,8 @@ msgstr ""
 "широкосмуговою мережею на основі CDMA, якщо такий передбачено. Якщо не "
 "вказано, буде використано типовий номер (#777)."
 
-#: ../clients/common/settings-docs.h.in:139
-#: ../clients/common/settings-docs.h.in:189
+#: ../clients/common/settings-docs.h.in:148
+#: ../clients/common/settings-docs.h.in:198
 msgid ""
 "The password used to authenticate with the network, if required.  Many "
 "providers do not require a password, or accept any password.  But if a "
@@ -7846,8 +7914,8 @@ msgstr ""
 "Багато надавачів послуг не вимагають надання пароля або приймають будь-який "
 "пароль. Втім, якщо пароль потрібен, його слід вказати тут."
 
-#: ../clients/common/settings-docs.h.in:141
-#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.h.in:204
 msgid ""
 "The username used to authenticate with the network, if required.  Many "
 "providers do not require a username, or accept any username.  But if a "
@@ -7858,7 +7926,7 @@ msgstr ""
 "приймають будь-яке ім'я користувача. Втім, якщо ім'я користувача потрібне, "
 "його слід вказати тут."
 
-#: ../clients/common/settings-docs.h.in:142
+#: ../clients/common/settings-docs.h.in:151
 msgid ""
 "The number of retries for the authentication. Zero means to try "
 "indefinitely; -1 means to use a global default. If the global default is not "
@@ -7872,7 +7940,7 @@ msgstr ""
 "неможливість встановлення з'єднання. У поточній версії стосується лише до "
 "розпізнавання за протоколом 802-1x."
 
-#: ../clients/common/settings-docs.h.in:143
+#: ../clients/common/settings-docs.h.in:152
 msgid ""
 "Whether or not the connection should be automatically connected by "
 "NetworkManager when the resources for the connection are available. TRUE to "
@@ -7889,7 +7957,7 @@ msgstr ""
 "якщо потрібна альтернатива для автоматичного встановлення з'єднань для "
 "профілів VPN."
 
-#: ../clients/common/settings-docs.h.in:144
+#: ../clients/common/settings-docs.h.in:153
 msgid ""
 "The autoconnect priority. If the connection is set to autoconnect, "
 "connections with higher priority will be preferred. Defaults to 0. The "
@@ -7900,7 +7968,7 @@ msgstr ""
 "пріоритетністю Типовим значенням пріоритетності є 0. Більші значення "
 "означають вищу пріоритетність."
 
-#: ../clients/common/settings-docs.h.in:145
+#: ../clients/common/settings-docs.h.in:154
 msgid ""
 "The number of times a connection should be tried when autoactivating before "
 "giving up. Zero means forever, -1 means the global default (4 times if not "
@@ -7915,7 +7983,7 @@ msgstr ""
 "виконуватиметься лише один раз. Зауважте, що по завершенню часу очікування "
 "NetworkManager знову спробує встановити з'єднання у автоматичному режимі."
 
-#: ../clients/common/settings-docs.h.in:146
+#: ../clients/common/settings-docs.h.in:155
 msgid ""
 "Whether or not slaves of this connection should be automatically brought up "
 "when NetworkManager activates this connection. This only has a real effect "
@@ -7937,7 +8005,7 @@ msgstr ""
 "slaves. Якщо і для нього встановлено типове значення, використовується "
 "значення 0."
 
-#: ../clients/common/settings-docs.h.in:147
+#: ../clients/common/settings-docs.h.in:156
 msgid ""
 "If greater than zero, delay success of IP addressing until either the "
 "timeout is reached, or an IP gateway replies to a ping."
@@ -7946,7 +8014,7 @@ msgstr ""
 "встановлення адреси IP, доки або не буде вичерпано час очікування або шлюз "
 "IP відповість на надісланий йому сигнал."
 
-#: ../clients/common/settings-docs.h.in:148
+#: ../clients/common/settings-docs.h.in:157
 msgid ""
 "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
 "or \"T-Mobile 3G\"."
@@ -7954,7 +8022,7 @@ msgstr ""
 "Зручний для читання ідентифікатор для цього з'єднання, наприклад «Робочий Wi-"
 "Fi» або «T-Mobile 3G»."
 
-#: ../clients/common/settings-docs.h.in:149
+#: ../clients/common/settings-docs.h.in:158
 msgid ""
 "The name of the network interface this connection is bound to. If not set, "
 "then the connection can be attached to any interface of the appropriate type "
@@ -7977,11 +8045,11 @@ msgstr ""
 "з'єднання. Якщо змінюється назва інтерфейсу або перевпорядковується список "
 "з'єднань, з'єднання може бути застосовано до помилкового інтерфейсу."
 
-#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.h.in:159
 msgid "Whether LLDP is enabled for the connection."
 msgstr "Визначає, чи увімкнено LLDP для з'єднання."
 
-#: ../clients/common/settings-docs.h.in:151
+#: ../clients/common/settings-docs.h.in:160
 msgid ""
 "Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the "
 "connection. LLMNR is a protocol based on the Domain Name System (DNS) packet "
@@ -8007,11 +8075,11 @@ msgstr ""
 "буде, параметр ні на що не впливатиме. Одним з таких додатків є dns-systemd-"
 "resolved."
 
-#: ../clients/common/settings-docs.h.in:152
+#: ../clients/common/settings-docs.h.in:161
 msgid "Interface name of the master device or UUID of the master connection."
 msgstr "Назва інтерфейсу основного пристрою або UUID основного з'єднання."
 
-#: ../clients/common/settings-docs.h.in:153
+#: ../clients/common/settings-docs.h.in:162
 msgid ""
 "Whether mDNS is enabled for the connection. The permitted values are: \"yes"
 "\" (2) register hostname and resolving for the connection, \"no\" (0) "
@@ -8033,7 +8101,7 @@ msgstr ""
 "буде, параметр ні на що не впливатиме. Одним з таких додатків є dns-systemd-"
 "resolved."
 
-#: ../clients/common/settings-docs.h.in:154
+#: ../clients/common/settings-docs.h.in:163
 msgid ""
 "Whether the connection is metered. When updating this property on a "
 "currently activated connection, the change takes effect immediately."
@@ -8042,7 +8110,7 @@ msgstr ""
 "властивість для поточного активованого з'єднання, зміни набудуть чинності "
 "негайно."
 
-#: ../clients/common/settings-docs.h.in:155
+#: ../clients/common/settings-docs.h.in:164
 msgid ""
 "If configured, set to a Manufacturer Usage Description (MUD) URL that points "
 "to manufacturer-recommended network policies for IoT devices. It is "
@@ -8052,17 +8120,17 @@ msgid ""
 "(the default), a global connection default gets consulted. If still "
 "unspecified, the ultimate default is \"none\"."
 msgstr ""
-"Якщо налаштовано, встановлює значення адреси опису використання виробника"
-" (MUD), яка вказує на рекомендовані виробником правила роботи у мережі для"
-" пристрої інтернету речей. Передається як параметр DHCPv4 або DHCPv6."
-" Значення має бути коректною адресою, що починається з «https://». Можна"
-" використовувати особливе значення «none» для позначення того, що адреса MUD"
-" не використовується. Якщо значення для окремих профілів не вказано (типовий"
-" варіант), значення буде взято із типових параметрів загального з'єднання."
-" Якщо встановити значення за типовими параметрами не вдасться, остаточним"
-" типовим варіантом буде вибрано «none»."
+"Якщо налаштовано, встановлює значення адреси опису використання виробника "
+"(MUD), яка вказує на рекомендовані виробником правила роботи у мережі для "
+"пристрої інтернету речей. Передається як параметр DHCPv4 або DHCPv6. "
+"Значення має бути коректною адресою, що починається з «https://». Можна "
+"використовувати особливе значення «none» для позначення того, що адреса MUD "
+"не використовується. Якщо значення для окремих профілів не вказано (типовий "
+"варіант), значення буде взято із типових параметрів загального з'єднання. "
+"Якщо встановити значення за типовими параметрами не вдасться, остаточним "
+"типовим варіантом буде вибрано «none»."
 
-#: ../clients/common/settings-docs.h.in:156
+#: ../clients/common/settings-docs.h.in:165
 msgid ""
 "Specifies whether the profile can be active multiple times at a particular "
 "moment. The value is of type NMConnectionMultiConnect."
@@ -8070,7 +8138,7 @@ msgstr ""
 "Визначає, чи може бути профіль активним для декількох з'єднань одночасно. "
 "Значення належить до типу NMConnectionMultiConnect."
 
-#: ../clients/common/settings-docs.h.in:157
+#: ../clients/common/settings-docs.h.in:166
 msgid ""
 "An array of strings defining what access a given user has to this "
 "connection.  If this is NULL or empty, all users are allowed to access this "
@@ -8100,7 +8168,7 @@ msgstr ""
 "використано у майбутньому. Усі значення, [тип], [ідентифікатор] і "
 "[зарезервоване значення], мають бути коректними рядками UTF-8."
 
-#: ../clients/common/settings-docs.h.in:158
+#: ../clients/common/settings-docs.h.in:167
 msgid ""
 "FALSE if the connection can be modified using the provided settings "
 "service's D-Bus interface with the right privileges, or TRUE if the "
@@ -8111,7 +8179,7 @@ msgstr ""
 "якщо параметри з'єднання є придатними лише для читання, і їх не можна "
 "змінювати."
 
-#: ../clients/common/settings-docs.h.in:159
+#: ../clients/common/settings-docs.h.in:168
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
@@ -8119,7 +8187,7 @@ msgstr ""
 "Список UUID з'єднань, які має бути активовано, якщо активовано базове "
 "з'єднання. У поточній версії передбачено підтримку лише з'єднань VPN."
 
-#: ../clients/common/settings-docs.h.in:160
+#: ../clients/common/settings-docs.h.in:169
 msgid ""
 "Setting name of the device type of this slave's master connection (eg, \"bond"
 "\"), or NULL if this connection is not a slave."
@@ -8127,7 +8195,7 @@ msgstr ""
 "Встановлює назву типу пристрою для основного з'єднання цього підлеглого "
 "з'єднання (наприклад «bond») або NULL, якщо це з'єднання не є підлеглим."
 
-#: ../clients/common/settings-docs.h.in:161
+#: ../clients/common/settings-docs.h.in:170
 msgid ""
 "This represents the identity of the connection used for various purposes. It "
 "allows to configure multiple profiles to share the identity. Also, the "
@@ -8193,7 +8261,7 @@ msgstr ""
 "алгоритму для «${CONNECTION}», і використано унікальний фіксований "
 "ідентифікатор для з'єднання."
 
-#: ../clients/common/settings-docs.h.in:162
+#: ../clients/common/settings-docs.h.in:171
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
@@ -8207,7 +8275,7 @@ msgstr ""
 "активного з'єднання найсвіжішої часової позначки. Властивість можна лише "
 "читати (зміни до цієї властивості не зберігатимуться)."
 
-#: ../clients/common/settings-docs.h.in:163
+#: ../clients/common/settings-docs.h.in:172
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
@@ -8221,7 +8289,7 @@ msgstr ""
 "з'єднань VPN та інших має містити назву параметра відповідного типу "
 "параметрів (тобто «vpn» або «bridge» тощо)."
 
-#: ../clients/common/settings-docs.h.in:164
+#: ../clients/common/settings-docs.h.in:173
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -8243,7 +8311,7 @@ msgstr ""
 "«2815492f-7e56-435e-b2e9-246bd7cdc664» (тобто у форматі запису, який містить "
 "лише шістнадцяткові цифри і символи «-»)."
 
-#: ../clients/common/settings-docs.h.in:165
+#: ../clients/common/settings-docs.h.in:174
 msgid ""
 "Timeout in milliseconds to wait for device at startup. During boot, devices "
 "may take a while to be detected by the driver. This property will cause to "
@@ -8263,7 +8331,7 @@ msgstr ""
 "значенням є -1, що у поточній версії означає, що очікування на запуск "
 "пристрою не буде."
 
-#: ../clients/common/settings-docs.h.in:166
+#: ../clients/common/settings-docs.h.in:175
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
@@ -8277,7 +8345,7 @@ msgstr ""
 "брандмауером. Якщо ця властивість оновлюється для поточного активованого "
 "з'єднання, зміни набудуть чинності негайно."
 
-#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.h.in:176
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8287,11 +8355,11 @@ msgstr ""
 "будь-яка комбінація NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.h.in:177
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
 msgstr "Режим контролера FCoE; або «fabric» (типовий), або «vn2vn»."
 
-#: ../clients/common/settings-docs.h.in:169
+#: ../clients/common/settings-docs.h.in:178
 msgid ""
 "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
 "default priority.  Only used when the \"app-fcoe-flags\" property includes "
@@ -8302,7 +8370,7 @@ msgstr ""
 "лише якщо до властивості «app-fcoe-flags» включає прапорець "
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)."
 
-#: ../clients/common/settings-docs.h.in:170
+#: ../clients/common/settings-docs.h.in:179
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8312,7 +8380,7 @@ msgstr ""
 "будь-якою комбінацією NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:171
+#: ../clients/common/settings-docs.h.in:180
 msgid ""
 "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
 "default priority.  Only used when the \"app-fip-flags\" property includes "
@@ -8323,7 +8391,7 @@ msgstr ""
 "лише якщо до властивості «app-fip-flags» включає прапорець "
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)."
 
-#: ../clients/common/settings-docs.h.in:172
+#: ../clients/common/settings-docs.h.in:181
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8333,7 +8401,7 @@ msgstr ""
 "будь-якою комбінацією NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:173
+#: ../clients/common/settings-docs.h.in:182
 msgid ""
 "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
 "default priority. Only used when the \"app-iscsi-flags\" property includes "
@@ -8344,7 +8412,7 @@ msgstr ""
 "лише якщо до властивості «app-iscsi-flags» включає прапорець "
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)."
 
-#: ../clients/common/settings-docs.h.in:174
+#: ../clients/common/settings-docs.h.in:183
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
@@ -8358,7 +8426,7 @@ msgstr ""
 "може використовувати. Сума усіх значень у межах однієї групи має складати "
 "100 відсотків."
 
-#: ../clients/common/settings-docs.h.in:175
+#: ../clients/common/settings-docs.h.in:184
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the corresponding "
@@ -8368,7 +8436,7 @@ msgstr ""
 "користувача (від 0 до 7), а значення відповідає за те, чи має відповідна "
 "пріоритетність передавати паузу пріоритетності."
 
-#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.h.in:185
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8378,7 +8446,7 @@ msgstr ""
 "Прапорці можуть бути будь-якою комбінацією NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:186
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the Priority "
 "Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
@@ -8390,7 +8458,7 @@ msgstr ""
 "каналу з'єднання, яку пов'язано із відповідною групою. Допустимими є "
 "значення від 0 до 100. Сума усіх значень має складати 100 відсотків."
 
-#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.h.in:187
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -8400,7 +8468,7 @@ msgstr ""
 "будь-якою комбінацією NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2) і NM_SETTING_DCB_FLAG_WILLING (0x4)"
 
-#: ../clients/common/settings-docs.h.in:179
+#: ../clients/common/settings-docs.h.in:188
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed "
@@ -8411,7 +8479,7 @@ msgstr ""
 "пріоритетності. Дозволеними значенням ідентифікатора групи пріоритетності є "
 "значення від 0 до 7 або 15 для групи без обмежень."
 
-#: ../clients/common/settings-docs.h.in:180
+#: ../clients/common/settings-docs.h.in:189
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the priority may use "
@@ -8422,7 +8490,7 @@ msgstr ""
 "пріоритетність використовувати усю ширину каналу, пов'язаного із відповідною "
 "групою."
 
-#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.h.in:190
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
@@ -8432,7 +8500,7 @@ msgstr ""
 "користувача (0 - 7), а значення відповідає за клас передавання даних (від 0 "
 "до 7), із яким пов'язано пріоритетність."
 
-#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.h.in:191
 msgid ""
 "The GPRS Access Point Name specifying the APN used when establishing a data "
 "session with the GSM-based network.  The APN often determines how the user "
@@ -8450,7 +8518,7 @@ msgstr ""
 "користувача важливо використовувати належну APN. Назва APN може складатися "
 "лише із символів a-z, 0-9, . та - за стандартом GSM 03.60, розділ 14.9."
 
-#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.h.in:192
 msgid ""
 "When TRUE, the settings such as APN, username, or password will default to "
 "values that match the network the modem will register to in the Mobile "
@@ -8461,7 +8529,7 @@ msgstr ""
 "зареєстровано модем у бази даних надавачів послуг мобільного широкосмугового "
 "доступу до інтернету."
 
-#: ../clients/common/settings-docs.h.in:184
+#: ../clients/common/settings-docs.h.in:193
 msgid ""
 "The device unique identifier (as given by the WWAN management service) which "
 "this connection applies to.  If given, the connection will only apply to the "
@@ -8471,7 +8539,7 @@ msgstr ""
 "WWAN), до якого застосовується це з'єднання. Якщо вказано, з'єднання "
 "застосовуватиметься лише для вказаного пристрою."
 
-#: ../clients/common/settings-docs.h.in:185
+#: ../clients/common/settings-docs.h.in:194
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
@@ -8479,7 +8547,7 @@ msgstr ""
 "Якщо має значення TRUE, буде дозволено лише з'єднання із домашньою мережею. "
 "З'єднання із мережами роумінґу не виконуватимуться."
 
-#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.h.in:196
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
@@ -8494,7 +8562,7 @@ msgstr ""
 "роумінґовою мережею, якщо керування роумінґом пристрою у інший спосіб "
 "неможливе."
 
-#: ../clients/common/settings-docs.h.in:188
+#: ../clients/common/settings-docs.h.in:197
 msgid ""
 "Legacy setting that used to help establishing PPP data sessions for GSM-"
 "based modems. Deprecated: 1"
@@ -8502,7 +8570,7 @@ msgstr ""
 "Застарілий параметр, який використовувався для полегшення встановлення "
 "сеансів обміну даними PPP для модемів на основі технології GSM. Застарілий: 1"
 
-#: ../clients/common/settings-docs.h.in:191
+#: ../clients/common/settings-docs.h.in:200
 msgid ""
 "If the SIM is locked with a PIN it must be unlocked before any other "
 "operations are requested.  Specify the PIN here to allow operation of the "
@@ -8512,7 +8580,7 @@ msgstr ""
 "виконувати будь-які інші дії. Тут слід вказати PIN-код, який відкриває "
 "доступ до дій із пристроєм."
 
-#: ../clients/common/settings-docs.h.in:193
+#: ../clients/common/settings-docs.h.in:202
 msgid ""
 "The SIM card unique identifier (as given by the WWAN management service) "
 "which this connection applies to.  If given, the connection will apply to "
@@ -8524,7 +8592,7 @@ msgstr ""
 "застосовуватиметься до будь-якого пристрою, який також дозволено «device-"
 "id», де міститься значення відповідності SIM-картки вказаному ідентифікатору."
 
-#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.h.in:203
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
@@ -8537,7 +8605,7 @@ msgstr ""
 "властивостями «device-id» і «sim-id» і який містить SIM-картку, яку випущено "
 "вказаним оператором."
 
-#: ../clients/common/settings-docs.h.in:196
+#: ../clients/common/settings-docs.h.in:205
 msgid ""
 "If specified, this connection will only apply to the IPoIB device whose "
 "permanent MAC address matches. This property does not change the MAC address "
@@ -8547,7 +8615,7 @@ msgstr ""
 "відповідною сталою адресою MAC. Ця властивість не змінює MAC-адреси пристрою "
 "(таку зміну називають підміною MAC)."
 
-#: ../clients/common/settings-docs.h.in:198
+#: ../clients/common/settings-docs.h.in:207
 msgid ""
 "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
 "default P_Key (aka \"the P_Key at index 0\").  Otherwise it is a 16-bit "
@@ -8558,7 +8626,7 @@ msgstr ""
 "Інші значення має бути вказано у форматі 16-бітового цілого числа без знаку, "
 "старший біт якого дорівнює одиниці, якщо P_Key є ключем «повного членства»."
 
-#: ../clients/common/settings-docs.h.in:199
+#: ../clients/common/settings-docs.h.in:208
 msgid ""
 "The interface name of the parent device of this device. Normally NULL, but "
 "if the \"p_key\" property is set, then you must specify the base device by "
@@ -8569,14 +8637,14 @@ msgstr ""
 "вказати базовий пристрій або встановленням значення для цієї властивості, "
 "або встановленням значення для властивості «mac-address»."
 
-#: ../clients/common/settings-docs.h.in:200
+#: ../clients/common/settings-docs.h.in:209
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr ""
 "Режим передавання IP-over-InfiniBand. Можливі значення: «datagram» або "
 "«connected»."
 
-#: ../clients/common/settings-docs.h.in:201
+#: ../clients/common/settings-docs.h.in:210
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
@@ -8584,7 +8652,7 @@ msgstr ""
 "Кількість додаткових рівнів вкладеності, які дозволено дописувати до "
 "пакетів. Цю властивість стосується лише тунелів IPv6."
 
-#: ../clients/common/settings-docs.h.in:202
+#: ../clients/common/settings-docs.h.in:211
 msgid ""
 "Tunnel flags. Currently the following values are supported: "
 "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
@@ -8602,14 +8670,14 @@ msgstr ""
 "(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). Ці значення є "
 "коректними лише для тунелів IPv6."
 
-#: ../clients/common/settings-docs.h.in:203
+#: ../clients/common/settings-docs.h.in:212
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
 msgstr ""
 "Мітка потоку для пакетів тунелю. Ця властивість стосується лише тунелів IPv6."
 
-#: ../clients/common/settings-docs.h.in:204
+#: ../clients/common/settings-docs.h.in:213
 msgid ""
 "The key used for tunnel input packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
@@ -8618,7 +8686,7 @@ msgstr ""
 "лише для певних режимів роботи тунелю (GRE, IP6GRE). Якщо порожній, ключ не "
 "використовується."
 
-#: ../clients/common/settings-docs.h.in:205
+#: ../clients/common/settings-docs.h.in:214
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
@@ -8626,7 +8694,7 @@ msgstr ""
 "Локальна кінцева точка тунелю; значення може бути порожнім або має містити "
 "адресу IPv4 або IPv6."
 
-#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:215
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
@@ -8634,7 +8702,7 @@ msgstr ""
 "Режим тунелювання, наприклад NM_IP_TUNNEL_MODE_IPIP (1) або "
 "NM_IP_TUNNEL_MODE_GRE (2)."
 
-#: ../clients/common/settings-docs.h.in:207
+#: ../clients/common/settings-docs.h.in:216
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
@@ -8642,7 +8710,7 @@ msgstr ""
 "Якщо має ненульове значення, передавати пакети лише вказаного або меншого "
 "розміру, розбиваючи великі пакети на декілька фрагментів."
 
-#: ../clients/common/settings-docs.h.in:208
+#: ../clients/common/settings-docs.h.in:217
 msgid ""
 "The key used for tunnel output packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
@@ -8651,7 +8719,7 @@ msgstr ""
 "чинною лише для певних режимів роботи тунелю (GRE, IP6GRE). Якщо порожній, "
 "ключ не використовується."
 
-#: ../clients/common/settings-docs.h.in:209
+#: ../clients/common/settings-docs.h.in:218
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID the "
 "new device will be bound to so that tunneled packets will only be routed via "
@@ -8661,18 +8729,18 @@ msgstr ""
 "з'єднання, до якого буде прив'язано новий пристрій так, що тунельовані "
 "пакети маршрутизуватимуться лише крізь цей інтерфейс."
 
-#: ../clients/common/settings-docs.h.in:210
+#: ../clients/common/settings-docs.h.in:219
 msgid "Whether to enable Path MTU Discovery on this tunnel."
 msgstr "Визначає, чи слід вмикати Path MTU Discovery для цього тунелю."
 
-#: ../clients/common/settings-docs.h.in:211
+#: ../clients/common/settings-docs.h.in:220
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
 msgstr ""
 "Віддалена кінцева точка тунелю; значення має містити адресу IPv4 або IPv6."
 
-#: ../clients/common/settings-docs.h.in:212
+#: ../clients/common/settings-docs.h.in:221
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
@@ -8680,7 +8748,7 @@ msgstr ""
 "Поле типу служби (IPv4) або класу передавання даних (IPv6), яке слід "
 "встановити для тунельованих пакетів."
 
-#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.h.in:222
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
@@ -8688,13 +8756,13 @@ msgstr ""
 "Значення TTL, яке слід призначити для тунельованих пакетів. 0 — спеціальне "
 "значення, яке означає, що пакети успадковують значення TTL."
 
-#: ../clients/common/settings-docs.h.in:214
-#: ../clients/common/settings-docs.h.in:237
+#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.h.in:246
 msgid "Array of IP addresses."
 msgstr "Масив IP-адрес."
 
-#: ../clients/common/settings-docs.h.in:215
-#: ../clients/common/settings-docs.h.in:238
+#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.h.in:247
 msgid ""
 "Timeout in milliseconds used to check for the presence of duplicate IP "
 "addresses on the network.  If an address conflict is detected, the "
@@ -8711,7 +8779,7 @@ msgstr ""
 "перевищує нуль, вважатиметься часом очікування у мілісекундах. Цю "
 "властивість у поточній версії реалізовано лише для IPv4."
 
-#: ../clients/common/settings-docs.h.in:216
+#: ../clients/common/settings-docs.h.in:225
 msgid ""
 "A string sent to the DHCP server to identify the local machine which the "
 "DHCP server may use to customize the DHCP lease and options. When the "
@@ -8755,7 +8823,7 @@ msgstr ""
 "налаштоване значення. Якщо і це значення не налаштовано, типове значення "
 "залежатиме від додатка DHCP."
 
-#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.h.in:226
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -8765,8 +8833,8 @@ msgstr ""
 "адреси до сервера DHCP буде надіслано вказану FDQN. Цю властивість не можна "
 "використовувати разом із властивістю «dhcp-hostname»."
 
-#: ../clients/common/settings-docs.h.in:218
-#: ../clients/common/settings-docs.h.in:240
+#: ../clients/common/settings-docs.h.in:227
+#: ../clients/common/settings-docs.h.in:249
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -8776,8 +8844,8 @@ msgstr ""
 "адреси до сервера DHCP буде надіслано вказану назву. Цю властивість не можна "
 "використовувати разом із властивістю «dhcp-fqdn»."
 
-#: ../clients/common/settings-docs.h.in:219
-#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:250
 msgid ""
 "Flags for the DHCP hostname and FQDN. Currently this property only includes "
 "flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN "
@@ -8814,8 +8882,8 @@ msgstr ""
 "NM_DHCP_HOSTNAME_FLAG_NONE (0x0), у запитах DHCP надсилатимуться стандартні "
 "прапорці FQDN, описані вище."
 
-#: ../clients/common/settings-docs.h.in:220
-#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.h.in:251
 msgid ""
 "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 "
@@ -8844,8 +8912,8 @@ msgstr ""
 "буде проігноровано у dhclient, який завжди визначає IAID на основі MAC-"
 "адреси."
 
-#: ../clients/common/settings-docs.h.in:221
-#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.h.in:230
+#: ../clients/common/settings-docs.h.in:252
 msgid ""
 "If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
 "DHCP servers use this hostname to update DNS databases, essentially "
@@ -8860,8 +8928,8 @@ msgstr ""
 "властивості вказано значення TRUE, буде надіслано поточну стану назву вузла "
 "комп'ютера."
 
-#: ../clients/common/settings-docs.h.in:222
-#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:253
 msgid ""
 "A timeout for a DHCP transaction in seconds. If zero (the default), a "
 "globally configured default is used. If still unspecified, a device specific "
@@ -8875,13 +8943,13 @@ msgstr ""
 "секунд). Встановіть значення 2147483647 (MAXINT32), якщо час очікування має "
 "бути необмеженим."
 
-#: ../clients/common/settings-docs.h.in:223
-#: ../clients/common/settings-docs.h.in:245
+#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.h.in:254
 msgid "Array of IP addresses of DNS servers."
 msgstr "Масив IP-адрес серверів DNS."
 
-#: ../clients/common/settings-docs.h.in:224
-#: ../clients/common/settings-docs.h.in:246
+#: ../clients/common/settings-docs.h.in:233
+#: ../clients/common/settings-docs.h.in:255
 msgid ""
 "Array of DNS options as described in man 5 resolv.conf. NULL means that the "
 "options are unset and left at the default. In this case NetworkManager will "
@@ -8894,19 +8962,19 @@ msgid ""
 "servers to resolv.conf, and if all contributing profiles have \"trust-ad\" "
 "enabled."
 msgstr ""
-"Масив параметрів DNS, який описано на сторінці підручника (man 5)"
-" resolv.conf. NULL означає, що параметри не встановлено і NetworkManager слід"
-" використовувати типове значення. Варіант з NULL не є тим самим, що"
-" визначення порожнього списку властивостей. У поточній версії передбачено"
-" підтримку варіантів значень «attempts», «debug», «edns0», «inet6»,"
-" «ip6-bytestring», «ip6-dotint», «ndots», «no-check-names», «no-ip6-dotint»,"
-" «no-reload», «no-tld-query», «rotate», «single-request»,"
-" «single-request-reopen», «timeout», «trust-ad», «use-vc». Варіант «trust-ad»"
-" буде взято до уваги, лише якщо профіль вказує сервери назв у resolv.conf і"
-" для всіх відповідних профілів увімкнено «trust-ad»."
+"Масив параметрів DNS, який описано на сторінці підручника (man 5) resolv."
+"conf. NULL означає, що параметри не встановлено і NetworkManager слід "
+"використовувати типове значення. Варіант з NULL не є тим самим, що "
+"визначення порожнього списку властивостей. У поточній версії передбачено "
+"підтримку варіантів значень «attempts», «debug», «edns0», «inet6», «ip6-"
+"bytestring», «ip6-dotint», «ndots», «no-check-names», «no-ip6-dotint», «no-"
+"reload», «no-tld-query», «rotate», «single-request», «single-request-"
+"reopen», «timeout», «trust-ad», «use-vc». Варіант «trust-ad» буде взято до "
+"уваги, лише якщо профіль вказує сервери назв у resolv.conf і для всіх "
+"відповідних профілів увімкнено «trust-ad»."
 
-#: ../clients/common/settings-docs.h.in:225
-#: ../clients/common/settings-docs.h.in:247
+#: ../clients/common/settings-docs.h.in:234
+#: ../clients/common/settings-docs.h.in:256
 msgid ""
 "DNS servers priority. The relative priority for DNS servers specified by "
 "this setting.  A lower value is better (higher priority). Zero selects a "
@@ -8962,8 +9030,8 @@ msgstr ""
 "домен, який є піддоменом іншого домену із від'ємним значенням пріоритетності "
 "DNS, цей піддомен буде проігноровано."
 
-#: ../clients/common/settings-docs.h.in:226
-#: ../clients/common/settings-docs.h.in:248
+#: ../clients/common/settings-docs.h.in:235
+#: ../clients/common/settings-docs.h.in:257
 msgid ""
 "Array of DNS search domains. Domains starting with a tilde ('~') are "
 "considered 'routing' domains and are used only to decide the interface over "
@@ -8975,8 +9043,8 @@ msgstr ""
 "визначення інтерфейсу, крізь який слід спрямовувати запит; такі записи не "
 "використовуватимуться для доповнення неповних назв вузлів."
 
-#: ../clients/common/settings-docs.h.in:227
-#: ../clients/common/settings-docs.h.in:249
+#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.h.in:258
 msgid ""
 "The gateway associated with this configuration. This is only meaningful if "
 "\"addresses\" is also set. The gateway's main purpose is to control the next "
@@ -8985,15 +9053,15 @@ msgid ""
 "configuration is set to never-default. As an alternative to set the gateway, "
 "configure a static default route with /0 as prefix length."
 msgstr ""
-"Шлюз, який пов'язано із цими налаштуваннями. Має значення, лише якщо вказано"
-" «addresses». Основним призначенням шлюзу є керування наступним переходом у"
-" стандартному типовому маршруті на пристрої. Отже, властивість шлюз"
-" конфліктує із «never-default» — її буде автоматично відкинуто, якщо для"
-" налаштувань IP вказано never-default. Альтернативою встановленню шлюзу є"
-" налаштовування статичного типового маршруту з довжиною префікса /0."
+"Шлюз, який пов'язано із цими налаштуваннями. Має значення, лише якщо вказано "
+"«addresses». Основним призначенням шлюзу є керування наступним переходом у "
+"стандартному типовому маршруті на пристрої. Отже, властивість шлюз "
+"конфліктує із «never-default» — її буде автоматично відкинуто, якщо для "
+"налаштувань IP вказано never-default. Альтернативою встановленню шлюзу є "
+"налаштовування статичного типового маршруту з довжиною префікса /0."
 
-#: ../clients/common/settings-docs.h.in:228
-#: ../clients/common/settings-docs.h.in:250
+#: ../clients/common/settings-docs.h.in:237
+#: ../clients/common/settings-docs.h.in:259
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
@@ -9006,8 +9074,8 @@ msgstr ""
 "пошуку, вказані за допомогою властивостей «dns» і «dns-search», якщо буде "
 "вказано якісь записи серверів і доменів для цих властивостей."
 
-#: ../clients/common/settings-docs.h.in:229
-#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.h.in:238
+#: ../clients/common/settings-docs.h.in:260
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
@@ -9018,8 +9086,8 @@ msgstr ""
 "використовуватимуться лише маршрути, вказані за допомогою властивості "
 "«routes», якщо такі існують."
 
-#: ../clients/common/settings-docs.h.in:230
-#: ../clients/common/settings-docs.h.in:253
+#: ../clients/common/settings-docs.h.in:239
+#: ../clients/common/settings-docs.h.in:262
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -9036,8 +9104,8 @@ msgstr ""
 "NMSettingIP4Config уможливлює успішне налаштовування усієї мережі, якщо не "
 "вдається налаштувати IPv4, але IPv6 налаштовано успішно."
 
-#: ../clients/common/settings-docs.h.in:231
-#: ../clients/common/settings-docs.h.in:254
+#: ../clients/common/settings-docs.h.in:240
+#: ../clients/common/settings-docs.h.in:263
 msgid ""
 "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
 "support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the "
@@ -9066,8 +9134,8 @@ msgstr ""
 "налаштовано на інтерфейсі, який надає спільний доступ до інтернету для "
 "підмережі, а не на з'єднанні, яке надається у спільний доступ."
 
-#: ../clients/common/settings-docs.h.in:232
-#: ../clients/common/settings-docs.h.in:255
+#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.h.in:264
 msgid ""
 "If TRUE, this connection will never be the default connection for this IP "
 "type, meaning it will never be assigned the default route by NetworkManager."
@@ -9076,8 +9144,8 @@ msgstr ""
 "IP, що означає, що його ніколи не буде пов'язано із типовим маршрутом у "
 "NetworkManager."
 
-#: ../clients/common/settings-docs.h.in:233
-#: ../clients/common/settings-docs.h.in:257
+#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.h.in:266
 msgid ""
 "The default metric for routes that don't explicitly specify a metric. The "
 "default value -1 means that the metric is chosen automatically based on the "
@@ -9097,8 +9165,8 @@ msgstr ""
 "насправді означає, що встановлено значення 1024. Для IPv4 нуль є звичайним "
 "значенням для метрики."
 
-#: ../clients/common/settings-docs.h.in:234
-#: ../clients/common/settings-docs.h.in:258
+#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.h.in:267
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -9130,12 +9198,12 @@ msgstr ""
 "таблиці. Так зроблено, щоб зберегти зворотну сумісність для користувачів, "
 "які змінюють таблиці маршрутизації з-поза меж NetworkManager."
 
-#: ../clients/common/settings-docs.h.in:235
-#: ../clients/common/settings-docs.h.in:259
+#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.h.in:268
 msgid "Array of IP routes."
 msgstr "Масив IP-маршрутів."
 
-#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.h.in:245
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -9176,7 +9244,7 @@ msgstr ""
 "конфіденційності, які налаштовуються властивістю «ip6-privacy», і не впливає "
 "на тимчасові адреси, які налаштовано за допомогою відповідної властивості."
 
-#: ../clients/common/settings-docs.h.in:239
+#: ../clients/common/settings-docs.h.in:248
 msgid ""
 "A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp "
 "client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried "
@@ -9233,7 +9301,7 @@ msgstr ""
 "використано загальне значення для «ipv6.dhcp-duid». Якщо загальне значення "
 "не вказано, буде використано типове значення «lease»."
 
-#: ../clients/common/settings-docs.h.in:252
+#: ../clients/common/settings-docs.h.in:261
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -9264,7 +9332,7 @@ msgstr ""
 "увімкнено за допомогою параметра «stable-privacy» властивості «addr-gen-"
 "mode», як інший спосіб уникнути стеження за вузлом за допомогою адрес IPv6."
 
-#: ../clients/common/settings-docs.h.in:256
+#: ../clients/common/settings-docs.h.in:265
 msgid ""
 "A timeout for waiting Router Advertisements in seconds. If zero (the "
 "default), a globally configured default is used. If still unspecified, the "
@@ -9277,7 +9345,7 @@ msgstr ""
 "залежатиме від параметрів sysctl пристрою. Встановіть значення 2147483647 "
 "(MAXINT32), якщо час очікування має бути необмеженим."
 
-#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.h.in:269
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
@@ -9286,22 +9354,22 @@ msgstr ""
 "chown-6man-tokenised-ipv6-identifiers-02. Корисне у поєднанні зі значення "
 "addr-gen-mode eui64."
 
-#: ../clients/common/settings-docs.h.in:261
+#: ../clients/common/settings-docs.h.in:270
 msgid "Whether the transmitted traffic must be encrypted."
 msgstr "Визначає, чи слід шифрувати дані, які передаються."
 
-#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.h.in:271
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
 msgstr ""
 "Попереднього поширений CAK (ключ прив'язки з'єднань) для узгодження ключів "
 "MACsec."
 
-#: ../clients/common/settings-docs.h.in:263
+#: ../clients/common/settings-docs.h.in:272
 msgid "Flags indicating how to handle the \"mka-cak\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «mka-cak»."
 
-#: ../clients/common/settings-docs.h.in:264
+#: ../clients/common/settings-docs.h.in:273
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
@@ -9309,7 +9377,7 @@ msgstr ""
 "Попереднього поширена CKN (назва ключа ключ прив'язки з'єднань) для "
 "узгодження ключів MACsec."
 
-#: ../clients/common/settings-docs.h.in:265
+#: ../clients/common/settings-docs.h.in:274
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
@@ -9317,7 +9385,7 @@ msgstr ""
 "Визначає спосіб отримання CAK (ключа прив'язки з'єднань) для MKA (узгодження "
 "ключів MACsec)."
 
-#: ../clients/common/settings-docs.h.in:266
+#: ../clients/common/settings-docs.h.in:275
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MACSEC interface should be created.  If this property is not "
@@ -9329,7 +9397,7 @@ msgstr ""
 "значення для цієї властивості не вказано, запис з'єднання має містити "
 "параметр «802-3-ethernet» із властивістю «mac-address»."
 
-#: ../clients/common/settings-docs.h.in:267
+#: ../clients/common/settings-docs.h.in:276
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
@@ -9337,17 +9405,17 @@ msgstr ""
 "Компонент порту SCI (ідентифікатора безпечного каналу), значення від 1 до "
 "65534."
 
-#: ../clients/common/settings-docs.h.in:268
+#: ../clients/common/settings-docs.h.in:277
 msgid ""
 "Specifies whether the SCI (Secure Channel Identifier) is included in every "
 "packet."
 msgstr "Вказує, чи включено SCI (Secure Channel Identifier) до кожного пакета."
 
-#: ../clients/common/settings-docs.h.in:269
+#: ../clients/common/settings-docs.h.in:278
 msgid "Specifies the validation mode for incoming frames."
 msgstr "Визначає режим перевірки для вхідних кадрів."
 
-#: ../clients/common/settings-docs.h.in:270
+#: ../clients/common/settings-docs.h.in:279
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
@@ -9355,7 +9423,7 @@ msgstr ""
 "Режим macvlan, який визначає механізм обміну даними між декількома macvlan "
 "на одному пристрої нижнього рівня."
 
-#: ../clients/common/settings-docs.h.in:271
+#: ../clients/common/settings-docs.h.in:280
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MAC-VLAN interface should be created.  If this property is not "
@@ -9367,15 +9435,15 @@ msgstr ""
 "значення для цієї властивості не вказано, запис з'єднання має містити "
 "параметр «802-3-ethernet» із властивістю «mac-address»."
 
-#: ../clients/common/settings-docs.h.in:272
+#: ../clients/common/settings-docs.h.in:281
 msgid "Whether the interface should be put in promiscuous mode."
 msgstr "Визначає, чи слід переводити інтерфейс у нерозбірливий режим."
 
-#: ../clients/common/settings-docs.h.in:273
+#: ../clients/common/settings-docs.h.in:282
 msgid "Whether the interface should be a MACVTAP."
 msgstr "Визначає, чи має бути інтерфейс інтерфейсом MACVTAP."
 
-#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.h.in:283
 msgid ""
 "A list of interface names to match. Each element is a shell wildcard "
 "pattern.  When an element is prefixed with exclamation mark (!) the "
@@ -9392,35 +9460,35 @@ msgstr ""
 "елементів немає; (b) не встановлено відповідності жодному з елементів із "
 "префіксом «!»."
 
-#: ../clients/common/settings-docs.h.in:275
+#: ../clients/common/settings-docs.h.in:284
 msgid "The data path type. One of \"system\", \"netdev\" or empty."
 msgstr ""
 "Тип шляху до даних. Одне з таких значень: «system», «netdev» або порожнє "
 "значення."
 
-#: ../clients/common/settings-docs.h.in:276
+#: ../clients/common/settings-docs.h.in:285
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
 msgstr ""
 "Режим відмови містка. Одне з таких значень: «secure», «standalone» або "
 "порожнє значення."
 
-#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.h.in:286
 msgid "Enable or disable multicast snooping."
 msgstr "Увімкнути або вимкнути переставляння універсальної трансляції."
 
-#: ../clients/common/settings-docs.h.in:278
+#: ../clients/common/settings-docs.h.in:287
 msgid "Enable or disable RSTP."
 msgstr "Увімкнути або вимкнути RSTP."
 
-#: ../clients/common/settings-docs.h.in:279
+#: ../clients/common/settings-docs.h.in:288
 msgid "Enable or disable STP."
 msgstr "Увімкнути або вимкнути STP."
 
-#: ../clients/common/settings-docs.h.in:280
+#: ../clients/common/settings-docs.h.in:289
 msgid "Open vSwitch DPDK device arguments."
 msgstr "Параметри пристрою Open vSwitch DPDK."
 
-#: ../clients/common/settings-docs.h.in:281
+#: ../clients/common/settings-docs.h.in:290
 msgid ""
 "The interface type. Either \"internal\", \"system\", \"patch\", \"dpdk\", or "
 "empty."
@@ -9428,7 +9496,7 @@ msgstr ""
 "Тип інтерфейсу. Рядок «internal», «system», «patch», «dpdk» або порожній "
 "рядок."
 
-#: ../clients/common/settings-docs.h.in:282
+#: ../clients/common/settings-docs.h.in:291
 msgid ""
 "Specifies the unicast destination IP address of a remote Open vSwitch bridge "
 "port to connect to."
@@ -9436,30 +9504,30 @@ msgstr ""
 "Визначає IP-адресу односпрямованої трансляції, з якою слід з'єднувати порт "
 "містка Open vSwitch."
 
-#: ../clients/common/settings-docs.h.in:283
+#: ../clients/common/settings-docs.h.in:292
 msgid "The time port must be inactive in order to be considered down."
 msgstr "Щоб вважатися вимкненим, порт часу має бути неактивним."
 
-#: ../clients/common/settings-docs.h.in:284
+#: ../clients/common/settings-docs.h.in:293
 msgid ""
 "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr ""
 "Режим прив'язування. Одне з таких значень: «active-backup», «balance-slb» "
 "або «balance-tcp»."
 
-#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.h.in:294
 msgid "The time port must be active before it starts forwarding traffic."
 msgstr "Щоб почати переспрямовувати дані, слід активувати порт часу."
 
-#: ../clients/common/settings-docs.h.in:286
+#: ../clients/common/settings-docs.h.in:295
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
 msgstr "Режим LACP. Одне з таких значень: «active», «off» або «passive»."
 
-#: ../clients/common/settings-docs.h.in:287
+#: ../clients/common/settings-docs.h.in:296
 msgid "The VLAN tag in the range 0-4095."
 msgstr "Теґ VLAN у діапазоні від 0 до 4095."
 
-#: ../clients/common/settings-docs.h.in:288
+#: ../clients/common/settings-docs.h.in:297
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
@@ -9467,7 +9535,7 @@ msgstr ""
 "Режим VLAN. Одне з таких значень: «access», «native-tagged», «native-"
 "untagged», «trunk» або порожнє значення."
 
-#: ../clients/common/settings-docs.h.in:289
+#: ../clients/common/settings-docs.h.in:298
 msgid ""
 "If non-zero, instruct pppd to set the serial port to the specified "
 "baudrate.  This value should normally be left as 0 to automatically choose "
@@ -9477,7 +9545,7 @@ msgstr ""
 "вказану швидкість передавання даних у бодах. Зазвичай, для цієї властивості "
 "слід залишити нульове значення, щоб швидкість було вибрано автоматично."
 
-#: ../clients/common/settings-docs.h.in:290
+#: ../clients/common/settings-docs.h.in:299
 msgid ""
 "If TRUE, specify that pppd should set the serial port to use hardware flow "
 "control with RTS and CTS signals.  This value should normally be set to "
@@ -9487,7 +9555,7 @@ msgstr ""
 "керування потоком апаратних даних за допомогою сигналів RTS і CTS. За "
 "звичних умов, для цієї властивості має бути встановлено значення FALSE."
 
-#: ../clients/common/settings-docs.h.in:291
+#: ../clients/common/settings-docs.h.in:300
 msgid ""
 "If non-zero, instruct pppd to presume the connection to the peer has failed "
 "if the specified number of LCP echo-requests go unanswered by the peer.  The "
@@ -9499,7 +9567,7 @@ msgstr ""
 "кількість луна-запитів LCP. Якщо використовується ця властивість, для "
 "властивості «lcp-echo-interval» слід встановити ненульове значення."
 
-#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.h.in:301
 msgid ""
 "If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
 "every n seconds (where n is the specified value).  Note that some PPP peers "
@@ -9511,7 +9579,7 @@ msgstr ""
 "відповідатимуть на луна-запити, а деякі — ні. Визначити, чи відповідатиме "
 "певний вузол, у автоматичному режимі неможливо."
 
-#: ../clients/common/settings-docs.h.in:293
+#: ../clients/common/settings-docs.h.in:302
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
@@ -9519,7 +9587,7 @@ msgstr ""
 "Якщо TRUE, використовуватиметься режим MPPE зі станами (stateful). "
 "Докладніший опис режиму MPPE зі станами наведено у документації із pppd."
 
-#: ../clients/common/settings-docs.h.in:294
+#: ../clients/common/settings-docs.h.in:303
 msgid ""
 "If non-zero, instruct pppd to request that the peer send packets no larger "
 "than the specified size.  If non-zero, the MRU should be between 128 and "
@@ -9529,20 +9597,20 @@ msgstr ""
 "щодо того, щоб він надсилав пакети, не більші за вказаний розмір. Якщо має "
 "ненульове значення, MRU має бути від 128 до 16384."
 
-#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.h.in:304
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
 msgstr ""
 "Якщо має ненульове значення, наказує pppd надсилати пакети, не більші за "
 "вказаний розмір."
 
-#: ../clients/common/settings-docs.h.in:296
+#: ../clients/common/settings-docs.h.in:305
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
 msgstr ""
 "Якщо має значення TRUE, запит щодо стискання заголовків TCP ван Якобсена не "
 "надсилатиметься."
 
-#: ../clients/common/settings-docs.h.in:297
+#: ../clients/common/settings-docs.h.in:306
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
@@ -9553,35 +9621,35 @@ msgstr ""
 "FALSE, вимагати проходження розпізнавання з боку віддаленого вузла. У "
 "більшості випадків слід використовувати значення TRUE."
 
-#: ../clients/common/settings-docs.h.in:298
+#: ../clients/common/settings-docs.h.in:307
 msgid "If TRUE, BSD compression will not be requested."
 msgstr "Якщо TRUE, стискання BSD не вимагатиметься."
 
-#: ../clients/common/settings-docs.h.in:299
+#: ../clients/common/settings-docs.h.in:308
 msgid "If TRUE, \"deflate\" compression will not be requested."
 msgstr "Якщо TRUE, стискання «deflate» не вимагатиметься."
 
-#: ../clients/common/settings-docs.h.in:300
+#: ../clients/common/settings-docs.h.in:309
 msgid "If TRUE, the CHAP authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання CHAP не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:301
+#: ../clients/common/settings-docs.h.in:310
 msgid "If TRUE, the EAP authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання EAP не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:302
+#: ../clients/common/settings-docs.h.in:311
 msgid "If TRUE, the MSCHAP authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання MSCHAP не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:303
+#: ../clients/common/settings-docs.h.in:312
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання MSCHAPv2 не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:304
+#: ../clients/common/settings-docs.h.in:313
 msgid "If TRUE, the PAP authentication method will not be used."
 msgstr "Якщо TRUE, спосіб розпізнавання PAP не використовуватиметься."
 
-#: ../clients/common/settings-docs.h.in:305
+#: ../clients/common/settings-docs.h.in:314
 msgid ""
 "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
 "PPP session.  If either 64-bit or 128-bit MPPE is not available the session "
@@ -9592,7 +9660,7 @@ msgstr ""
 "128-бітове MPPE виявиться недоступним, сеанс не буде створено. Зауважте, що "
 "MPPE не використовується для мобільних широкосмугових з'єднань."
 
-#: ../clients/common/settings-docs.h.in:306
+#: ../clients/common/settings-docs.h.in:315
 msgid ""
 "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
 "for the PPP session, and the \"require-mppe\" property must also be set to "
@@ -9603,7 +9671,7 @@ msgstr ""
 "для властивості «require-mppe» також має бути встановлено TRUE. Якщо 128-"
 "бітове MPPE виявиться недоступним, сеанс не буде створено."
 
-#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.h.in:316
 msgid ""
 "If given, specifies the parent interface name on which this PPPoE connection "
 "should be created.  If this property is not specified, the connection is "
@@ -9615,11 +9683,11 @@ msgstr ""
 "з'єднання буде активовано на інтерфейсі, який вказано за допомогою параметра "
 "«interface-name» NMSettingConnection."
 
-#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.h.in:317
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Пароль, який використовуватиметься для розпізнавання на службі PPPoE."
 
-#: ../clients/common/settings-docs.h.in:310
+#: ../clients/common/settings-docs.h.in:319
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
@@ -9632,33 +9700,33 @@ msgstr ""
 "якщо ви маєте справу із концентраторами із декількома способами доступу або "
 "відомо, що вказана служба є необхідною."
 
-#: ../clients/common/settings-docs.h.in:311
+#: ../clients/common/settings-docs.h.in:320
 msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 "Ім'я користувача, яке використовуватиметься для розпізнавання на службі "
 "PPPoE."
 
-#: ../clients/common/settings-docs.h.in:312
+#: ../clients/common/settings-docs.h.in:321
 msgid "Whether the proxy configuration is for browser only."
 msgstr ""
 "Визначає, чи використовуються налаштування проксі лише для програм для "
 "перегляду інтернету."
 
-#: ../clients/common/settings-docs.h.in:313
+#: ../clients/common/settings-docs.h.in:322
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
 msgstr ""
 "Спосіб налаштовування проксі. Типовим є NM_SETTING_PROXY_METHOD_NONE (0)"
 
-#: ../clients/common/settings-docs.h.in:314
+#: ../clients/common/settings-docs.h.in:323
 msgid "PAC script for the connection."
 msgstr "Скрипт PAC для з'єднання."
 
-#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.h.in:324
 msgid "PAC URL for obtaining PAC file."
 msgstr "Адреса PAC для отримання файла PAC."
 
-#: ../clients/common/settings-docs.h.in:316
+#: ../clients/common/settings-docs.h.in:325
 msgid ""
 "Speed to use for communication over the serial port.  Note that this value "
 "usually has no effect for mobile broadband modems as they generally ignore "
@@ -9669,20 +9737,20 @@ msgstr ""
 "загалом, для них параметри швидкості ігноруються — просто використовується "
 "найвища доступна швидкість."
 
-#: ../clients/common/settings-docs.h.in:317
+#: ../clients/common/settings-docs.h.in:326
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
 msgstr "Байтова ширина послідовного обміну даними. Наприклад, 8 у «8n1»."
 
-#: ../clients/common/settings-docs.h.in:318
+#: ../clients/common/settings-docs.h.in:327
 msgid "Parity setting of the serial port."
 msgstr "Параметр парності послідовного порту."
 
-#: ../clients/common/settings-docs.h.in:319
+#: ../clients/common/settings-docs.h.in:328
 msgid "Time to delay between each byte sent to the modem, in microseconds."
 msgstr ""
 "Затримка у часі між надсиланнями одного байта на модем, у мікросекундах."
 
-#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.h.in:329
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
@@ -9690,7 +9758,7 @@ msgstr ""
 "Кількість бітів зупинки для обміну даними на послідовному порту. Може мати "
 "значення 1 або 2. Наприклад, 1 у «8n1»."
 
-#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.h.in:330
 msgid ""
 "Whether to autoprobe virtual functions by a compatible driver. If set to "
 "NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver "
@@ -9710,7 +9778,7 @@ msgstr ""
 "використовуватимуться загальні типові параметри. Якщо загальні типові "
 "параметри не вказано, припускатиметься варіант NM_TERNARY_TRUE (1)."
 
-#: ../clients/common/settings-docs.h.in:322
+#: ../clients/common/settings-docs.h.in:331
 msgid ""
 "The total number of virtual functions to create. Note that when the sriov "
 "setting is present NetworkManager enforces the number of virtual functions "
@@ -9725,7 +9793,7 @@ msgstr ""
 "внесенню будь-яких змін до параметрів SR-IOV, не додавайте параметр sriov до "
 "параметрів з'єднання."
 
-#: ../clients/common/settings-docs.h.in:323
+#: ../clients/common/settings-docs.h.in:332
 msgid ""
 "Array of virtual function descriptors. Each VF descriptor is a dictionary "
 "mapping attribute names to GVariant values. The 'index' entry is mandatory "
@@ -9751,15 +9819,15 @@ msgstr ""
 "форму: «ІДЕНТИФІКАТОР[.ПРІОРИТЕТНІСТЬ[.ПРОТОКОЛ]]». Значенням ПРОТОКОЛ може "
 "бути або «q» для 802.1Q (типовий варіант) або «ad» для 802.1ad."
 
-#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.h.in:333
 msgid "Array of TC queueing disciplines."
 msgstr "Масив дисциплін TC у черзі."
 
-#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.h.in:334
 msgid "Array of TC traffic filters."
 msgstr "Список TC фільтрів обміну даними."
 
-#: ../clients/common/settings-docs.h.in:326
+#: ../clients/common/settings-docs.h.in:335
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
@@ -9772,8 +9840,8 @@ msgstr ""
 "використовуватимуться типові налаштування. Щоб дізнатися більше про "
 "форматування даних, ознайомитеся із підручником (man) з teamd.conf."
 
-#: ../clients/common/settings-docs.h.in:327
-#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.h.in:336
+#: ../clients/common/settings-docs.h.in:354
 msgid ""
 "Link watchers configuration for the connection: each link watcher is defined "
 "by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -9794,23 +9862,23 @@ msgstr ""
 "«validate-inactive», «send-always». Докладніше про це на сторінці підручника "
 "(man) щодо teamd.conf."
 
-#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.h.in:337
 msgid "Corresponds to the teamd mcast_rejoin.count."
 msgstr "Відповідає mcast_rejoin.count у teamd."
 
-#: ../clients/common/settings-docs.h.in:329
+#: ../clients/common/settings-docs.h.in:338
 msgid "Corresponds to the teamd mcast_rejoin.interval."
 msgstr "Відповідає mcast_rejoin.interval у teamd."
 
-#: ../clients/common/settings-docs.h.in:330
+#: ../clients/common/settings-docs.h.in:339
 msgid "Corresponds to the teamd notify_peers.count."
 msgstr "Відповідає notify_peers.count у teamd."
 
-#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.h.in:340
 msgid "Corresponds to the teamd notify_peers.interval."
 msgstr "Відповідає notify_peers.interval у teamd."
 
-#: ../clients/common/settings-docs.h.in:332
+#: ../clients/common/settings-docs.h.in:341
 msgid ""
 "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
 "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"."
@@ -9818,43 +9886,43 @@ msgstr ""
 "Відповідає runner.name у teamd. Можливі такі значення: «roundrobin», "
 "«broadcast», «activebackup», «loadbalance», «lacp», «random»."
 
-#: ../clients/common/settings-docs.h.in:333
+#: ../clients/common/settings-docs.h.in:342
 msgid "Corresponds to the teamd runner.active."
 msgstr "Відповідає runner.active у teamd."
 
-#: ../clients/common/settings-docs.h.in:334
+#: ../clients/common/settings-docs.h.in:343
 msgid "Corresponds to the teamd runner.agg_select_policy."
 msgstr "Відповідає runner.agg_select_policy у teamd."
 
-#: ../clients/common/settings-docs.h.in:335
+#: ../clients/common/settings-docs.h.in:344
 msgid "Corresponds to the teamd runner.fast_rate."
 msgstr "Відповідає runner.fast_rate у teamd."
 
-#: ../clients/common/settings-docs.h.in:336
+#: ../clients/common/settings-docs.h.in:345
 msgid "Corresponds to the teamd runner.hwaddr_policy."
 msgstr "Відповідає runner.hwaddr_policy у teamd."
 
-#: ../clients/common/settings-docs.h.in:337
+#: ../clients/common/settings-docs.h.in:346
 msgid "Corresponds to the teamd runner.min_ports."
 msgstr "Відповідає runner.min_ports у teamd."
 
-#: ../clients/common/settings-docs.h.in:338
+#: ../clients/common/settings-docs.h.in:347
 msgid "Corresponds to the teamd runner.sys_prio."
 msgstr "Відповідає runner.sys_prio у teamd."
 
-#: ../clients/common/settings-docs.h.in:339
+#: ../clients/common/settings-docs.h.in:348
 msgid "Corresponds to the teamd runner.tx_balancer.name."
 msgstr "Відповідає runner.tx_balancer.name у teamd."
 
-#: ../clients/common/settings-docs.h.in:340
+#: ../clients/common/settings-docs.h.in:349
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
 msgstr "Відповідає runner.tx_balancer.interval у teamd."
 
-#: ../clients/common/settings-docs.h.in:341
+#: ../clients/common/settings-docs.h.in:350
 msgid "Corresponds to the teamd runner.tx_hash."
 msgstr "Відповідає runner.tx_hash у teamd."
 
-#: ../clients/common/settings-docs.h.in:342
+#: ../clients/common/settings-docs.h.in:351
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
@@ -9867,19 +9935,19 @@ msgstr ""
 "використовуватимуться типові налаштування. Щоб дізнатися більше про "
 "форматування даних, ознайомитеся із підручником (man) з teamd.conf."
 
-#: ../clients/common/settings-docs.h.in:343
+#: ../clients/common/settings-docs.h.in:352
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
 msgstr "Відповідає ports.PORTIFNAME.lacp_key у teamd."
 
-#: ../clients/common/settings-docs.h.in:344
+#: ../clients/common/settings-docs.h.in:353
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
 msgstr "Відповідає ports.PORTIFNAME.lacp_prio у teamd."
 
-#: ../clients/common/settings-docs.h.in:346
+#: ../clients/common/settings-docs.h.in:355
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
 msgstr "Відповідає ports.PORTIFNAME.prio у teamd."
 
-#: ../clients/common/settings-docs.h.in:347
+#: ../clients/common/settings-docs.h.in:356
 msgid ""
 "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
 "parameter is skipped from the json config."
@@ -9887,11 +9955,11 @@ msgstr ""
 "Відповідає ports.PORTIFNAME.queue_id у teamd. Значення -1 означає, що "
 "параметр пропускається у налаштуваннях json."
 
-#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.h.in:357
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
 msgstr "Відповідає ports.PORTIFNAME.sticky у teamd."
 
-#: ../clients/common/settings-docs.h.in:349
+#: ../clients/common/settings-docs.h.in:358
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
@@ -9899,7 +9967,7 @@ msgstr ""
 "Ідентифікатор групи-власника пристрою. Якщо встановлено значення NULL, "
 "пристроєм зможе користуватися будь-хто."
 
-#: ../clients/common/settings-docs.h.in:350
+#: ../clients/common/settings-docs.h.in:359
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
@@ -9909,7 +9977,7 @@ msgstr ""
 "NM_SETTING_TUN_MODE_TUN (1) для створення пристрою шару 3 і "
 "NM_SETTING_TUN_MODE_TAP (2) для створення пристрою Ethernet-подібного шару 2."
 
-#: ../clients/common/settings-docs.h.in:351
+#: ../clients/common/settings-docs.h.in:360
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
@@ -9920,7 +9988,7 @@ msgstr ""
 "надсилання або отримування пакетів. Якщо ж встановлено значення FALSE, "
 "інтерфейсом підтримуватиметься лише одна черга."
 
-#: ../clients/common/settings-docs.h.in:352
+#: ../clients/common/settings-docs.h.in:361
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
@@ -9928,7 +9996,7 @@ msgstr ""
 "Ідентифікатор користувача-власника пристрою. Якщо встановлено значення NULL, "
 "пристроєм зможе користуватися будь-хто."
 
-#: ../clients/common/settings-docs.h.in:353
+#: ../clients/common/settings-docs.h.in:362
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
@@ -9936,7 +10004,7 @@ msgstr ""
 "Якщо TRUE, інтерфейс дописуватиме на початку пакетів заголовок у 4 байти із "
 "описом фізичного інтерфейсу."
 
-#: ../clients/common/settings-docs.h.in:354
+#: ../clients/common/settings-docs.h.in:363
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
@@ -9944,7 +10012,7 @@ msgstr ""
 "Якщо IFF_VNET_HDR має значення TRUE, тунельовані пакети включатимуть "
 "заголовок мережі virtio."
 
-#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.h.in:364
 msgid ""
 "A dictionary of key/value pairs with user data. This data is ignored by "
 "NetworkManager and can be used at the users discretion. The keys only "
@@ -9957,7 +10025,7 @@ msgstr ""
 "формату ASCII, але значення можуть бути довільними рядками UTF8, довжина "
 "яких не перевищує певного значення."
 
-#: ../clients/common/settings-docs.h.in:356
+#: ../clients/common/settings-docs.h.in:365
 msgid ""
 "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
@@ -9967,7 +10035,7 @@ msgstr ""
 "802.1p. Прив'язка визначається у форматі «з:до», де обидва значення, «з» і "
 "«до» є цілими додатними числами, наприклад «7:3»."
 
-#: ../clients/common/settings-docs.h.in:357
+#: ../clients/common/settings-docs.h.in:366
 msgid ""
 "One or more flags which control the behavior and features of the VLAN "
 "interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of "
@@ -9989,7 +10057,7 @@ msgstr ""
 "зберегти зворотну сумісність, типовим значенням у програмному інтерфейсі D-"
 "Bus лишається 0, а нестача властивості у D-Bus також розглядається як 0."
 
-#: ../clients/common/settings-docs.h.in:358
+#: ../clients/common/settings-docs.h.in:367
 msgid ""
 "The VLAN identifier that the interface created by this connection should be "
 "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
@@ -9998,7 +10066,7 @@ msgstr ""
 "з'єднанням. Коректним діапазоном є діапазон від 0 до 4094, без "
 "зарезервованого ідентифікатора 4095."
 
-#: ../clients/common/settings-docs.h.in:359
+#: ../clients/common/settings-docs.h.in:368
 msgid ""
 "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
@@ -10008,7 +10076,7 @@ msgstr ""
 "Linux. Прив'язка визначається у форматі «з:до», де обидва значення, «з» і "
 "«до» є цілими додатними числами, наприклад «7:3»."
 
-#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.h.in:369
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this VLAN interface should be created.  If this property is not "
@@ -10020,7 +10088,7 @@ msgstr ""
 "значення для цієї властивості не вказано, запис з'єднання має містити "
 "параметр «802-3-ethernet» із властивістю «mac-address»."
 
-#: ../clients/common/settings-docs.h.in:361
+#: ../clients/common/settings-docs.h.in:370
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
@@ -10028,7 +10096,7 @@ msgstr ""
 "Словник із пар ключ-значення для специфічних даних додатка VPN. Величинами "
 "ключа і значення можуть бути лише текстові рядки."
 
-#: ../clients/common/settings-docs.h.in:362
+#: ../clients/common/settings-docs.h.in:371
 msgid ""
 "If the VPN service supports persistence, and this property is TRUE, the VPN "
 "will attempt to stay connected across link changes and outages, until "
@@ -10039,7 +10107,7 @@ msgstr ""
 "час зміни параметрів зв'язку або неможливості обміну даними, аж доки "
 "з'єднання не буде розірвано явним чином."
 
-#: ../clients/common/settings-docs.h.in:363
+#: ../clients/common/settings-docs.h.in:372
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
@@ -10048,7 +10116,7 @@ msgstr ""
 "VPN, зокрема паролів або закритих ключів. Величинами ключа і значення можуть "
 "бути лише текстові рядки."
 
-#: ../clients/common/settings-docs.h.in:364
+#: ../clients/common/settings-docs.h.in:373
 msgid ""
 "D-Bus service name of the VPN plugin that this setting uses to connect to "
 "its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
@@ -10057,7 +10125,7 @@ msgstr ""
 "додатка з його мережею. Приклад: org.freedesktop.NetworkManager.vpnc для "
 "додатка vpnc."
 
-#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.h.in:374
 msgid ""
 "Timeout for the VPN service to establish the connection. Some services may "
 "take quite a long time to connect. Value of 0 means a default timeout, which "
@@ -10070,7 +10138,7 @@ msgstr ""
 "допомогою параметра vpn.timeout у файлі налаштувань). Значення, які "
 "перевищують нуль, визначають час очікування у секундах."
 
-#: ../clients/common/settings-docs.h.in:366
+#: ../clients/common/settings-docs.h.in:375
 msgid ""
 "If the VPN connection requires a user name for authentication, that name "
 "should be provided here.  If the connection is available to more than one "
@@ -10086,15 +10154,15 @@ msgstr ""
 "порожнє, NetworkManager автоматично використає ім'я користувача, який "
 "надіслав запит щодо встановлення з'єднання VPN."
 
-#: ../clients/common/settings-docs.h.in:367
+#: ../clients/common/settings-docs.h.in:376
 msgid "The routing table for this VRF."
 msgstr "Таблиця маршрутизації для цього VRF."
 
-#: ../clients/common/settings-docs.h.in:368
+#: ../clients/common/settings-docs.h.in:377
 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
 msgstr "Визначає час життя у секундах записів FDB, вивчених ядром."
 
-#: ../clients/common/settings-docs.h.in:369
+#: ../clients/common/settings-docs.h.in:378
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
@@ -10102,22 +10170,22 @@ msgstr ""
 "Визначає порт призначення UDP для обміну даними із віддаленою кінцевою "
 "точкою тунелю VXLAN."
 
-#: ../clients/common/settings-docs.h.in:370
+#: ../clients/common/settings-docs.h.in:379
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
 msgstr ""
 "Визначає ідентифікатор мережі VXLAN (або ідентифікатор сегмента VXLAN), яким "
 "слід скористатися."
 
-#: ../clients/common/settings-docs.h.in:371
+#: ../clients/common/settings-docs.h.in:380
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
 msgstr "Визначає, чи будуть створюватися сповіщення netlink LL ADDR miss."
 
-#: ../clients/common/settings-docs.h.in:372
+#: ../clients/common/settings-docs.h.in:381
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
 msgstr "Визначає, чи будуть створюватися сповіщення netlink IP ADDR miss."
 
-#: ../clients/common/settings-docs.h.in:373
+#: ../clients/common/settings-docs.h.in:382
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
@@ -10125,7 +10193,7 @@ msgstr ""
 "Вказує, чи вводяться невідомі адреси шару посилань та IP-адреси до бази "
 "даних переспрямовування пристроїв VXLAN."
 
-#: ../clients/common/settings-docs.h.in:374
+#: ../clients/common/settings-docs.h.in:383
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
@@ -10133,24 +10201,24 @@ msgstr ""
 "Вказує максимальну кількість записів FDB. Нульове значення означає, що ядро "
 "зберігатиме необмежену кількість записів."
 
-#: ../clients/common/settings-docs.h.in:375
+#: ../clients/common/settings-docs.h.in:384
 msgid "If given, specifies the source IP address to use in outgoing packets."
 msgstr ""
 "Якщо задано, визначає початкову IP-адресу, якою слід скористатися для "
 "вихідних пакетів."
 
-#: ../clients/common/settings-docs.h.in:376
+#: ../clients/common/settings-docs.h.in:385
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
 msgstr ""
 "Якщо задано, визначає назву батьківського інтерфейсу або UUID батьківського "
 "з'єднання."
 
-#: ../clients/common/settings-docs.h.in:377
+#: ../clients/common/settings-docs.h.in:386
 msgid "Specifies whether ARP proxy is turned on."
 msgstr "Визначає, чи увімкнено ARP-проксі."
 
-#: ../clients/common/settings-docs.h.in:378
+#: ../clients/common/settings-docs.h.in:387
 msgid ""
 "Specifies the unicast destination IP address to use in outgoing packets when "
 "the destination link layer address is not known in the VXLAN device "
@@ -10161,11 +10229,11 @@ msgstr ""
 "переспрямовування пристроїв VXLAN, або IP-адреса універсальної трансляції, з "
 "якою слід встановити зв'язок."
 
-#: ../clients/common/settings-docs.h.in:379
+#: ../clients/common/settings-docs.h.in:388
 msgid "Specifies whether route short circuit is turned on."
 msgstr "Визначає, чи увімкнено коротке замикання маршруту."
 
-#: ../clients/common/settings-docs.h.in:380
+#: ../clients/common/settings-docs.h.in:389
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
@@ -10173,7 +10241,7 @@ msgstr ""
 "Визначає максимальний початковий порт UDP для обміну даними із віддаленою "
 "кінцевою точкою тунелю VXLAN."
 
-#: ../clients/common/settings-docs.h.in:381
+#: ../clients/common/settings-docs.h.in:390
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
@@ -10181,16 +10249,16 @@ msgstr ""
 "Визначає мінімальний початковий порт UDP для обміну даними із віддаленою "
 "кінцевою точкою тунелю VXLAN."
 
-#: ../clients/common/settings-docs.h.in:382
+#: ../clients/common/settings-docs.h.in:391
 msgid "Specifies the TOS value to use in outgoing packets."
 msgstr "Визначає значення TOS, яке слід використовувати для вихідних пакетів."
 
-#: ../clients/common/settings-docs.h.in:383
+#: ../clients/common/settings-docs.h.in:392
 msgid "Specifies the time-to-live value to use in outgoing packets."
 msgstr ""
 "Визначає значення часу життя, яке слід використовувати для вихідних пакетів."
 
-#: ../clients/common/settings-docs.h.in:384
+#: ../clients/common/settings-docs.h.in:393
 msgid ""
 "The P2P device that should be connected to. Currently this is the only way "
 "to create or join a group."
@@ -10198,7 +10266,7 @@ msgstr ""
 "Пристрій P2P, з яким слід встановити з'єднання. У поточній версії це єдиний "
 "спосіб створення групи або долучення до неї."
 
-#: ../clients/common/settings-docs.h.in:385
+#: ../clients/common/settings-docs.h.in:394
 msgid ""
 "The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display "
 "requires a protocol specific information element to be set in certain Wi-Fi "
@@ -10212,7 +10280,7 @@ msgstr ""
 "Вказати ці елементи з метою встановлення з'єднання можна тут. Цей параметр є "
 "корисним лише для реалізації клієнта дисплея Wi-Fi."
 
-#: ../clients/common/settings-docs.h.in:386
+#: ../clients/common/settings-docs.h.in:395
 msgid ""
 "Flags indicating which mode of WPS is to be used. There's little point in "
 "changing the default setting as NetworkManager will automatically determine "
@@ -10222,7 +10290,7 @@ msgstr ""
 "типове значення не варто, оскільки NetworkManager автоматично визначає "
 "найкращий режим."
 
-#: ../clients/common/settings-docs.h.in:387
+#: ../clients/common/settings-docs.h.in:396
 msgid ""
 "If specified, this connection will only apply to the WiMAX device whose MAC "
 "address matches. This property does not change the MAC address of the device "
@@ -10232,7 +10300,7 @@ msgstr ""
 "відповідною адресою MAC. Ця властивість не змінює MAC-адреси пристрою (таку "
 "зміну називають підміною MAC). Застаріле: 1"
 
-#: ../clients/common/settings-docs.h.in:388
+#: ../clients/common/settings-docs.h.in:397
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
@@ -10240,7 +10308,7 @@ msgstr ""
 "Назва надавача мережевих послуг (NSP) для мережі WiMAX, яку має "
 "використовувати це з'єднання. Застаріле: 1"
 
-#: ../clients/common/settings-docs.h.in:389
+#: ../clients/common/settings-docs.h.in:398
 msgid ""
 "The use of fwmark is optional and is by default off. Setting it to 0 "
 "disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that "
@@ -10252,16 +10320,7 @@ msgstr ""
 "fwmark для вихідних пакетів. Зауважте, що вмикання «ip4-auto-default-route» "
 "або «ip6-auto-default-route» неявним чином призводить до вибору fwmark."
 
-#: ../clients/common/settings-docs.h.in:390
-#| msgid ""
-#| "Whether to enable special handling of the IPv4 default route. If enabled, "
-#| "the IPv4 default route will be placed to a dedicated routing-table and "
-#| "two policy routing rules will be added. The fwmark number is also used as "
-#| "routing-table for the default-route, and if fwmark is zero, a unused "
-#| "fwmark/table is chosen automatically. This corresponds to what wg-quick "
-#| "does with Table=auto. Leaving this at the default will enable this option "
-#| "automatically if ipv4.never-default is not set and there are any peers "
-#| "that use a default-route as allowed-ips."
+#: ../clients/common/settings-docs.h.in:399
 msgid ""
 "Whether to enable special handling of the IPv4 default route. If enabled, "
 "the IPv4 default route from wireguard.peer-routes will be placed to a "
@@ -10276,25 +10335,24 @@ msgid ""
 "peers that use a default-route as allowed-ips."
 msgstr ""
 "Визначає, чи слід вмикати особливу обробку типового маршруту IPv4. Якщо "
-"увімкнено, типовий маршрут IPv4 з wireguard.peer-routes буде розміщено у"
-" спеціальній таблиці "
-"маршрутизації, а також буде додано два правила маршрутизації. Також буде "
-"використано число fwmark як номер таблиці маршрутизації для типового "
-"маршруту. Якщо fwmark дорівнює нулю, буде автоматично вибрано невикористане "
-"значення fwmark або таблицю. Це збігається з тим, що wg-quick робить з "
-"Table=auto і що у WireGuard називається «Improved Rule-based Routing»."
-" Зауважте, що для того, щоб ця автоматизація спрацювала, не варто"
-" встановлювати ipv4.gateway, оскільки це призведе до конфлікту для типового"
-" маршруту. Якщо не змінювати типове значення цього параметра, його буде "
-"увімкнено, якщо не буде встановлено ipv4.never-default і не буде жодного "
-"вузла, який використовує типовий маршрут (default-route) у дозволених IP-"
-"адресах (allowed-ips)."
+"увімкнено, типовий маршрут IPv4 з wireguard.peer-routes буде розміщено у "
+"спеціальній таблиці маршрутизації, а також буде додано два правила "
+"маршрутизації. Також буде використано число fwmark як номер таблиці "
+"маршрутизації для типового маршруту. Якщо fwmark дорівнює нулю, буде "
+"автоматично вибрано невикористане значення fwmark або таблицю. Це збігається "
+"з тим, що wg-quick робить з Table=auto і що у WireGuard називається "
+"«Improved Rule-based Routing». Зауважте, що для того, щоб ця автоматизація "
+"спрацювала, не варто встановлювати ipv4.gateway, оскільки це призведе до "
+"конфлікту для типового маршруту. Якщо не змінювати типове значення цього "
+"параметра, його буде увімкнено, якщо не буде встановлено ipv4.never-default "
+"і не буде жодного вузла, який використовує типовий маршрут (default-route) у "
+"дозволених IP-адресах (allowed-ips)."
 
-#: ../clients/common/settings-docs.h.in:391
+#: ../clients/common/settings-docs.h.in:400
 msgid "Like ip4-auto-default-route, but for the IPv6 default route."
 msgstr "Те саме, що ip4-auto-default-route, але для типового маршруту IPv6."
 
-#: ../clients/common/settings-docs.h.in:392
+#: ../clients/common/settings-docs.h.in:401
 msgid ""
 "The listen-port. If listen-port is not specified, the port will be chosen "
 "randomly when the interface comes up."
@@ -10302,7 +10360,7 @@ msgstr ""
 "Порт для очікування на дані. Якщо порт для очікування на дані не вказано, "
 "номер буде вибрано випадковим чином під час підняття інтерфейсу."
 
-#: ../clients/common/settings-docs.h.in:393
+#: ../clients/common/settings-docs.h.in:402
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments. If zero a default MTU is "
@@ -10315,14 +10373,7 @@ msgstr ""
 "відміну від параметра MTU wg-quick, тут не беруться до уваги поточні "
 "маршрути на момент активації."
 
-#: ../clients/common/settings-docs.h.in:394
-#| msgid ""
-#| "Whether to automatically add routes for the AllowedIPs ranges of the "
-#| "peers. If TRUE (the default), NetworkManager will automatically add "
-#| "routes in the routing tables according to ipv4.route-table and ipv6.route-"
-#| "table. If FALSE, no such routes are added automatically. In this case, "
-#| "the user may want to configure static routes in ipv4.routes and ipv6."
-#| "routes, respectively."
+#: ../clients/common/settings-docs.h.in:403
 msgid ""
 "Whether to automatically add routes for the AllowedIPs ranges of the peers. "
 "If TRUE (the default), NetworkManager will automatically add routes in the "
@@ -10337,23 +10388,22 @@ msgstr ""
 "Визначає, чи слід автоматично додавати маршрути для діапазонів AllowedIP "
 "вузлів. Якщо має значення TRUE (типове значення), NetworkManager автоматично "
 "додаватиме маршрути до таблиць маршрутизації відповідно до ipv4.route-table "
-"і ipv6.route-table. Зазвичай, не варто вимикати цю автоматизацію. Якщо має"
-" значення FALSE, автоматичне додавання маршрутів "
-"не виконуватиметься. У цьому випадку користувачеві варто налаштувати "
-"статичні маршрути у ipv4.routes та ipv6.routes, відповідно. Зауважте, що якщо"
-" AllowedIPs для вузла має значення «0.0.0.0/0» або «::/0», а для профілю"
-" увімкнено ipv4.never-default або ipv6.never-default, маршрут вузла для цього"
-" вузла не буде додано автоматично."
+"і ipv6.route-table. Зазвичай, не варто вимикати цю автоматизацію. Якщо має "
+"значення FALSE, автоматичне додавання маршрутів не виконуватиметься. У цьому "
+"випадку користувачеві варто налаштувати статичні маршрути у ipv4.routes та "
+"ipv6.routes, відповідно. Зауважте, що якщо AllowedIPs для вузла має значення "
+"«0.0.0.0/0» або «::/0», а для профілю увімкнено ipv4.never-default або ipv6."
+"never-default, маршрут вузла для цього вузла не буде додано автоматично."
 
-#: ../clients/common/settings-docs.h.in:395
+#: ../clients/common/settings-docs.h.in:404
 msgid "The 256 bit private-key in base64 encoding."
 msgstr "256-бітовий закритий ключ у кодуванні base64."
 
-#: ../clients/common/settings-docs.h.in:396
+#: ../clients/common/settings-docs.h.in:405
 msgid "Flags indicating how to handle the \"private-key\" property."
 msgstr "Прапорці, які позначають, як обробляти властивість «private-key»."
 
-#: ../clients/common/settings-docs.h.in:397
+#: ../clients/common/settings-docs.h.in:406
 msgid ""
 "IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use "
 "whatever the device is already set to\"."
@@ -10361,7 +10411,7 @@ msgstr ""
 "Канал IEEE 802.15.4. Додане ціле значення або -1, що означає «не "
 "встановлювати, використовувати той, який вже встановлено пристроєм»."
 
-#: ../clients/common/settings-docs.h.in:398
+#: ../clients/common/settings-docs.h.in:407
 msgid ""
 "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
 "MAC layer device whose permanent MAC address matches."
@@ -10369,7 +10419,7 @@ msgstr ""
 "Якщо вказано, це з'єднання застосовуватиметься лише до пристрою шару MAC "
 "IEEE 802.15.4 (WPAN) із відповідною сталою адресою MAC."
 
-#: ../clients/common/settings-docs.h.in:399
+#: ../clients/common/settings-docs.h.in:408
 msgid ""
 "IEEE 802.15.4 channel page. A positive integer or -1, meaning \"do not set, "
 "use whatever the device is already set to\"."
@@ -10377,11 +10427,11 @@ msgstr ""
 "Сторінка каналу IEEE 80215.4. Додане ціле значення або -1, що означає «не "
 "встановлювати, використовувати ту, яку вже встановлено пристроєм»."
 
-#: ../clients/common/settings-docs.h.in:400
+#: ../clients/common/settings-docs.h.in:409
 msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
 msgstr "Ідентифікатор Personal Area Network (PAN) IEEE 802.15.4."
 
-#: ../clients/common/settings-docs.h.in:401
+#: ../clients/common/settings-docs.h.in:410
 msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
 msgstr ""
 "Коротка адреса IEEE 802.15.4, яку слід використовувати у обмеженому "
@@ -10518,7 +10568,7 @@ msgstr "Прив'язане з'єднання %d"
 
 #: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2709
 #: ../libnm/nm-device.c:1546
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5391
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5410
 msgid "Bridge"
 msgstr "Місток"
 
@@ -11916,7 +11966,7 @@ msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "«%s=%s» не є коректним налаштуванням для «%s»"
 
 #: ../libnm-core/nm-setting-bond.c:877 ../libnm-core/nm-setting-bond.c:890
-#: ../libnm-core/nm-setting-bridge.c:1145
+#: ../libnm-core/nm-setting-bridge.c:1316
 #, c-format
 msgid "'%s' option requires '%s' option to be enabled"
 msgstr "використання параметра «%s» вимагає вмикання параметра «%s»"
@@ -11977,31 +12027,37 @@ msgstr ""
 "Для з'єднання з параметром «%s» має бути встановлено тип підлеглості «%s». "
 "Замість цього маємо «%s»."
 
-#: ../libnm-core/nm-setting-bridge.c:1030
+#: ../libnm-core/nm-setting-bridge.c:1201
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
 msgstr "значення «%d» лежить поза діапазоном <%d-%d>"
 
-#: ../libnm-core/nm-setting-bridge.c:1047
+#: ../libnm-core/nm-setting-bridge.c:1218
 msgid "is not a valid MAC address"
 msgstr "не є коректною MAC-адресою"
 
-#: ../libnm-core/nm-setting-bridge.c:1088
+#: ../libnm-core/nm-setting-bridge.c:1259
 msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
 msgstr "маска не може містити біти 0 (STP), 1 (MAC) і 2 (LACP)"
 
-#: ../libnm-core/nm-setting-bridge.c:1108
+#: ../libnm-core/nm-setting-bridge.c:1279
 msgid "is not a valid link local MAC address"
 msgstr "не є коректною MAC-адресою для локальних з'єднань"
 
-#: ../libnm-core/nm-setting-bridge.c:1120
+#: ../libnm-core/nm-setting-bridge.c:1291
 msgid "is not a valid VLAN filtering protocol"
 msgstr "не є коректним протоколом фільтрування VLAN"
 
-#: ../libnm-core/nm-setting-bridge.c:1133
+#: ../libnm-core/nm-setting-bridge.c:1304
 msgid "is not a valid option"
 msgstr "не є коректним параметром"
 
+#: ../libnm-core/nm-setting-bridge.c:1327
+#, c-format
+#| msgid "'%s' option is empty"
+msgid "'%s' option must be a power of 2"
+msgstr "Значенням параметра «%s» має бути степінь 2"
+
 #: ../libnm-core/nm-setting-connection.c:952
 #, c-format
 msgid "setting required for connection of type '%s'"
@@ -12055,12 +12111,10 @@ msgid "wait-device-timeout requires %s"
 msgstr "wait-device-timeout потребує %s"
 
 #: ../libnm-core/nm-setting-connection.c:1247
-#| msgid "interface name is longer than 15 characters"
 msgid "DHCP option cannot be longer than 255 characters"
 msgstr "Довжина параметра DHCP не може перевищувати 255 символів"
 
 #: ../libnm-core/nm-setting-connection.c:1253
-#| msgid "URI is not valid UTF-8"
 msgid "MUD URL is not a valid URL"
 msgstr "Адреса MUD не є коректною адресою"
 
@@ -12901,7 +12955,7 @@ msgstr "досягнуто максимальної кількості запи
 msgid "invalid key \"%s\": %s"
 msgstr "некоректний ключ «%s»: %s"
 
-#: ../libnm-core/nm-setting-user.c:358 ../shared/nm-keyfile/nm-keyfile.c:857
+#: ../libnm-core/nm-setting-user.c:358 ../shared/nm-keyfile/nm-keyfile.c:850
 #, c-format
 msgid "invalid value for \"%s\": %s"
 msgstr "некоректне значення для «%s»: %s"
@@ -14134,215 +14188,222 @@ msgstr "назва інтерфейсу не може бути порожньо
 msgid "interface name must be UTF-8 encoded"
 msgstr "назва інтерфейсу має бути набором символів у кодуванні UTF-8"
 
-#: ../shared/nm-keyfile/nm-keyfile-utils.c:241
+#: ../shared/nm-keyfile/nm-keyfile-utils.c:171
+#, c-format
+#| msgid "value cannot be interpreted as integer"
+msgid "Value cannot be interpreted as a list of numbers."
+msgstr "Значення не може бути оброблено як список чисел."
+
+#: ../shared/nm-keyfile/nm-keyfile-utils.c:307
 #, c-format
 msgid "value is not an integer in range [%lld, %lld]"
 msgstr "значення не є цілим числом у діапазоні [%lld, %lld]"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:197
+#: ../shared/nm-keyfile/nm-keyfile.c:190
 msgid "ignoring missing number"
 msgstr "ігноруємо пропущене число"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:205
+#: ../shared/nm-keyfile/nm-keyfile.c:198
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "ігноруємо некоректне число «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:226
+#: ../shared/nm-keyfile/nm-keyfile.c:219
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "ігноруємо некоректну адресу %s: %s"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:269
+#: ../shared/nm-keyfile/nm-keyfile.c:262
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "ігноруємо некоректний шлюз «%s» для маршруту %s"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:293
+#: ../shared/nm-keyfile/nm-keyfile.c:286
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "ігноруємо некоректний маршрут %s: %s"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:465
+#: ../shared/nm-keyfile/nm-keyfile.c:458
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "неочікуваний символ «%c» для адреси %s: «%s» (позиція %td)"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:475
+#: ../shared/nm-keyfile/nm-keyfile.c:468
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "неочікуваний символ «%c» для %s: «%s» (позиція %td)"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:484
+#: ../shared/nm-keyfile/nm-keyfile.c:477
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr "неочікуваний символ «%c» у префіксі довжини для %s: «%s» (позиція %td)"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:495
+#: ../shared/nm-keyfile/nm-keyfile.c:488
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "зайві дані наприкінці значення %s: «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:501
+#: ../shared/nm-keyfile/nm-keyfile.c:494
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "застаріла крапка з комою наприкінці значення %s: «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:515
+#: ../shared/nm-keyfile/nm-keyfile.c:508
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "некоректний префікс довжини для %s «%s», повертаємося до типового, %d"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:522
+#: ../shared/nm-keyfile/nm-keyfile.c:515
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "пропущено префікс довжини для %s «%s», повертаємося до типового, %d"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:895
+#: ../shared/nm-keyfile/nm-keyfile.c:888
 #, c-format
 msgid "ignoring invalid DNS server IPv%c address '%s'"
 msgstr "ігноруємо некоректну адресу IPv%c сервера DNS «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:979
+#: ../shared/nm-keyfile/nm-keyfile.c:972
 msgid "ignoring invalid MAC address"
 msgstr "ігноруємо некоректну MAC-адресу"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1238
+#: ../shared/nm-keyfile/nm-keyfile.c:1231
 msgid "ignoring invalid SSID"
 msgstr "ігноруємо некоректний SSID"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1254
+#: ../shared/nm-keyfile/nm-keyfile.c:1247
 msgid "ignoring invalid raw password"
 msgstr "ігноруємо некоректний необроблений пароль"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1394
+#: ../shared/nm-keyfile/nm-keyfile.c:1387
 msgid "invalid key/cert value"
 msgstr "некоректне значення ключа/сертифіката"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1405
+#: ../shared/nm-keyfile/nm-keyfile.c:1398
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "некоректний шлях до ключа/сертифіката, «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1425
-#: ../shared/nm-keyfile/nm-keyfile.c:1508
+#: ../shared/nm-keyfile/nm-keyfile.c:1418
+#: ../shared/nm-keyfile/nm-keyfile.c:1501
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "файла сертифіката або ключа «%s» не існує"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1434
+#: ../shared/nm-keyfile/nm-keyfile.c:1427
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
 msgstr "некоректна адреса PKCS#11 «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1478
+#: ../shared/nm-keyfile/nm-keyfile.c:1471
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr "некоректні дані значення ключа/сертифіката data:;base64, не є base64"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1487
+#: ../shared/nm-keyfile/nm-keyfile.c:1480
 msgid "invalid key/cert value data:;base64,file://"
 msgstr "некоректне значення ключа/сертифіката data:;base64,file://"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1520
+#: ../shared/nm-keyfile/nm-keyfile.c:1513
 msgid "invalid key/cert value is not a valid blob"
 msgstr ""
 "некоректне значення ключа/сертифіката, не є коректним значення «%s» не є "
 "коректним великим бінарним об'єктом"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1622
+#: ../shared/nm-keyfile/nm-keyfile.c:1615
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr "некоректне значення парності, «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1639
-#: ../shared/nm-keyfile/nm-keyfile.c:3176
+#: ../shared/nm-keyfile/nm-keyfile.c:1632
+#: ../shared/nm-keyfile/nm-keyfile.c:3163
 #, c-format
 msgid "invalid setting: %s"
 msgstr "некоректний параметр: %s"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1656
+#: ../shared/nm-keyfile/nm-keyfile.c:1649
 #, c-format
 msgid "ignoring invalid team configuration: %s"
 msgstr "ігноруємо некоректне налаштування команди: %s"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1734
+#: ../shared/nm-keyfile/nm-keyfile.c:1727
 #, c-format
 msgid "invalid qdisc: %s"
 msgstr "некоректний qdisc: %s"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:1780
+#: ../shared/nm-keyfile/nm-keyfile.c:1773
 #, c-format
 msgid "invalid tfilter: %s"
 msgstr "некоректний tfilter: %s"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3020
+#: ../shared/nm-keyfile/nm-keyfile.c:3007
 #, c-format
 msgid "error loading setting value: %s"
 msgstr "помилка під час завантаження значення параметра: %s"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3048
-#: ../shared/nm-keyfile/nm-keyfile.c:3059
-#: ../shared/nm-keyfile/nm-keyfile.c:3077
-#: ../shared/nm-keyfile/nm-keyfile.c:3088
-#: ../shared/nm-keyfile/nm-keyfile.c:3099
-#: ../shared/nm-keyfile/nm-keyfile.c:3151
-#: ../shared/nm-keyfile/nm-keyfile.c:3162
+#: ../shared/nm-keyfile/nm-keyfile.c:3035
+#: ../shared/nm-keyfile/nm-keyfile.c:3046
+#: ../shared/nm-keyfile/nm-keyfile.c:3064
+#: ../shared/nm-keyfile/nm-keyfile.c:3075
+#: ../shared/nm-keyfile/nm-keyfile.c:3086
+#: ../shared/nm-keyfile/nm-keyfile.c:3138
+#: ../shared/nm-keyfile/nm-keyfile.c:3149
 msgid "value cannot be interpreted as integer"
 msgstr "значення не може бути оброблено як ціле число"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3121
+#: ../shared/nm-keyfile/nm-keyfile.c:3108
 #, c-format
-msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
+#| msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
+msgid "ignoring invalid byte element '%u' (not between 0 and 255 inclusive)"
 msgstr ""
-"ігноруємо некоректний байтовий елемент «%d» (не у діапазоні від 0 до 255, "
+"ігноруємо некоректний байтовий елемент «%u» (не у діапазоні від 0 до 255, "
 "включно)"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3197
+#: ../shared/nm-keyfile/nm-keyfile.c:3184
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "некоректна назва параметра, «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3242
+#: ../shared/nm-keyfile/nm-keyfile.c:3229
 #, c-format
 msgid "invalid key '%s.%s'"
 msgstr "некоректний ключ «%s.%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3257
+#: ../shared/nm-keyfile/nm-keyfile.c:3244
 #, c-format
 msgid "key '%s.%s' is not boolean"
 msgstr "ключ «%s.%s» не є булевим значенням"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3314
+#: ../shared/nm-keyfile/nm-keyfile.c:3301
 #, c-format
 msgid "invalid peer public key in section '%s'"
 msgstr "некоректний відкритий ключ вузла у розділі «%s»"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3326
+#: ../shared/nm-keyfile/nm-keyfile.c:3313
 #, c-format
 msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
 msgstr "ключ «%s.%s» не є коректним 256-бітовим ключем у кодуванні base64"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3339
+#: ../shared/nm-keyfile/nm-keyfile.c:3326
 #, c-format
 msgid "key '%s.%s' is not a valid secret flag"
 msgstr "ключ «%s.%s» не є коректним прапорцем реєстраційних даних"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3351
+#: ../shared/nm-keyfile/nm-keyfile.c:3338
 #, c-format
 msgid "key '%s.%s' is not a integer in range 0 to 2^32"
 msgstr "ключ «%s.%s» не є цілими числом у діапазоні від 0 до 2^32"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3363
+#: ../shared/nm-keyfile/nm-keyfile.c:3350
 #, c-format
 msgid "key '%s.%s' is not a valid endpoint"
 msgstr "ключ «%s.%s» не є коректною кінцевою точкою"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3385
+#: ../shared/nm-keyfile/nm-keyfile.c:3372
 #, c-format
 msgid "key '%s.%s' has invalid allowed-ips"
 msgstr "для ключа «%s.%s» вказано некоректне значення allowed-ips"
 
-#: ../shared/nm-keyfile/nm-keyfile.c:3397
+#: ../shared/nm-keyfile/nm-keyfile.c:3384
 #, c-format
 msgid "peer '%s' is invalid: %s"
 msgstr "вузол «%s» є некоректним: %s"

From fdba9200c0c0700d1dd4b0999893e407b512ed1f Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 11:19:31 +0200
Subject: [PATCH 130/222] device: avoid coverity warning about unused variable

This warning is from coverity against 1.18.6. But it applies
in a similar manner here.

  1. NetworkManager-1.18.6/src/devices/nm-device-macsec.c:811:25: warning: Value stored to 'priv' during its initialization is never read
  #         NMDeviceMacsecPrivate *priv = NM_DEVICE_MACSEC_GET_PRIVATE (self);
  #                                ^~~~   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  4. NetworkManager-1.18.6/src/devices/nm-device-macsec.c:811:25: note: Value stored to 'priv' during its initialization is never read
  #         NMDeviceMacsecPrivate *priv = NM_DEVICE_MACSEC_GET_PRIVATE (self);
  #                                ^~~~   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  #   809|   {
  #   810|   	NMDeviceMacsec *self = NM_DEVICE_MACSEC (object);
  #   811|-> 	NMDeviceMacsecPrivate *priv = NM_DEVICE_MACSEC_GET_PRIVATE (self);
  #   812|
  #   813|   	macsec_secrets_cancel (self);
---
 src/devices/nm-device-macsec.c  |  5 ++---
 src/devices/nm-device-macvlan.c | 10 ++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/devices/nm-device-macsec.c b/src/devices/nm-device-macsec.c
index f1878078b2..94edc9473a 100644
--- a/src/devices/nm-device-macsec.c
+++ b/src/devices/nm-device-macsec.c
@@ -863,15 +863,14 @@ static void
 dispose (GObject *object)
 {
 	NMDeviceMacsec *self = NM_DEVICE_MACSEC (object);
-	NMDeviceMacsecPrivate *priv = NM_DEVICE_MACSEC_GET_PRIVATE (self);
 
 	macsec_secrets_cancel (self);
 	supplicant_interface_release (self);
 
 	G_OBJECT_CLASS (nm_device_macsec_parent_class)->dispose (object);
 
-	nm_assert (priv->parent_state_id == 0);
-	nm_assert (priv->parent_mtu_id == 0);
+	nm_assert (NM_DEVICE_MACSEC_GET_PRIVATE (self)->parent_state_id == 0);
+	nm_assert (NM_DEVICE_MACSEC_GET_PRIVATE (self)->parent_mtu_id == 0);
 }
 
 static const NMDBusInterfaceInfoExtended interface_info_device_macsec = {
diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c
index 2f8c4c32cd..9079bb2b52 100644
--- a/src/devices/nm-device-macvlan.c
+++ b/src/devices/nm-device-macvlan.c
@@ -462,16 +462,18 @@ nm_device_macvlan_init (NMDeviceMacvlan *self)
 {
 }
 
+#if NM_MORE_ASSERTS
 static void
 dispose (GObject *object)
 {
-	NMDeviceMacvlanPrivate *priv = NM_DEVICE_MACVLAN_GET_PRIVATE (object);
-
 	G_OBJECT_CLASS (nm_device_macvlan_parent_class)->dispose (object);
 
-	nm_assert (priv->parent_state_id == 0);
-	nm_assert (priv->parent_mtu_id == 0);
+	nm_assert (NM_DEVICE_MACVLAN_GET_PRIVATE (object)->parent_state_id == 0);
+	nm_assert (NM_DEVICE_MACVLAN_GET_PRIVATE (object)->parent_mtu_id == 0);
 }
+#else
+#define dispose ((void (*) (GObject *object)) NULL)
+#endif
 
 static const NMDBusInterfaceInfoExtended interface_info_device_macvlan = {
 	.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT (

From 180cda7632b194d15abea3f98b60b7b7e1ef26f7 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 13:52:27 +0200
Subject: [PATCH 131/222] libnm: fix gtk-doc annotations for
 nm_setting_match_get_interface_names()

Otherwise the function is not usable via generated bindings.

Fixes: 9b9dce9486a8 ('all: add 'match' setting')
---
 libnm-core/nm-setting-match.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libnm-core/nm-setting-match.c b/libnm-core/nm-setting-match.c
index 2e05881074..3ad58dafa9 100644
--- a/libnm-core/nm-setting-match.c
+++ b/libnm-core/nm-setting-match.c
@@ -171,10 +171,11 @@ nm_setting_match_clear_interface_names (NMSettingMatch *setting)
 /**
  * nm_setting_match_get_interface_names:
  * @setting: the #NMSettingMatch
+ * @length: (out): the length of the returned interface names array.
  *
  * Returns all the interface names.
  *
- * Returns: (transfer none): the configured interface names.
+ * Returns: (transfer none) (array length=length): the configured interface names.
  *
  * Since: 1.14
  **/

From b42c3aa97a50ca40f9161fdd44f420863cdf453d Mon Sep 17 00:00:00 2001
From: Adrian Freihofer <adrian.freihofer@siemens.com>
Date: Tue, 21 Apr 2020 17:38:54 +0200
Subject: [PATCH 132/222] settings: add match verify function

---
 libnm-core/nm-setting-match.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/libnm-core/nm-setting-match.c b/libnm-core/nm-setting-match.c
index 3ad58dafa9..aaed0b525a 100644
--- a/libnm-core/nm-setting-match.c
+++ b/libnm-core/nm-setting-match.c
@@ -247,6 +247,28 @@ nm_setting_match_new (void)
 	return (NMSetting *) g_object_new (NM_TYPE_SETTING_MATCH, NULL);
 }
 
+static gboolean
+verify (NMSetting *setting, NMConnection *connection, GError **error)
+{
+	NMSettingMatch *self = NM_SETTING_MATCH (setting);
+	int k;
+
+	for (k = 0; k < self->interface_name->len; k++) {
+		char *kparam = (char*) g_ptr_array_index (self->interface_name, k);
+		if (nm_streq0 (kparam, "")) {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			             _("is empty"));
+			g_prefix_error (error, "%s.%s: ", NM_SETTING_MATCH_SETTING_NAME,
+			                NM_SETTING_MATCH_INTERFACE_NAME);
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
 static void
 finalize (GObject *object)
 {
@@ -267,6 +289,8 @@ nm_setting_match_class_init (NMSettingMatchClass *klass)
 	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
+	setting_class->verify      = verify;
+
 	/**
 	 * NMSettingMatch:interface-name
 	 *

From 3a8e46f2a59af7e654a4e3ca05f5834a1f4a5314 Mon Sep 17 00:00:00 2001
From: Adrian Freihofer <adrian.freihofer@siemens.com>
Date: Tue, 21 Apr 2020 17:39:06 +0200
Subject: [PATCH 133/222] settings: add match for proc cmdline

Add a new "kernel-command-line" match option to nm-settings. It allows
to disable a network connection configuration if a pattern is found or
is not found in /proc/cmdline.
---
 clients/common/nm-meta-setting-desc.c |  45 ++++++
 clients/common/settings-docs.h.in     |   1 +
 libnm-core/nm-setting-match.c         | 192 ++++++++++++++++++++++++++
 libnm-core/nm-setting-match.h         |  20 +++
 libnm/libnm.ver                       |   7 +
 src/devices/nm-device.c               |  55 +++++++-
 6 files changed, 319 insertions(+), 1 deletion(-)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index d2082fdaee..79d9efd296 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -3459,6 +3459,35 @@ _get_fcn_match_interface_name (ARGS_GET_FCN)
 	RETURN_STR_TO_FREE (g_string_free (str, FALSE));
 }
 
+static gconstpointer
+_get_fcn_match_kernel_command_line (ARGS_GET_FCN)
+{
+	NMSettingMatch *s_match = NM_SETTING_MATCH (setting);
+	GString *str = NULL;
+	guint i, num;
+
+	RETURN_UNSUPPORTED_GET_TYPE ();
+
+	num = nm_setting_match_get_num_kernel_command_lines (s_match);
+	for (i = 0; i < num; i++) {
+		const char *name;
+
+		name = nm_setting_match_get_kernel_command_line (s_match, i);
+		if (!name || !name[0])
+			continue;
+		if (!str)
+			str = g_string_new ("");
+		else
+			g_string_append_c (str, ESCAPED_TOKENS_WITH_SPACES_DELIMTER);
+		nm_utils_escaped_tokens_escape_gstr (name, ESCAPED_TOKENS_WITH_SPACES_DELIMTERS, str);
+	}
+
+	NM_SET_OUT (out_is_default, num == 0);
+	if (!str)
+		return NULL;
+	RETURN_STR_TO_FREE (g_string_free (str, FALSE));
+}
+
 static gconstpointer
 _get_fcn_olpc_mesh_ssid (ARGS_GET_FCN)
 {
@@ -6209,6 +6238,22 @@ static const NMMetaPropertyInfo *const property_infos_MATCH[] = {
 	        ),
 	    ),
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_MATCH_KERNEL_COMMAND_LINE,
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_match_kernel_command_line,
+	        .set_fcn =                  _set_fcn_multilist,
+	        .set_supports_remove =      TRUE,
+	    ),
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u   =      MULTILIST_GET_NUM_FCN_U       (NMSettingMatch, nm_setting_match_get_num_kernel_command_lines),
+	            .add2_fcn =             MULTILIST_ADD2_FCN            (NMSettingMatch, nm_setting_match_add_kernel_command_line),
+	            .remove_by_idx_fcn_u =  MULTILIST_REMOVE_BY_IDX_FCN_U (NMSettingMatch, nm_setting_match_remove_kernel_command_line),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingMatch, nm_setting_match_remove_kernel_command_line_by_value),
+	            .strsplit_with_spaces = TRUE,
+	        ),
+	    ),
+	),
 	NULL
 };
 
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 8b3c964919..df9dfcef3f 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -281,6 +281,7 @@
 #define DESCRIBE_DOC_NM_SETTING_MACVLAN_PROMISCUOUS N_("Whether the interface should be put in promiscuous mode.")
 #define DESCRIBE_DOC_NM_SETTING_MACVLAN_TAP N_("Whether the interface should be a MACVTAP.")
 #define DESCRIBE_DOC_NM_SETTING_MATCH_INTERFACE_NAME N_("A list of interface names to match. Each element is a shell wildcard pattern.  When an element is prefixed with exclamation mark (!) the condition is inverted. A candidate interface name is considered matching when both these conditions are satisfied: (a) any of the elements not prefixed with '!' matches or there aren't such elements; (b) none of the elements prefixed with '!' match.")
+#define DESCRIBE_DOC_NM_SETTING_MATCH_KERNEL_COMMAND_LINE N_("A list of kernel command line arguments to match. This may be used to check whether a specific kernel command line option is set (or if prefixed with the exclamation mark unset). The argument must either be a single word, or an assignment (i.e. two words, separated \"=\"). In the former case the kernel command line is searched for the word appearing as is, or as left hand side of an assignment. In the latter case, the exact assignment is looked for with right and left hand side matching.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_DATAPATH_TYPE N_("The data path type. One of \"system\", \"netdev\" or empty.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_FAIL_MODE N_("The bridge failure mode. One of \"secure\", \"standalone\" or empty.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE N_("Enable or disable multicast snooping.")
diff --git a/libnm-core/nm-setting-match.c b/libnm-core/nm-setting-match.c
index aaed0b525a..8309af6b97 100644
--- a/libnm-core/nm-setting-match.c
+++ b/libnm-core/nm-setting-match.c
@@ -20,6 +20,7 @@
 
 NM_GOBJECT_PROPERTIES_DEFINE (NMSettingMatch,
 	PROP_INTERFACE_NAME,
+	PROP_KERNEL_COMMAND_LINE,
 );
 
 /**
@@ -32,6 +33,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingMatch,
 struct _NMSettingMatch {
 	NMSetting parent;
 	GPtrArray *interface_name;
+	GPtrArray *kernel_command_line;
 };
 
 struct _NMSettingMatchClass {
@@ -191,6 +193,154 @@ nm_setting_match_get_interface_names (NMSettingMatch *setting, guint *length)
 
 /*****************************************************************************/
 
+/**
+ * nm_setting_match_get_num_kernel_command_lines:
+ * @setting: the #NMSettingMatch
+ *
+ * Returns: the number of configured kernel command line arguments
+ *
+ * Since: 1.26
+ **/
+guint
+nm_setting_match_get_num_kernel_command_lines (NMSettingMatch *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), 0);
+
+	return setting->kernel_command_line->len;
+}
+
+/**
+ * nm_setting_match_get_kernel_command_line:
+ * @setting: the #NMSettingMatch
+ * @idx: index number of the kernel command line argument to return
+ *
+ * Returns: the kernel command line argument at index @idx
+ *
+ * Since: 1.26
+ **/
+const char *
+nm_setting_match_get_kernel_command_line (NMSettingMatch *setting, guint idx)
+{
+	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), NULL);
+
+	g_return_val_if_fail (idx < setting->kernel_command_line->len, NULL);
+
+	return setting->kernel_command_line->pdata[idx];
+}
+
+/**
+ * nm_setting_match_add_kernel_command_line:
+ * @setting: the #NMSettingMatch
+ * @kernel_command_line: the kernel command line argument to add
+ *
+ * Adds a new kernel command line argument to the setting.
+ *
+ * Since: 1.26
+ **/
+void
+nm_setting_match_add_kernel_command_line (NMSettingMatch *setting,
+                                          const char *kernel_command_line)
+{
+	g_return_if_fail (NM_IS_SETTING_MATCH (setting));
+	g_return_if_fail (kernel_command_line != NULL);
+	g_return_if_fail (kernel_command_line[0] != '\0');
+
+	g_ptr_array_add (setting->kernel_command_line, g_strdup (kernel_command_line));
+	_notify (setting, PROP_KERNEL_COMMAND_LINE);
+}
+
+/**
+ * nm_setting_match_remove_kernel_command_line:
+ * @setting: the #NMSettingMatch
+ * @idx: index number of the kernel command line argument
+ *
+ * Removes the kernel command line argument at index @idx.
+ *
+ * Since: 1.26
+ **/
+void
+nm_setting_match_remove_kernel_command_line (NMSettingMatch *setting, guint idx)
+{
+	g_return_if_fail (NM_IS_SETTING_MATCH (setting));
+
+	g_return_if_fail (idx < setting->kernel_command_line->len);
+
+	g_ptr_array_remove_index (setting->kernel_command_line, idx);
+	_notify (setting, PROP_KERNEL_COMMAND_LINE);
+}
+
+/**
+ * nm_setting_match_remove_kernel_command_line_by_value:
+ * @setting: the #NMSettingMatch
+ * @kernel_command_line: the kernel command line argument name to remove
+ *
+ * Removes @kernel_command_line.
+ *
+ * Returns: %TRUE if the kernel command line argument was found and removed; %FALSE if it was not.
+ *
+ * Since: 1.26
+ **/
+gboolean
+nm_setting_match_remove_kernel_command_line_by_value (NMSettingMatch *setting,
+                                                      const char *kernel_command_line)
+{
+	guint i;
+
+	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), FALSE);
+	g_return_val_if_fail (kernel_command_line != NULL, FALSE);
+	g_return_val_if_fail (kernel_command_line[0] != '\0', FALSE);
+
+	for (i = 0; i < setting->kernel_command_line->len; i++) {
+		if (nm_streq (kernel_command_line, setting->kernel_command_line->pdata[i])) {
+			g_ptr_array_remove_index (setting->kernel_command_line, i);
+			_notify (setting, PROP_KERNEL_COMMAND_LINE);
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+/**
+ * nm_setting_match_clear_kernel_command_lines:
+ * @setting: the #NMSettingMatch
+ *
+ * Removes all configured kernel command line arguments.
+ *
+ * Since: 1.26
+ **/
+void
+nm_setting_match_clear_kernel_command_lines (NMSettingMatch *setting)
+{
+	g_return_if_fail (NM_IS_SETTING_MATCH (setting));
+
+	if (setting->kernel_command_line->len != 0) {
+		g_ptr_array_set_size (setting->kernel_command_line, 0);
+		_notify (setting, PROP_KERNEL_COMMAND_LINE);
+	}
+}
+
+/**
+ * nm_setting_match_get_kernel_command_lines:
+ * @setting: the #NMSettingMatch
+ *
+ * Returns all the interface names.
+ *
+ * Returns: (transfer none): the configured interface names.
+ *
+ * Since: 1.26
+ **/
+const char *const *
+nm_setting_match_get_kernel_command_lines (NMSettingMatch *setting, guint *length)
+{
+	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), NULL);
+	g_return_val_if_fail (length, NULL);
+
+	NM_SET_OUT (length, setting->kernel_command_line->len);
+	return (const char *const *) setting->kernel_command_line->pdata;
+}
+
+/*****************************************************************************/
+
 static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
@@ -201,6 +351,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_INTERFACE_NAME:
 		g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (self->interface_name));
 		break;
+	case PROP_KERNEL_COMMAND_LINE:
+		g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (self->kernel_command_line));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -218,6 +371,10 @@ set_property (GObject *object, guint prop_id,
 		g_ptr_array_unref (self->interface_name);
 		self->interface_name = _nm_utils_strv_to_ptrarray (g_value_get_boxed (value));
 		break;
+	case PROP_KERNEL_COMMAND_LINE:
+		g_ptr_array_unref (self->kernel_command_line);
+		self->kernel_command_line = _nm_utils_strv_to_ptrarray (g_value_get_boxed (value));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -230,6 +387,7 @@ static void
 nm_setting_match_init (NMSettingMatch *setting)
 {
 	setting->interface_name = g_ptr_array_new_with_free_func (g_free);
+	setting->kernel_command_line = g_ptr_array_new_with_free_func (g_free);
 }
 
 /**
@@ -266,6 +424,19 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		}
 	}
 
+	for (k = 0; k < self->kernel_command_line->len; k++) {
+		char *kparam = (char*) g_ptr_array_index (self->kernel_command_line, k);
+		if (nm_streq0 (kparam, "")) {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			             _("is empty"));
+			g_prefix_error (error, "%s.%s: ", NM_SETTING_MATCH_SETTING_NAME,
+			                NM_SETTING_MATCH_KERNEL_COMMAND_LINE);
+			return FALSE;
+		}
+	}
+
 	return TRUE;
 }
 
@@ -275,6 +446,7 @@ finalize (GObject *object)
 	NMSettingMatch *self = NM_SETTING_MATCH (object);
 
 	g_ptr_array_unref (self->interface_name);
+	g_ptr_array_unref (self->kernel_command_line);
 
 	G_OBJECT_CLASS (nm_setting_match_parent_class)->finalize (object);
 }
@@ -312,6 +484,26 @@ nm_setting_match_class_init (NMSettingMatchClass *klass)
 	                        G_PARAM_READWRITE |
 	                        G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingMatch:kernel-command-line
+	 *
+	 * A list of kernel command line arguments to match. This may be used to check
+	 * whether a specific kernel command line option is set (or if prefixed with
+	 * the exclamation mark unset). The argument must either be a single word, or
+	 * an assignment (i.e. two words, separated "="). In the former case the kernel
+	 * command line is searched for the word appearing as is, or as left hand side
+	 * of an assignment. In the latter case, the exact assignment is looked for
+	 * with right and left hand side matching.
+	 *
+	 * Since: 1.26
+	 **/
+	obj_properties[PROP_KERNEL_COMMAND_LINE] =
+	    g_param_spec_boxed (NM_SETTING_MATCH_KERNEL_COMMAND_LINE, "", "",
+	                        G_TYPE_STRV,
+	                        NM_SETTING_PARAM_FUZZY_IGNORE |
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_MATCH);
diff --git a/libnm-core/nm-setting-match.h b/libnm-core/nm-setting-match.h
index e15911adb3..8301d8863c 100644
--- a/libnm-core/nm-setting-match.h
+++ b/libnm-core/nm-setting-match.h
@@ -24,6 +24,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_MATCH_SETTING_NAME      "match"
 
 #define NM_SETTING_MATCH_INTERFACE_NAME    "interface-name"
+#define NM_SETTING_MATCH_KERNEL_COMMAND_LINE    "kernel-command-line"
 
 typedef struct _NMSettingMatchClass NMSettingMatchClass;
 
@@ -49,6 +50,25 @@ NM_AVAILABLE_IN_1_14
 void nm_setting_match_clear_interface_names (NMSettingMatch *setting);
 NM_AVAILABLE_IN_1_14
 const char *const *nm_setting_match_get_interface_names (NMSettingMatch *setting, guint *length);
+
+
+NM_AVAILABLE_IN_1_26
+guint nm_setting_match_get_num_kernel_command_lines (NMSettingMatch *setting);
+NM_AVAILABLE_IN_1_26
+const char *nm_setting_match_get_kernel_command_line (NMSettingMatch *setting, guint idx);
+NM_AVAILABLE_IN_1_26
+void nm_setting_match_remove_kernel_command_line (NMSettingMatch *setting, guint idx);
+NM_AVAILABLE_IN_1_26
+gboolean nm_setting_match_remove_kernel_command_line_by_value (NMSettingMatch *setting,
+                                                               const char *kernel_command_line);
+NM_AVAILABLE_IN_1_26
+void nm_setting_match_add_kernel_command_line (NMSettingMatch *setting,
+                                               const char *kernel_command_line);
+NM_AVAILABLE_IN_1_26
+void nm_setting_match_clear_kernel_command_lines (NMSettingMatch *setting);
+NM_AVAILABLE_IN_1_26
+const char *const *nm_setting_match_get_kernel_command_lines (NMSettingMatch *setting, guint *length);
+
 G_END_DECLS
 
 #endif /* NM_SETTING_MATCH_H */
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index b691becb13..9324ea0ade 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1708,4 +1708,11 @@ global:
 	nm_setting_bridge_get_multicast_startup_query_count;
 	nm_setting_bridge_get_multicast_startup_query_interval;
 	nm_setting_connection_get_mud_url;
+	nm_setting_match_add_kernel_command_line;
+	nm_setting_match_clear_kernel_command_lines;
+	nm_setting_match_get_kernel_command_line;
+	nm_setting_match_get_kernel_command_lines;
+	nm_setting_match_get_num_kernel_command_lines;
+	nm_setting_match_remove_kernel_command_line;
+	nm_setting_match_remove_kernel_command_line_by_value;
 } libnm_1_24_0;
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 27b1b600b1..272bf25336 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -5999,7 +5999,6 @@ check_connection_compatible (NMDevice *self, NMConnection *connection, GError **
 	gs_free_error GError *local = NULL;
 	gs_free char *conn_iface = NULL;
 	NMDeviceClass *klass;
-	const char *const *patterns;
 	NMSettingMatch *s_match;
 
 	klass = NM_DEVICE_GET_CLASS (self);
@@ -6042,14 +6041,68 @@ check_connection_compatible (NMDevice *self, NMConnection *connection, GError **
 	s_match = (NMSettingMatch *) nm_connection_get_setting (connection,
 	                                                        NM_TYPE_SETTING_MATCH);
 	if (s_match) {
+		const char *const *patterns;
 		guint num_patterns = 0;
 
+		/* interface_names */
 		patterns = nm_setting_match_get_interface_names (s_match, &num_patterns);
 		if (!nm_wildcard_match_check (device_iface, patterns, num_patterns)) {
 			nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
 			                            "device does not satisfy match.interface-name property");
 			return FALSE;
 		}
+
+		{ /* kernel_command_line */
+			const char *const*proc_cmdline;
+			const char *const*proc_cmdline_i;
+			unsigned i;
+			gboolean pos_patterns = FALSE;
+
+			patterns = nm_setting_match_get_kernel_command_lines (s_match, &num_patterns);
+			proc_cmdline = nm_utils_proc_cmdline_split ();
+			for(i=0; i<num_patterns; i++) {
+				gboolean found = FALSE;
+				gboolean negative = FALSE;
+				const char *equal;
+				const char *patterns_i = patterns[i];
+
+				if(patterns_i[0] == '!') {
+					++patterns_i;
+					negative = TRUE;
+				} else {
+					pos_patterns = TRUE;
+				}
+				equal = strchr(patterns_i, '=');
+
+				proc_cmdline_i = proc_cmdline;
+				while (*proc_cmdline_i) {
+					if (equal) {  /* if pattern contains = compare full key=value */
+						found = nm_streq0(*proc_cmdline_i, patterns_i);
+					} else {      /* otherwise consider pattern as key only */
+						size_t l = strlen(patterns_i);
+						if (strncmp(*proc_cmdline_i, patterns_i, l) == 0) {
+							if((*proc_cmdline_i)[l] == 0 || (*proc_cmdline_i)[l] == '=') {
+								found = TRUE;
+							}
+						}
+					}
+					if(found && negative) {
+						nm_utils_error_set (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
+						                    "device does not satisfy match.kernel-command-line property %s",
+						                    patterns[i]);
+						return FALSE;  /* first negative match */
+					}
+					proc_cmdline_i++;
+				}
+
+				if (pos_patterns == TRUE && found == FALSE) {  /* positive patterns configured but no match */
+					nm_utils_error_set (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
+					                    "device does not satisfy any match.kernel-command-line property %s...",
+					                    patterns[0]);
+					return FALSE;
+				}
+			}
+		}
 	}
 
 	return TRUE;

From 214b31dcbc83369d0e2c14c0064e23c63f2b9968 Mon Sep 17 00:00:00 2001
From: Adrian Freihofer <adrian.freihofer@siemens.com>
Date: Tue, 21 Apr 2020 17:39:12 +0200
Subject: [PATCH 134/222] settings: add match for driver

Add a new "driver" match option to nm-settings. It allows to disable a
network connection configuration if a pattern is found or is not found
in the device driver name.
---
 clients/common/nm-meta-setting-desc.c |  45 ++++++
 clients/common/settings-docs.h.in     |   1 +
 libnm-core/nm-setting-match.c         | 191 ++++++++++++++++++++++++++
 libnm-core/nm-setting-match.h         |  19 +++
 libnm/libnm.ver                       |   7 +
 src/devices/nm-device.c               |  13 ++
 6 files changed, 276 insertions(+)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 79d9efd296..756ff56697 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -3488,6 +3488,35 @@ _get_fcn_match_kernel_command_line (ARGS_GET_FCN)
 	RETURN_STR_TO_FREE (g_string_free (str, FALSE));
 }
 
+static gconstpointer
+_get_fcn_match_driver (ARGS_GET_FCN)
+{
+	NMSettingMatch *s_match = NM_SETTING_MATCH (setting);
+	GString *str = NULL;
+	guint i, num;
+
+	RETURN_UNSUPPORTED_GET_TYPE ();
+
+	num = nm_setting_match_get_num_drivers (s_match);
+	for (i = 0; i < num; i++) {
+		const char *name;
+
+		name = nm_setting_match_get_driver (s_match, i);
+		if (!name || !name[0])
+			continue;
+		if (!str)
+			str = g_string_new ("");
+		else
+			g_string_append_c (str, ESCAPED_TOKENS_WITH_SPACES_DELIMTER);
+		nm_utils_escaped_tokens_escape_gstr (name, ESCAPED_TOKENS_WITH_SPACES_DELIMTERS, str);
+	}
+
+	NM_SET_OUT (out_is_default, num == 0);
+	if (!str)
+		return NULL;
+	RETURN_STR_TO_FREE (g_string_free (str, FALSE));
+}
+
 static gconstpointer
 _get_fcn_olpc_mesh_ssid (ARGS_GET_FCN)
 {
@@ -6254,6 +6283,22 @@ static const NMMetaPropertyInfo *const property_infos_MATCH[] = {
 	        ),
 	    ),
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_MATCH_DRIVER,
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_match_driver,
+	        .set_fcn =                  _set_fcn_multilist,
+	        .set_supports_remove =      TRUE,
+	    ),
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u   =      MULTILIST_GET_NUM_FCN_U       (NMSettingMatch, nm_setting_match_get_num_drivers),
+	            .add2_fcn =             MULTILIST_ADD2_FCN            (NMSettingMatch, nm_setting_match_add_driver),
+	            .remove_by_idx_fcn_u =  MULTILIST_REMOVE_BY_IDX_FCN_U (NMSettingMatch, nm_setting_match_remove_driver),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingMatch, nm_setting_match_remove_driver_by_value),
+	            .strsplit_with_spaces = TRUE,
+	        ),
+	    ),
+	),
 	NULL
 };
 
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index df9dfcef3f..b51d0a1ecf 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -280,6 +280,7 @@
 #define DESCRIBE_DOC_NM_SETTING_MACVLAN_PARENT N_("If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an \"802-3-ethernet\" setting with a \"mac-address\" property.")
 #define DESCRIBE_DOC_NM_SETTING_MACVLAN_PROMISCUOUS N_("Whether the interface should be put in promiscuous mode.")
 #define DESCRIBE_DOC_NM_SETTING_MACVLAN_TAP N_("Whether the interface should be a MACVTAP.")
+#define DESCRIBE_DOC_NM_SETTING_MATCH_DRIVER N_("A list of driver names to match. Each element is a shell wildcard pattern. When an element is prefixed with exclamation mark (!) the condition is inverted. A candidate driver name is considered matching when both these conditions are satisfied: (a) any of the elements not prefixed with '!' matches or there aren't such elements; (b) none of the elements prefixed with '!' match.")
 #define DESCRIBE_DOC_NM_SETTING_MATCH_INTERFACE_NAME N_("A list of interface names to match. Each element is a shell wildcard pattern.  When an element is prefixed with exclamation mark (!) the condition is inverted. A candidate interface name is considered matching when both these conditions are satisfied: (a) any of the elements not prefixed with '!' matches or there aren't such elements; (b) none of the elements prefixed with '!' match.")
 #define DESCRIBE_DOC_NM_SETTING_MATCH_KERNEL_COMMAND_LINE N_("A list of kernel command line arguments to match. This may be used to check whether a specific kernel command line option is set (or if prefixed with the exclamation mark unset). The argument must either be a single word, or an assignment (i.e. two words, separated \"=\"). In the former case the kernel command line is searched for the word appearing as is, or as left hand side of an assignment. In the latter case, the exact assignment is looked for with right and left hand side matching.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_DATAPATH_TYPE N_("The data path type. One of \"system\", \"netdev\" or empty.")
diff --git a/libnm-core/nm-setting-match.c b/libnm-core/nm-setting-match.c
index 8309af6b97..6c9802e3b6 100644
--- a/libnm-core/nm-setting-match.c
+++ b/libnm-core/nm-setting-match.c
@@ -21,6 +21,7 @@
 NM_GOBJECT_PROPERTIES_DEFINE (NMSettingMatch,
 	PROP_INTERFACE_NAME,
 	PROP_KERNEL_COMMAND_LINE,
+	PROP_DRIVER,
 );
 
 /**
@@ -34,6 +35,7 @@ struct _NMSettingMatch {
 	NMSetting parent;
 	GPtrArray *interface_name;
 	GPtrArray *kernel_command_line;
+	GPtrArray *driver;
 };
 
 struct _NMSettingMatchClass {
@@ -341,6 +343,154 @@ nm_setting_match_get_kernel_command_lines (NMSettingMatch *setting, guint *lengt
 
 /*****************************************************************************/
 
+/**
+ * nm_setting_match_get_num_drivers:
+ * @setting: the #NMSettingMatch
+ *
+ * Returns: the number of configured drivers
+ *
+ * Since: 1.26
+ **/
+guint
+nm_setting_match_get_num_drivers (NMSettingMatch *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), 0);
+
+	return setting->driver->len;
+}
+
+/**
+ * nm_setting_match_get_driver:
+ * @setting: the #NMSettingMatch
+ * @idx: index number of the DNS search domain to return
+ *
+ * Returns: the driver at index @idx
+ *
+ * Since: 1.26
+ **/
+const char *
+nm_setting_match_get_driver (NMSettingMatch *setting, guint idx)
+{
+	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), NULL);
+
+	g_return_val_if_fail (idx < setting->driver->len, NULL);
+
+	return setting->driver->pdata[idx];
+}
+
+/**
+ * nm_setting_match_add_driver:
+ * @setting: the #NMSettingMatch
+ * @driver: the driver to add
+ *
+ * Adds a new driver to the setting.
+ *
+ * Since: 1.26
+ **/
+void
+nm_setting_match_add_driver (NMSettingMatch *setting,
+                             const char *driver)
+{
+	g_return_if_fail (NM_IS_SETTING_MATCH (setting));
+	g_return_if_fail (driver != NULL);
+	g_return_if_fail (driver[0] != '\0');
+
+	g_ptr_array_add (setting->driver, g_strdup (driver));
+	_notify (setting, PROP_DRIVER);
+}
+
+/**
+ * nm_setting_match_remove_driver:
+ * @setting: the #NMSettingMatch
+ * @idx: index number of the driver
+ *
+ * Removes the driver at index @idx.
+ *
+ * Since: 1.26
+ **/
+void
+nm_setting_match_remove_driver (NMSettingMatch *setting, guint idx)
+{
+	g_return_if_fail (NM_IS_SETTING_MATCH (setting));
+
+	g_return_if_fail (idx < setting->driver->len);
+
+	g_ptr_array_remove_index (setting->driver, idx);
+	_notify (setting, PROP_DRIVER);
+}
+
+/**
+ * nm_setting_match_remove_driver_by_value:
+ * @setting: the #NMSettingMatch
+ * @driver: the driver to remove
+ *
+ * Removes @driver.
+ *
+ * Returns: %TRUE if the driver was found and removed; %FALSE if it was not.
+ *
+ * Since: 1.26
+ **/
+gboolean
+nm_setting_match_remove_driver_by_value (NMSettingMatch *setting,
+                                         const char *driver)
+{
+	guint i;
+
+	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), FALSE);
+	g_return_val_if_fail (driver != NULL, FALSE);
+	g_return_val_if_fail (driver[0] != '\0', FALSE);
+
+	for (i = 0; i < setting->driver->len; i++) {
+		if (nm_streq (driver, setting->driver->pdata[i])) {
+			g_ptr_array_remove_index (setting->driver, i);
+			_notify (setting, PROP_DRIVER);
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+/**
+ * nm_setting_match_clear_drivers:
+ * @setting: the #NMSettingMatch
+ *
+ * Removes all configured drivers.
+ *
+ * Since: 1.26
+ **/
+void
+nm_setting_match_clear_drivers (NMSettingMatch *setting)
+{
+	g_return_if_fail (NM_IS_SETTING_MATCH (setting));
+
+	if (setting->driver->len != 0) {
+		g_ptr_array_set_size (setting->driver, 0);
+		_notify (setting, PROP_DRIVER);
+	}
+}
+
+/**
+ * nm_setting_match_get_drivers:
+ * @setting: the #NMSettingMatch
+ *
+ * Returns all the drivers.
+ *
+ * Returns: (transfer none): the configured drivers.
+ *
+ * Since: 1.26
+ **/
+const char *const *
+nm_setting_match_get_drivers (NMSettingMatch *setting, guint *length)
+{
+	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), NULL);
+	g_return_val_if_fail (length, NULL);
+
+	NM_SET_OUT (length, setting->driver->len);
+	return (const char *const *) setting->driver->pdata;
+}
+
+/*****************************************************************************/
+
 static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
@@ -354,6 +504,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_KERNEL_COMMAND_LINE:
 		g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (self->kernel_command_line));
 		break;
+	case PROP_DRIVER:
+		g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (self->driver));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -375,6 +528,10 @@ set_property (GObject *object, guint prop_id,
 		g_ptr_array_unref (self->kernel_command_line);
 		self->kernel_command_line = _nm_utils_strv_to_ptrarray (g_value_get_boxed (value));
 		break;
+	case PROP_DRIVER:
+		g_ptr_array_unref (self->driver);
+		self->driver = _nm_utils_strv_to_ptrarray (g_value_get_boxed (value));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -388,6 +545,7 @@ nm_setting_match_init (NMSettingMatch *setting)
 {
 	setting->interface_name = g_ptr_array_new_with_free_func (g_free);
 	setting->kernel_command_line = g_ptr_array_new_with_free_func (g_free);
+	setting->driver = g_ptr_array_new_with_free_func (g_free);
 }
 
 /**
@@ -437,6 +595,19 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		}
 	}
 
+	for (k = 0; k < self->driver->len; k++) {
+		char *kparam = (char*) g_ptr_array_index (self->driver, k);
+		if (nm_streq0 (kparam, "")) {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			             _("is empty"));
+			g_prefix_error (error, "%s.%s: ", NM_SETTING_MATCH_SETTING_NAME,
+			                NM_SETTING_MATCH_DRIVER);
+			return FALSE;
+		}
+	}
+
 	return TRUE;
 }
 
@@ -447,6 +618,7 @@ finalize (GObject *object)
 
 	g_ptr_array_unref (self->interface_name);
 	g_ptr_array_unref (self->kernel_command_line);
+	g_ptr_array_unref (self->driver);
 
 	G_OBJECT_CLASS (nm_setting_match_parent_class)->finalize (object);
 }
@@ -504,6 +676,25 @@ nm_setting_match_class_init (NMSettingMatchClass *klass)
 	                        G_PARAM_READWRITE |
 	                        G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingMatch:driver
+	 *
+	 * A list of driver names to match. Each element is a shell wildcard pattern.
+	 * When an element is prefixed with exclamation mark (!) the condition is
+	 * inverted. A candidate driver name is considered matching when both these
+	 * conditions are satisfied: (a) any of the elements not prefixed with '!'
+	 * matches or there aren't such elements; (b) none of the elements prefixed
+	 * with '!' match.
+	 *
+	 * Since: 1.26
+	 **/
+	obj_properties[PROP_DRIVER] =
+	    g_param_spec_boxed (NM_SETTING_MATCH_DRIVER, "", "",
+	                        G_TYPE_STRV,
+	                        NM_SETTING_PARAM_FUZZY_IGNORE |
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_MATCH);
diff --git a/libnm-core/nm-setting-match.h b/libnm-core/nm-setting-match.h
index 8301d8863c..fa656037e0 100644
--- a/libnm-core/nm-setting-match.h
+++ b/libnm-core/nm-setting-match.h
@@ -25,6 +25,7 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_MATCH_INTERFACE_NAME    "interface-name"
 #define NM_SETTING_MATCH_KERNEL_COMMAND_LINE    "kernel-command-line"
+#define NM_SETTING_MATCH_DRIVER            "driver"
 
 typedef struct _NMSettingMatchClass NMSettingMatchClass;
 
@@ -69,6 +70,24 @@ void nm_setting_match_clear_kernel_command_lines (NMSettingMatch *setting);
 NM_AVAILABLE_IN_1_26
 const char *const *nm_setting_match_get_kernel_command_lines (NMSettingMatch *setting, guint *length);
 
+
+NM_AVAILABLE_IN_1_26
+guint nm_setting_match_get_num_drivers (NMSettingMatch *setting);
+NM_AVAILABLE_IN_1_26
+const char *nm_setting_match_get_driver (NMSettingMatch *setting, guint idx);
+NM_AVAILABLE_IN_1_26
+void nm_setting_match_remove_driver (NMSettingMatch *setting, guint idx);
+NM_AVAILABLE_IN_1_26
+gboolean nm_setting_match_remove_driver_by_value (NMSettingMatch *setting,
+                                                  const char *driver);
+NM_AVAILABLE_IN_1_26
+void nm_setting_match_add_driver (NMSettingMatch *setting,
+                                  const char *driver);
+NM_AVAILABLE_IN_1_26
+void nm_setting_match_clear_drivers (NMSettingMatch *setting);
+NM_AVAILABLE_IN_1_26
+const char *const *nm_setting_match_get_drivers (NMSettingMatch *setting, guint *length);
+
 G_END_DECLS
 
 #endif /* NM_SETTING_MATCH_H */
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 9324ea0ade..8add06a070 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1715,4 +1715,11 @@ global:
 	nm_setting_match_get_num_kernel_command_lines;
 	nm_setting_match_remove_kernel_command_line;
 	nm_setting_match_remove_kernel_command_line_by_value;
+	nm_setting_match_add_driver;
+	nm_setting_match_clear_drivers;
+	nm_setting_match_get_driver;
+	nm_setting_match_get_drivers;
+	nm_setting_match_get_num_drivers;
+	nm_setting_match_remove_driver;
+	nm_setting_match_remove_driver_by_value;
 } libnm_1_24_0;
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 272bf25336..e4661a7dc4 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -6103,6 +6103,19 @@ check_connection_compatible (NMDevice *self, NMConnection *connection, GError **
 				}
 			}
 		}
+
+		{ /* driver */
+			const char *device_driver = nm_device_get_driver (self);
+
+			if (device_driver) {
+				patterns = nm_setting_match_get_drivers (s_match, &num_patterns);
+				if (!nm_wildcard_match_check (device_driver, patterns, num_patterns)) {
+					nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
+					                            "device does not satisfy match.driver property");
+					return FALSE;
+				}
+			}
+		}
 	}
 
 	return TRUE;

From e8885db046a2ffc461ce6aac34ff985b05915b1b Mon Sep 17 00:00:00 2001
From: Adrian Freihofer <adrian.freihofer@siemens.com>
Date: Tue, 21 Apr 2020 17:39:19 +0200
Subject: [PATCH 135/222] po add libnm-core/nm-setting-match.c

---
 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 852901d8ab..93df2fa2a5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -75,6 +75,7 @@ libnm-core/nm-setting-ip4-config.c
 libnm-core/nm-setting-ip6-config.c
 libnm-core/nm-setting-macsec.c
 libnm-core/nm-setting-macvlan.c
+libnm-core/nm-setting-match.c
 libnm-core/nm-setting-olpc-mesh.c
 libnm-core/nm-setting-ovs-bridge.c
 libnm-core/nm-setting-ovs-interface.c

From d8a7f65ef42add9fd8a91f8392639549a2e790ba Mon Sep 17 00:00:00 2001
From: Adrian Freihofer <adrian.freihofer@siemens.com>
Date: Tue, 21 Apr 2020 17:39:25 +0200
Subject: [PATCH 136/222] ifcfg-rh-reader: match refactoring

---
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index d8b4d79bb7..63a1fa7f00 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -1537,27 +1537,34 @@ make_user_setting (shvarFile *ifcfg)
 	       : NULL;
 }
 
+
+static void
+make_match_setting_prop (const char *v, NMSettingMatch **s_match,
+                         void (*add_fcn) (NMSettingMatch *s_match, const char *value) ) {
+	gs_free const char **strv = NULL;
+	gsize i;
+
+	if (v) {
+		strv = nm_utils_escaped_tokens_split (v, NM_ASCII_SPACES);
+		if (strv) {
+			for (i = 0; strv[i]; i++) {
+				if (!(*s_match))
+					*s_match = (NMSettingMatch *) nm_setting_match_new ();
+				add_fcn (*s_match, strv[i]);
+			}
+		}
+	}
+}
+
 static NMSetting *
 make_match_setting (shvarFile *ifcfg)
 {
 	NMSettingMatch *s_match = NULL;
-	gs_free const char **strv = NULL;
-	gs_free char *value = NULL;
+	gs_free char *value_ifn = NULL;
 	const char *v;
-	gsize i;
 
-	v = svGetValueStr (ifcfg, "MATCH_INTERFACE_NAME", &value);
-	if (!v)
-		return NULL;
-
-	strv = nm_utils_escaped_tokens_split (v, NM_ASCII_SPACES);
-	if (strv) {
-		for (i = 0; strv[i]; i++) {
-			if (!s_match)
-				s_match = (NMSettingMatch *) nm_setting_match_new ();
-			nm_setting_match_add_interface_name (s_match, strv[i]);
-		}
-	}
+	v = svGetValueStr (ifcfg, "MATCH_INTERFACE_NAME", &value_ifn);
+	make_match_setting_prop(v, &s_match, nm_setting_match_add_interface_name);
 
 	return (NMSetting *) s_match;
 }

From 369d8585259087782edef81e19fc8aad204d9e3e Mon Sep 17 00:00:00 2001
From: Adrian Freihofer <adrian.freihofer@siemens.com>
Date: Tue, 21 Apr 2020 17:39:38 +0200
Subject: [PATCH 137/222] ifcfg-rh: support new match filters

---
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |  6 ++
 .../plugins/ifcfg-rh/nms-ifcfg-rh-utils.c     |  2 +
 .../plugins/ifcfg-rh/nms-ifcfg-rh-utils.h     |  2 +-
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    | 73 +++++++++++++++----
 .../ifcfg-Test_Write_Wired_match.cexpected    |  2 +
 .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c    |  3 +
 6 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 63a1fa7f00..991ad77d0d 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -1561,10 +1561,16 @@ make_match_setting (shvarFile *ifcfg)
 {
 	NMSettingMatch *s_match = NULL;
 	gs_free char *value_ifn = NULL;
+	gs_free char *value_kcl = NULL;
+	gs_free char *value_d = NULL;
 	const char *v;
 
 	v = svGetValueStr (ifcfg, "MATCH_INTERFACE_NAME", &value_ifn);
 	make_match_setting_prop(v, &s_match, nm_setting_match_add_interface_name);
+	v = svGetValueStr (ifcfg, "MATCH_KERNEL_COMMAND_LINE", &value_kcl);
+	make_match_setting_prop(v, &s_match, nm_setting_match_add_kernel_command_line);
+	v = svGetValueStr (ifcfg, "MATCH_DRIVER", &value_d);
+	make_match_setting_prop(v, &s_match, nm_setting_match_add_driver);
 
 	return (NMSetting *) s_match;
 }
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
index 92e49caa51..06d4928ae5 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
@@ -888,7 +888,9 @@ const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[] = {
 	_KEY_TYPE ("MAC_ADDRESS_RANDOMIZATION",                   NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("MASTER",                                      NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("MASTER_UUID",                                 NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
+	_KEY_TYPE ("MATCH_DRIVER",                                NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("MATCH_INTERFACE_NAME",                        NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
+	_KEY_TYPE ("MATCH_KERNEL_COMMAND_LINE",                   NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("MDNS",                                        NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
 	_KEY_TYPE ("METRIC",                                      NMS_IFCFG_KEY_TYPE_IS_NUMBERED ),
 	_KEY_TYPE ("MODE",                                        NMS_IFCFG_KEY_TYPE_IS_PLAIN ),
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
index e6343e1dcd..805f1581f1 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
@@ -33,7 +33,7 @@ typedef struct {
 	NMSIfcfgKeyTypeFlags key_flags;
 } NMSIfcfgKeyTypeInfo;
 
-extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[233];
+extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[235];
 
 const NMSIfcfgKeyTypeInfo *nms_ifcfg_well_known_key_find_info (const char *key, gssize *out_idx);
 
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index a9bc091655..cc5cc75ab2 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -2378,30 +2378,75 @@ static gboolean
 write_match_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
 {
 	NMSettingMatch *s_match;
-	nm_auto_free_gstring GString *str = NULL;
 	guint i, num;
 
 	s_match = (NMSettingMatch *) nm_connection_get_setting (connection, NM_TYPE_SETTING_MATCH);
 	if (!s_match)
 		return TRUE;
 
-	num = nm_setting_match_get_num_interface_names (s_match);
-	for (i = 0; i < num; i++) {
-		const char *name;
+	num = nm_setting_match_get_num_drivers (s_match);
+	{
+		nm_auto_free_gstring GString *str = NULL;
+		for (i = 0; i < num; i++) {
+			const char *name;
 
-		name = nm_setting_match_get_interface_name (s_match, i);
-		if (!name || !name[0])
-			continue;
+			name = nm_setting_match_get_driver (s_match, i);
+			if (!name || !name[0])
+				continue;
 
-		if (!str)
-			str = g_string_new ("");
-		else
-			g_string_append_c (str, ' ');
-		nm_utils_escaped_tokens_escape_gstr (name, NM_ASCII_SPACES, str);
+			if (!str)
+				str = g_string_new ("");
+			else
+				g_string_append_c (str, ' ');
+			nm_utils_escaped_tokens_escape_gstr (name, NM_ASCII_SPACES, str);
+		}
+
+		if (str)
+			svSetValueStr (ifcfg, "MATCH_DRIVER", str->str);
 	}
 
-	if (str)
-		svSetValueStr (ifcfg, "MATCH_INTERFACE_NAME", str->str);
+	num = nm_setting_match_get_num_interface_names (s_match);
+	{
+		nm_auto_free_gstring GString *str = NULL;
+		for (i = 0; i < num; i++) {
+			const char *name;
+
+			name = nm_setting_match_get_interface_name (s_match, i);
+			if (!name || !name[0])
+				continue;
+
+			if (!str)
+				str = g_string_new ("");
+			else
+				g_string_append_c (str, ' ');
+			nm_utils_escaped_tokens_escape_gstr (name, NM_ASCII_SPACES, str);
+		}
+
+		if (str)
+			svSetValueStr (ifcfg, "MATCH_INTERFACE_NAME", str->str);
+	}
+
+
+	num = nm_setting_match_get_num_kernel_command_lines (s_match);
+	{
+		nm_auto_free_gstring GString *str = NULL;
+		for (i = 0; i < num; i++) {
+			const char *name;
+
+			name = nm_setting_match_get_kernel_command_line (s_match, i);
+			if (!name || !name[0])
+				continue;
+
+			if (!str)
+				str = g_string_new ("");
+			else
+				g_string_append_c (str, ' ');
+			nm_utils_escaped_tokens_escape_gstr (name, NM_ASCII_SPACES, str);
+		}
+
+		if (str)
+			svSetValueStr (ifcfg, "MATCH_KERNEL_COMMAND_LINE", str->str);
+	}
 
 	return TRUE;
 }
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected
index f0cd36cb13..9499278e3e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected
@@ -1,7 +1,9 @@
 TYPE=Ethernet
 PROXY_METHOD=none
 BROWSER_ONLY=no
+MATCH_DRIVER="!virtio e1000e"
 MATCH_INTERFACE_NAME="ens* eth\\ 1? !veth*"
+MATCH_KERNEL_COMMAND_LINE=!ip=
 BOOTPROTO=dhcp
 DEFROUTE=yes
 IPV4_FAILURE_FATAL=no
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index efa9ea9b82..d0b9ffb8d3 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -4687,6 +4687,9 @@ test_write_wired_match (void)
 	nm_setting_match_add_interface_name (s_match, "ens*");
 	nm_setting_match_add_interface_name (s_match, "eth 1?");
 	nm_setting_match_add_interface_name (s_match, "!veth*");
+	nm_setting_match_add_driver (s_match, "!virtio");
+	nm_setting_match_add_driver (s_match, "e1000e");
+	nm_setting_match_add_kernel_command_line (s_match, "!ip=");
 	nm_connection_add_setting (connection, NM_SETTING (s_match));
 
 	nmtst_assert_connection_verifies (connection);

From fa0913b5d2e61725eeba6cce605bbc6e06f92ae7 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 12:16:32 +0200
Subject: [PATCH 138/222] libnm: sort entires in libnm.ver

---
 libnm/libnm.ver | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 8add06a070..59e7db4ff1 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1708,18 +1708,18 @@ global:
 	nm_setting_bridge_get_multicast_startup_query_count;
 	nm_setting_bridge_get_multicast_startup_query_interval;
 	nm_setting_connection_get_mud_url;
-	nm_setting_match_add_kernel_command_line;
-	nm_setting_match_clear_kernel_command_lines;
-	nm_setting_match_get_kernel_command_line;
-	nm_setting_match_get_kernel_command_lines;
-	nm_setting_match_get_num_kernel_command_lines;
-	nm_setting_match_remove_kernel_command_line;
-	nm_setting_match_remove_kernel_command_line_by_value;
 	nm_setting_match_add_driver;
+	nm_setting_match_add_kernel_command_line;
 	nm_setting_match_clear_drivers;
+	nm_setting_match_clear_kernel_command_lines;
 	nm_setting_match_get_driver;
 	nm_setting_match_get_drivers;
+	nm_setting_match_get_kernel_command_line;
+	nm_setting_match_get_kernel_command_lines;
 	nm_setting_match_get_num_drivers;
+	nm_setting_match_get_num_kernel_command_lines;
 	nm_setting_match_remove_driver;
 	nm_setting_match_remove_driver_by_value;
+	nm_setting_match_remove_kernel_command_line;
+	nm_setting_match_remove_kernel_command_line_by_value;
 } libnm_1_24_0;

From eaf38620758ad575d7eb998dcb61af5fce3305ea Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 15:07:07 +0200
Subject: [PATCH 139/222] libnm: fix gtk-doc annotations for
 nm_setting_match_get_{kernel_command_lines,drivers}()

Otherwise the function is not usable via generated bindings.
---
 libnm-core/nm-setting-match.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libnm-core/nm-setting-match.c b/libnm-core/nm-setting-match.c
index 6c9802e3b6..efe3e38eb7 100644
--- a/libnm-core/nm-setting-match.c
+++ b/libnm-core/nm-setting-match.c
@@ -324,10 +324,11 @@ nm_setting_match_clear_kernel_command_lines (NMSettingMatch *setting)
 /**
  * nm_setting_match_get_kernel_command_lines:
  * @setting: the #NMSettingMatch
+ * @length: (out): the length of the returned interface names array.
  *
  * Returns all the interface names.
  *
- * Returns: (transfer none): the configured interface names.
+ * Returns: (transfer none) (array length=length): the configured interface names.
  *
  * Since: 1.26
  **/
@@ -472,10 +473,11 @@ nm_setting_match_clear_drivers (NMSettingMatch *setting)
 /**
  * nm_setting_match_get_drivers:
  * @setting: the #NMSettingMatch
+ * @length: (out): the length of the returned interface names array.
  *
  * Returns all the drivers.
  *
- * Returns: (transfer none): the configured drivers.
+ * Returns: (transfer none) (array length=length): the configured drivers.
  *
  * Since: 1.26
  **/

From ef16dcaee4a50d6995f0b89f40e30080376cb58d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 12:51:28 +0200
Subject: [PATCH 140/222] libnm: cleanup NMSettingMatch.verify()

---
 libnm-core/nm-setting-match.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/libnm-core/nm-setting-match.c b/libnm-core/nm-setting-match.c
index efe3e38eb7..dbdbf0da31 100644
--- a/libnm-core/nm-setting-match.c
+++ b/libnm-core/nm-setting-match.c
@@ -569,11 +569,10 @@ static gboolean
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
 	NMSettingMatch *self = NM_SETTING_MATCH (setting);
-	int k;
+	guint i;
 
-	for (k = 0; k < self->interface_name->len; k++) {
-		char *kparam = (char*) g_ptr_array_index (self->interface_name, k);
-		if (nm_streq0 (kparam, "")) {
+	for (i = 0; i < self->interface_name->len; i++) {
+		if (!nm_str_not_empty (self->interface_name->pdata[i])) {
 			g_set_error (error,
 			             NM_CONNECTION_ERROR,
 			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
@@ -584,9 +583,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		}
 	}
 
-	for (k = 0; k < self->kernel_command_line->len; k++) {
-		char *kparam = (char*) g_ptr_array_index (self->kernel_command_line, k);
-		if (nm_streq0 (kparam, "")) {
+	for (i = 0; i < self->kernel_command_line->len; i++) {
+		if (!nm_str_not_empty (self->kernel_command_line->pdata[i])) {
 			g_set_error (error,
 			             NM_CONNECTION_ERROR,
 			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
@@ -597,9 +595,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		}
 	}
 
-	for (k = 0; k < self->driver->len; k++) {
-		char *kparam = (char*) g_ptr_array_index (self->driver, k);
-		if (nm_streq0 (kparam, "")) {
+	for (i = 0; i < self->driver->len; i++) {
+		if (!nm_str_not_empty (self->driver->pdata[i])) {
 			g_set_error (error,
 			             NM_CONNECTION_ERROR,
 			             NM_CONNECTION_ERROR_INVALID_PROPERTY,

From 46bee5298b690712872a86a353c4045bf20d6392 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 12:46:14 +0200
Subject: [PATCH 141/222] shared: add nm_g_ptr_array_len() helper

---
 shared/nm-glib-aux/nm-shared-utils.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index d5990c2d54..cfaaf573cb 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -1435,6 +1435,14 @@ char *nm_utils_g_slist_strlist_join (const GSList *a, const char *separator);
 
 /*****************************************************************************/
 
+static inline guint
+nm_g_ptr_array_len (const GPtrArray *arr)
+{
+	return arr ? arr->len : 0u;
+}
+
+/*****************************************************************************/
+
 static inline guint
 nm_g_hash_table_size (GHashTable *hash)
 {

From 070535c6f6473af17cb1ae62a23b9ead217cbe15 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 13:22:53 +0200
Subject: [PATCH 142/222] shared: add nm_g_array_len() helper

---
 shared/nm-glib-aux/nm-shared-utils.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index cfaaf573cb..10d259cced 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -1435,6 +1435,14 @@ char *nm_utils_g_slist_strlist_join (const GSList *a, const char *separator);
 
 /*****************************************************************************/
 
+static inline guint
+nm_g_array_len (const GArray *arr)
+{
+	return arr ? arr->len : 0u;
+}
+
+/*****************************************************************************/
+
 static inline guint
 nm_g_ptr_array_len (const GPtrArray *arr)
 {

From 8dd74fe3648b73f812dcd04168730a08a246987e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 13:30:42 +0200
Subject: [PATCH 143/222] shared: add nm_indirect_g_free() helper

---
 shared/nm-glib-aux/nm-shared-utils.c | 20 ++++++++++++++++++++
 shared/nm-glib-aux/nm-shared-utils.h |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c
index 5dd099a7c9..e64ef71378 100644
--- a/shared/nm-glib-aux/nm-shared-utils.c
+++ b/shared/nm-glib-aux/nm-shared-utils.c
@@ -4817,3 +4817,23 @@ nm_str_buf_append_printf (NMStrBuf *strbuf,
 
 	strbuf->_priv_len += (gsize) l;
 }
+
+/*****************************************************************************/
+
+/**
+ * nm_indirect_g_free:
+ * @arg: a pointer to a pointer that is to be freed.
+ *
+ * This does the same as nm_clear_g_free(arg) (g_clear_pointer (arg, g_free)).
+ * This is for example useful when you have a GArray with pointers and a
+ * clear function to free them. g_array_set_clear_func()'s destroy notify
+ * function gets a pointer to the array location, so we have to follow
+ * the first pointer.
+ */
+void
+nm_indirect_g_free (gpointer arg)
+{
+	gpointer *p = arg;
+
+	nm_clear_g_free (p);
+}
diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index 10d259cced..ddad14e545 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -1864,6 +1864,8 @@ nm_utils_strdup_reset (char **dst, const char *src)
 	return TRUE;
 }
 
+void nm_indirect_g_free (gpointer arg);
+
 /*****************************************************************************/
 
 /* nm_utils_get_next_realloc_size() is used to grow buffers exponentially, when

From 5056e0d3c805d0077b68aef32eb4470db6ebe5ac Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 13:45:03 +0200
Subject: [PATCH 144/222] shared: add nm_strvarray_*() helper API

GPtrArray does not support NULL terminating the pointer array. That
makes it cumbersome to use it for tracking a strv array. Add a few
helper functions nm_strvarray_*() that help using a GArray instead.
---
 shared/nm-glib-aux/nm-shared-utils.h | 48 ++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index ddad14e545..590059ec4e 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -1905,4 +1905,52 @@ gboolean nm_utils_ifname_valid (const char* name,
                                 NMUtilsIfaceType type,
                                 GError **error);
 
+/*****************************************************************************/
+
+static inline GArray *
+nm_strvarray_ensure (GArray **p)
+{
+	if (!*p) {
+		*p = g_array_new (TRUE, FALSE, sizeof (char *));
+		g_array_set_clear_func (*p, nm_indirect_g_free);
+	}
+	return *p;
+}
+
+static inline void
+nm_strvarray_add (GArray *array, const char *str)
+{
+	char *s;
+
+	s = g_strdup (str);
+	g_array_append_val (array, s);
+}
+
+static inline const char *const*
+nm_strvarray_get_strv (GArray **arr, guint *length)
+{
+	if (!*arr) {
+		NM_SET_OUT (length, 0);
+		return (const char *const*) arr;
+	}
+
+	NM_SET_OUT (length, (*arr)->len);
+	return &g_array_index (*arr, const char *, 0);
+}
+
+static inline void
+nm_strvarray_set_strv (GArray **array, const char *const*strv)
+{
+	gs_unref_array GArray *array_old = NULL;
+
+	array_old = g_steal_pointer (array);
+
+	if (!strv || !strv[0])
+		return;
+
+	nm_strvarray_ensure (array);
+	for (; strv[0]; strv++)
+		nm_strvarray_add (*array, strv[0]);
+}
+
 #endif /* __NM_SHARED_UTILS_H__ */

From 7939c8e770bf0a616445ed536f357d5691e7d547 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 13:18:37 +0200
Subject: [PATCH 145/222] libnm: allocate interface_name array in
 NMSettingMatch lazy

Also track the interface_name in a GArray so that
nm_setting_match_get_interface_names() returns a NULL
terminated strv array.
---
 libnm-core/nm-setting-match.c | 64 +++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/libnm-core/nm-setting-match.c b/libnm-core/nm-setting-match.c
index dbdbf0da31..d2c3ca010e 100644
--- a/libnm-core/nm-setting-match.c
+++ b/libnm-core/nm-setting-match.c
@@ -33,7 +33,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingMatch,
  */
 struct _NMSettingMatch {
 	NMSetting parent;
-	GPtrArray *interface_name;
+	GArray *interface_name;
 	GPtrArray *kernel_command_line;
 	GPtrArray *driver;
 };
@@ -59,7 +59,7 @@ nm_setting_match_get_num_interface_names (NMSettingMatch *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), 0);
 
-	return setting->interface_name->len;
+	return nm_g_array_len (setting->interface_name);
 }
 
 /**
@@ -76,9 +76,9 @@ nm_setting_match_get_interface_name (NMSettingMatch *setting, int idx)
 {
 	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), NULL);
 
-	g_return_val_if_fail (idx >= 0 && idx < setting->interface_name->len, NULL);
+	g_return_val_if_fail (setting->interface_name && idx >= 0 && idx < setting->interface_name->len, NULL);
 
-	return setting->interface_name->pdata[idx];
+	return g_array_index (setting->interface_name, const char *, idx);
 }
 
 /**
@@ -98,7 +98,7 @@ nm_setting_match_add_interface_name (NMSettingMatch *setting,
 	g_return_if_fail (interface_name != NULL);
 	g_return_if_fail (interface_name[0] != '\0');
 
-	g_ptr_array_add (setting->interface_name, g_strdup (interface_name));
+	nm_strvarray_add (nm_strvarray_ensure (&setting->interface_name), interface_name);
 	_notify (setting, PROP_INTERFACE_NAME);
 }
 
@@ -116,9 +116,9 @@ nm_setting_match_remove_interface_name (NMSettingMatch *setting, int idx)
 {
 	g_return_if_fail (NM_IS_SETTING_MATCH (setting));
 
-	g_return_if_fail (idx >= 0 && idx < setting->interface_name->len);
+	g_return_if_fail (setting->interface_name && idx >= 0 && idx < setting->interface_name->len);
 
-	g_ptr_array_remove_index (setting->interface_name, idx);
+	g_array_remove_index (setting->interface_name, idx);
 	_notify (setting, PROP_INTERFACE_NAME);
 }
 
@@ -143,9 +143,12 @@ nm_setting_match_remove_interface_name_by_value (NMSettingMatch *setting,
 	g_return_val_if_fail (interface_name != NULL, FALSE);
 	g_return_val_if_fail (interface_name[0] != '\0', FALSE);
 
+	if (!setting->interface_name)
+		return FALSE;
+
 	for (i = 0; i < setting->interface_name->len; i++) {
-		if (nm_streq (interface_name, setting->interface_name->pdata[i])) {
-			g_ptr_array_remove_index (setting->interface_name, i);
+		if (nm_streq (interface_name, g_array_index (setting->interface_name, const char *, i))) {
+			g_array_remove_index (setting->interface_name, i);
 			_notify (setting, PROP_INTERFACE_NAME);
 			return TRUE;
 		}
@@ -166,8 +169,8 @@ nm_setting_match_clear_interface_names (NMSettingMatch *setting)
 {
 	g_return_if_fail (NM_IS_SETTING_MATCH (setting));
 
-	if (setting->interface_name->len != 0) {
-		g_ptr_array_set_size (setting->interface_name, 0);
+	if (nm_g_array_len (setting->interface_name) != 0) {
+		nm_clear_pointer (&setting->interface_name, g_array_unref);
 		_notify (setting, PROP_INTERFACE_NAME);
 	}
 }
@@ -175,11 +178,14 @@ nm_setting_match_clear_interface_names (NMSettingMatch *setting)
 /**
  * nm_setting_match_get_interface_names:
  * @setting: the #NMSettingMatch
- * @length: (out): the length of the returned interface names array.
+ * @length: (out) (allow-none): the length of the returned interface names array.
  *
  * Returns all the interface names.
  *
- * Returns: (transfer none) (array length=length): the configured interface names.
+ * Returns: (transfer none) (array length=length): the NULL terminated list of
+ *   configured interface names.
+ *
+ * Before 1.26, the returned array was not %NULL terminated and you MUST provide a length.
  *
  * Since: 1.14
  **/
@@ -187,10 +193,8 @@ const char *const *
 nm_setting_match_get_interface_names (NMSettingMatch *setting, guint *length)
 {
 	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), NULL);
-	g_return_val_if_fail (length, NULL);
 
-	NM_SET_OUT (length, setting->interface_name->len);
-	return (const char *const *) setting->interface_name->pdata;
+	return nm_strvarray_get_strv (&setting->interface_name, length);
 }
 
 /*****************************************************************************/
@@ -501,7 +505,7 @@ get_property (GObject *object, guint prop_id,
 
 	switch (prop_id) {
 	case PROP_INTERFACE_NAME:
-		g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (self->interface_name));
+		g_value_set_boxed (value, nm_strvarray_get_strv (&self->interface_name, NULL));
 		break;
 	case PROP_KERNEL_COMMAND_LINE:
 		g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (self->kernel_command_line));
@@ -523,8 +527,7 @@ set_property (GObject *object, guint prop_id,
 
 	switch (prop_id) {
 	case PROP_INTERFACE_NAME:
-		g_ptr_array_unref (self->interface_name);
-		self->interface_name = _nm_utils_strv_to_ptrarray (g_value_get_boxed (value));
+		nm_strvarray_set_strv (&self->interface_name, g_value_get_boxed (value));
 		break;
 	case PROP_KERNEL_COMMAND_LINE:
 		g_ptr_array_unref (self->kernel_command_line);
@@ -545,7 +548,6 @@ set_property (GObject *object, guint prop_id,
 static void
 nm_setting_match_init (NMSettingMatch *setting)
 {
-	setting->interface_name = g_ptr_array_new_with_free_func (g_free);
 	setting->kernel_command_line = g_ptr_array_new_with_free_func (g_free);
 	setting->driver = g_ptr_array_new_with_free_func (g_free);
 }
@@ -571,15 +573,17 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	NMSettingMatch *self = NM_SETTING_MATCH (setting);
 	guint i;
 
-	for (i = 0; i < self->interface_name->len; i++) {
-		if (!nm_str_not_empty (self->interface_name->pdata[i])) {
-			g_set_error (error,
-			             NM_CONNECTION_ERROR,
-			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-			             _("is empty"));
-			g_prefix_error (error, "%s.%s: ", NM_SETTING_MATCH_SETTING_NAME,
-			                NM_SETTING_MATCH_INTERFACE_NAME);
-			return FALSE;
+	if (self->interface_name) {
+		for (i = 0; i < self->interface_name->len; i++) {
+			if (!nm_str_not_empty (g_array_index (self->interface_name, const char *, i))) {
+				g_set_error (error,
+				             NM_CONNECTION_ERROR,
+				             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				             _("is empty"));
+				g_prefix_error (error, "%s.%s: ", NM_SETTING_MATCH_SETTING_NAME,
+				                NM_SETTING_MATCH_INTERFACE_NAME);
+				return FALSE;
+			}
 		}
 	}
 
@@ -615,7 +619,7 @@ finalize (GObject *object)
 {
 	NMSettingMatch *self = NM_SETTING_MATCH (object);
 
-	g_ptr_array_unref (self->interface_name);
+	nm_clear_pointer (&self->interface_name, g_array_unref);
 	g_ptr_array_unref (self->kernel_command_line);
 	g_ptr_array_unref (self->driver);
 

From 0ba444a084784d3c73d0c710ada1d43b550eb8b1 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 13:18:37 +0200
Subject: [PATCH 146/222] libnm: allocate device and kernel_command_line arrays
 in NMSettingMatch lazy

---
 libnm-core/nm-setting-match.c | 118 +++++++++++++++++-----------------
 1 file changed, 60 insertions(+), 58 deletions(-)

diff --git a/libnm-core/nm-setting-match.c b/libnm-core/nm-setting-match.c
index d2c3ca010e..358f81d853 100644
--- a/libnm-core/nm-setting-match.c
+++ b/libnm-core/nm-setting-match.c
@@ -34,8 +34,8 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingMatch,
 struct _NMSettingMatch {
 	NMSetting parent;
 	GArray *interface_name;
-	GPtrArray *kernel_command_line;
-	GPtrArray *driver;
+	GArray *kernel_command_line;
+	GArray *driver;
 };
 
 struct _NMSettingMatchClass {
@@ -212,7 +212,7 @@ nm_setting_match_get_num_kernel_command_lines (NMSettingMatch *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), 0);
 
-	return setting->kernel_command_line->len;
+	return nm_g_array_len (setting->kernel_command_line);
 }
 
 /**
@@ -229,9 +229,9 @@ nm_setting_match_get_kernel_command_line (NMSettingMatch *setting, guint idx)
 {
 	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), NULL);
 
-	g_return_val_if_fail (idx < setting->kernel_command_line->len, NULL);
+	g_return_val_if_fail (setting->kernel_command_line && idx < setting->kernel_command_line->len, NULL);
 
-	return setting->kernel_command_line->pdata[idx];
+	return g_array_index (setting->kernel_command_line, const char *, idx);
 }
 
 /**
@@ -251,7 +251,7 @@ nm_setting_match_add_kernel_command_line (NMSettingMatch *setting,
 	g_return_if_fail (kernel_command_line != NULL);
 	g_return_if_fail (kernel_command_line[0] != '\0');
 
-	g_ptr_array_add (setting->kernel_command_line, g_strdup (kernel_command_line));
+	nm_strvarray_add (nm_strvarray_ensure (&setting->kernel_command_line), kernel_command_line);
 	_notify (setting, PROP_KERNEL_COMMAND_LINE);
 }
 
@@ -269,9 +269,9 @@ nm_setting_match_remove_kernel_command_line (NMSettingMatch *setting, guint idx)
 {
 	g_return_if_fail (NM_IS_SETTING_MATCH (setting));
 
-	g_return_if_fail (idx < setting->kernel_command_line->len);
+	g_return_if_fail (setting->kernel_command_line && idx < setting->kernel_command_line->len);
 
-	g_ptr_array_remove_index (setting->kernel_command_line, idx);
+	g_array_remove_index (setting->kernel_command_line, idx);
 	_notify (setting, PROP_KERNEL_COMMAND_LINE);
 }
 
@@ -296,9 +296,12 @@ nm_setting_match_remove_kernel_command_line_by_value (NMSettingMatch *setting,
 	g_return_val_if_fail (kernel_command_line != NULL, FALSE);
 	g_return_val_if_fail (kernel_command_line[0] != '\0', FALSE);
 
+	if (!setting->kernel_command_line)
+		return FALSE;
+
 	for (i = 0; i < setting->kernel_command_line->len; i++) {
-		if (nm_streq (kernel_command_line, setting->kernel_command_line->pdata[i])) {
-			g_ptr_array_remove_index (setting->kernel_command_line, i);
+		if (nm_streq (kernel_command_line, g_array_index (setting->kernel_command_line, const char *, i))) {
+			g_array_remove_index (setting->kernel_command_line, i);
 			_notify (setting, PROP_KERNEL_COMMAND_LINE);
 			return TRUE;
 		}
@@ -319,8 +322,8 @@ nm_setting_match_clear_kernel_command_lines (NMSettingMatch *setting)
 {
 	g_return_if_fail (NM_IS_SETTING_MATCH (setting));
 
-	if (setting->kernel_command_line->len != 0) {
-		g_ptr_array_set_size (setting->kernel_command_line, 0);
+	if (nm_g_array_len (setting->kernel_command_line) != 0) {
+		nm_clear_pointer (&setting->kernel_command_line, g_array_unref);
 		_notify (setting, PROP_KERNEL_COMMAND_LINE);
 	}
 }
@@ -328,7 +331,7 @@ nm_setting_match_clear_kernel_command_lines (NMSettingMatch *setting)
 /**
  * nm_setting_match_get_kernel_command_lines:
  * @setting: the #NMSettingMatch
- * @length: (out): the length of the returned interface names array.
+ * @length: (out) (allow-none): the length of the returned interface names array.
  *
  * Returns all the interface names.
  *
@@ -340,10 +343,8 @@ const char *const *
 nm_setting_match_get_kernel_command_lines (NMSettingMatch *setting, guint *length)
 {
 	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), NULL);
-	g_return_val_if_fail (length, NULL);
 
-	NM_SET_OUT (length, setting->kernel_command_line->len);
-	return (const char *const *) setting->kernel_command_line->pdata;
+	return nm_strvarray_get_strv (&setting->kernel_command_line, length);
 }
 
 /*****************************************************************************/
@@ -361,7 +362,7 @@ nm_setting_match_get_num_drivers (NMSettingMatch *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), 0);
 
-	return setting->driver->len;
+	return nm_g_array_len (setting->driver);
 }
 
 /**
@@ -378,9 +379,9 @@ nm_setting_match_get_driver (NMSettingMatch *setting, guint idx)
 {
 	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), NULL);
 
-	g_return_val_if_fail (idx < setting->driver->len, NULL);
+	g_return_val_if_fail (setting->driver && idx < setting->driver->len, NULL);
 
-	return setting->driver->pdata[idx];
+	return g_array_index (setting->driver, const char *, idx);
 }
 
 /**
@@ -400,7 +401,7 @@ nm_setting_match_add_driver (NMSettingMatch *setting,
 	g_return_if_fail (driver != NULL);
 	g_return_if_fail (driver[0] != '\0');
 
-	g_ptr_array_add (setting->driver, g_strdup (driver));
+	nm_strvarray_add (nm_strvarray_ensure (&setting->driver), driver);
 	_notify (setting, PROP_DRIVER);
 }
 
@@ -418,9 +419,9 @@ nm_setting_match_remove_driver (NMSettingMatch *setting, guint idx)
 {
 	g_return_if_fail (NM_IS_SETTING_MATCH (setting));
 
-	g_return_if_fail (idx < setting->driver->len);
+	g_return_if_fail (setting->driver && idx < setting->driver->len);
 
-	g_ptr_array_remove_index (setting->driver, idx);
+	g_array_remove_index (setting->driver, idx);
 	_notify (setting, PROP_DRIVER);
 }
 
@@ -445,9 +446,12 @@ nm_setting_match_remove_driver_by_value (NMSettingMatch *setting,
 	g_return_val_if_fail (driver != NULL, FALSE);
 	g_return_val_if_fail (driver[0] != '\0', FALSE);
 
+	if (!setting->driver)
+		return FALSE;
+
 	for (i = 0; i < setting->driver->len; i++) {
-		if (nm_streq (driver, setting->driver->pdata[i])) {
-			g_ptr_array_remove_index (setting->driver, i);
+		if (nm_streq (driver, g_array_index (setting->driver, const char *, i))) {
+			g_array_remove_index (setting->driver, i);
 			_notify (setting, PROP_DRIVER);
 			return TRUE;
 		}
@@ -468,8 +472,8 @@ nm_setting_match_clear_drivers (NMSettingMatch *setting)
 {
 	g_return_if_fail (NM_IS_SETTING_MATCH (setting));
 
-	if (setting->driver->len != 0) {
-		g_ptr_array_set_size (setting->driver, 0);
+	if (nm_g_array_len (setting->driver) != 0) {
+		nm_clear_pointer (&setting->driver, g_array_unref);
 		_notify (setting, PROP_DRIVER);
 	}
 }
@@ -477,7 +481,7 @@ nm_setting_match_clear_drivers (NMSettingMatch *setting)
 /**
  * nm_setting_match_get_drivers:
  * @setting: the #NMSettingMatch
- * @length: (out): the length of the returned interface names array.
+ * @length: (out) (allow-none): the length of the returned interface names array.
  *
  * Returns all the drivers.
  *
@@ -489,10 +493,8 @@ const char *const *
 nm_setting_match_get_drivers (NMSettingMatch *setting, guint *length)
 {
 	g_return_val_if_fail (NM_IS_SETTING_MATCH (setting), NULL);
-	g_return_val_if_fail (length, NULL);
 
-	NM_SET_OUT (length, setting->driver->len);
-	return (const char *const *) setting->driver->pdata;
+	return nm_strvarray_get_strv (&setting->driver, length);
 }
 
 /*****************************************************************************/
@@ -508,10 +510,10 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_boxed (value, nm_strvarray_get_strv (&self->interface_name, NULL));
 		break;
 	case PROP_KERNEL_COMMAND_LINE:
-		g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (self->kernel_command_line));
+		g_value_set_boxed (value, nm_strvarray_get_strv (&self->kernel_command_line, NULL));
 		break;
 	case PROP_DRIVER:
-		g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (self->driver));
+		g_value_set_boxed (value, nm_strvarray_get_strv (&self->driver, NULL));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -530,12 +532,10 @@ set_property (GObject *object, guint prop_id,
 		nm_strvarray_set_strv (&self->interface_name, g_value_get_boxed (value));
 		break;
 	case PROP_KERNEL_COMMAND_LINE:
-		g_ptr_array_unref (self->kernel_command_line);
-		self->kernel_command_line = _nm_utils_strv_to_ptrarray (g_value_get_boxed (value));
+		nm_strvarray_set_strv (&self->kernel_command_line, g_value_get_boxed (value));
 		break;
 	case PROP_DRIVER:
-		g_ptr_array_unref (self->driver);
-		self->driver = _nm_utils_strv_to_ptrarray (g_value_get_boxed (value));
+		nm_strvarray_set_strv (&self->driver, g_value_get_boxed (value));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -548,8 +548,6 @@ set_property (GObject *object, guint prop_id,
 static void
 nm_setting_match_init (NMSettingMatch *setting)
 {
-	setting->kernel_command_line = g_ptr_array_new_with_free_func (g_free);
-	setting->driver = g_ptr_array_new_with_free_func (g_free);
 }
 
 /**
@@ -587,27 +585,31 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		}
 	}
 
-	for (i = 0; i < self->kernel_command_line->len; i++) {
-		if (!nm_str_not_empty (self->kernel_command_line->pdata[i])) {
-			g_set_error (error,
-			             NM_CONNECTION_ERROR,
-			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-			             _("is empty"));
-			g_prefix_error (error, "%s.%s: ", NM_SETTING_MATCH_SETTING_NAME,
-			                NM_SETTING_MATCH_KERNEL_COMMAND_LINE);
-			return FALSE;
+	if (self->kernel_command_line) {
+		for (i = 0; i < self->kernel_command_line->len; i++) {
+			if (!nm_str_not_empty (g_array_index (self->kernel_command_line, const char *, i))) {
+				g_set_error (error,
+				             NM_CONNECTION_ERROR,
+				             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				             _("is empty"));
+				g_prefix_error (error, "%s.%s: ", NM_SETTING_MATCH_SETTING_NAME,
+				                NM_SETTING_MATCH_KERNEL_COMMAND_LINE);
+				return FALSE;
+			}
 		}
 	}
 
-	for (i = 0; i < self->driver->len; i++) {
-		if (!nm_str_not_empty (self->driver->pdata[i])) {
-			g_set_error (error,
-			             NM_CONNECTION_ERROR,
-			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-			             _("is empty"));
-			g_prefix_error (error, "%s.%s: ", NM_SETTING_MATCH_SETTING_NAME,
-			                NM_SETTING_MATCH_DRIVER);
-			return FALSE;
+	if (self->driver) {
+		for (i = 0; i < self->driver->len; i++) {
+			if (!nm_str_not_empty (g_array_index (self->driver, const char *, i))) {
+				g_set_error (error,
+				             NM_CONNECTION_ERROR,
+				             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				             _("is empty"));
+				g_prefix_error (error, "%s.%s: ", NM_SETTING_MATCH_SETTING_NAME,
+				                NM_SETTING_MATCH_DRIVER);
+				return FALSE;
+			}
 		}
 	}
 
@@ -620,8 +622,8 @@ finalize (GObject *object)
 	NMSettingMatch *self = NM_SETTING_MATCH (object);
 
 	nm_clear_pointer (&self->interface_name, g_array_unref);
-	g_ptr_array_unref (self->kernel_command_line);
-	g_ptr_array_unref (self->driver);
+	nm_clear_pointer (&self->kernel_command_line, g_array_unref);
+	nm_clear_pointer (&self->driver, g_array_unref);
 
 	G_OBJECT_CLASS (nm_setting_match_parent_class)->finalize (object);
 }

From 8bb172ee2b7fbe6bf16d560947f7303cb2aa98f9 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 15:44:22 +0200
Subject: [PATCH 147/222] cli: use default implementation of getter for
 NMSettingMatch properties

The default implementation should be good enough. Use it.
---
 clients/common/nm-meta-setting-desc.c | 105 +-------------------------
 1 file changed, 3 insertions(+), 102 deletions(-)

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 756ff56697..2df48493de 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -3430,93 +3430,6 @@ _objlist_set_fcn_ip_config_routing_rules (NMSetting *setting,
 	return TRUE;
 }
 
-static gconstpointer
-_get_fcn_match_interface_name (ARGS_GET_FCN)
-{
-	NMSettingMatch *s_match = NM_SETTING_MATCH (setting);
-	GString *str = NULL;
-	guint i, num;
-
-	RETURN_UNSUPPORTED_GET_TYPE ();
-
-	num = nm_setting_match_get_num_interface_names (s_match);
-	for (i = 0; i < num; i++) {
-		const char *name;
-
-		name = nm_setting_match_get_interface_name (s_match, i);
-		if (!name || !name[0])
-			continue;
-		if (!str)
-			str = g_string_new ("");
-		else
-			g_string_append_c (str, ESCAPED_TOKENS_WITH_SPACES_DELIMTER);
-		nm_utils_escaped_tokens_escape_gstr (name, ESCAPED_TOKENS_WITH_SPACES_DELIMTERS, str);
-	}
-
-	NM_SET_OUT (out_is_default, num == 0);
-	if (!str)
-		return NULL;
-	RETURN_STR_TO_FREE (g_string_free (str, FALSE));
-}
-
-static gconstpointer
-_get_fcn_match_kernel_command_line (ARGS_GET_FCN)
-{
-	NMSettingMatch *s_match = NM_SETTING_MATCH (setting);
-	GString *str = NULL;
-	guint i, num;
-
-	RETURN_UNSUPPORTED_GET_TYPE ();
-
-	num = nm_setting_match_get_num_kernel_command_lines (s_match);
-	for (i = 0; i < num; i++) {
-		const char *name;
-
-		name = nm_setting_match_get_kernel_command_line (s_match, i);
-		if (!name || !name[0])
-			continue;
-		if (!str)
-			str = g_string_new ("");
-		else
-			g_string_append_c (str, ESCAPED_TOKENS_WITH_SPACES_DELIMTER);
-		nm_utils_escaped_tokens_escape_gstr (name, ESCAPED_TOKENS_WITH_SPACES_DELIMTERS, str);
-	}
-
-	NM_SET_OUT (out_is_default, num == 0);
-	if (!str)
-		return NULL;
-	RETURN_STR_TO_FREE (g_string_free (str, FALSE));
-}
-
-static gconstpointer
-_get_fcn_match_driver (ARGS_GET_FCN)
-{
-	NMSettingMatch *s_match = NM_SETTING_MATCH (setting);
-	GString *str = NULL;
-	guint i, num;
-
-	RETURN_UNSUPPORTED_GET_TYPE ();
-
-	num = nm_setting_match_get_num_drivers (s_match);
-	for (i = 0; i < num; i++) {
-		const char *name;
-
-		name = nm_setting_match_get_driver (s_match, i);
-		if (!name || !name[0])
-			continue;
-		if (!str)
-			str = g_string_new ("");
-		else
-			g_string_append_c (str, ESCAPED_TOKENS_WITH_SPACES_DELIMTER);
-		nm_utils_escaped_tokens_escape_gstr (name, ESCAPED_TOKENS_WITH_SPACES_DELIMTERS, str);
-	}
-
-	NM_SET_OUT (out_is_default, num == 0);
-	if (!str)
-		return NULL;
-	RETURN_STR_TO_FREE (g_string_free (str, FALSE));
-}
-
 static gconstpointer
 _get_fcn_olpc_mesh_ssid (ARGS_GET_FCN)
 {
@@ -6252,11 +6165,7 @@ static const NMMetaPropertyInfo *const property_infos_MACVLAN[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_MATCH
 static const NMMetaPropertyInfo *const property_infos_MATCH[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MATCH_INTERFACE_NAME,
-	    .property_type = DEFINE_PROPERTY_TYPE (
-	        .get_fcn =                  _get_fcn_match_interface_name,
-	        .set_fcn =                  _set_fcn_multilist,
-	        .set_supports_remove =      TRUE,
-	    ),
+	    .property_type =                &_pt_multilist,
 	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
 	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
 	            .get_num_fcn_u   =      MULTILIST_GET_NUM_FCN_U       (NMSettingMatch, nm_setting_match_get_num_interface_names),
@@ -6268,11 +6177,7 @@ static const NMMetaPropertyInfo *const property_infos_MATCH[] = {
 	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MATCH_KERNEL_COMMAND_LINE,
-	    .property_type = DEFINE_PROPERTY_TYPE (
-	        .get_fcn =                  _get_fcn_match_kernel_command_line,
-	        .set_fcn =                  _set_fcn_multilist,
-	        .set_supports_remove =      TRUE,
-	    ),
+	    .property_type =                &_pt_multilist,
 	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
 	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
 	            .get_num_fcn_u   =      MULTILIST_GET_NUM_FCN_U       (NMSettingMatch, nm_setting_match_get_num_kernel_command_lines),
@@ -6284,11 +6189,7 @@ static const NMMetaPropertyInfo *const property_infos_MATCH[] = {
 	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MATCH_DRIVER,
-	    .property_type = DEFINE_PROPERTY_TYPE (
-	        .get_fcn =                  _get_fcn_match_driver,
-	        .set_fcn =                  _set_fcn_multilist,
-	        .set_supports_remove =      TRUE,
-	    ),
+	    .property_type =                &_pt_multilist,
 	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
 	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
 	            .get_num_fcn_u   =      MULTILIST_GET_NUM_FCN_U       (NMSettingMatch, nm_setting_match_get_num_drivers),

From cf546ee7898e955affa03992bea9c39326d363fb Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 15:51:52 +0200
Subject: [PATCH 148/222] ifcfg-rh: refactor write_match_setting()

- write_match_setting() never fails. Don't let it return a boolean
  error result.

- drop "if (!name || !name[0])" checks. It's not possibly to configure
  a name %NULL in NMSettingMatch (without triggering assertions). Also,
  an empty name "" is not valid, so we wouldn't expect it. There is one
  problem with the way how we concatenate the string list: it uses
  spaces as separator, while stripping spaces. That means, in the
  currenty format, an empty token "" cannot be expressed. On the other
  hand, serializing it would lead to duplicate spaces, that get dropped
  during re-read. So the empty name wasn't valid from the start, but it
  also cannot be encoded.

- use nm_gstring_add_space_delimiter() and nm_gstring_prepare().
---
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    | 68 +++++--------------
 1 file changed, 18 insertions(+), 50 deletions(-)

diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index cc5cc75ab2..f3f5647dbc 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -2374,81 +2374,50 @@ write_tc_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
 	return TRUE;
 }
 
-static gboolean
-write_match_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
+static void
+write_match_setting (NMConnection *connection, shvarFile *ifcfg)
 {
+	nm_auto_free_gstring GString *str = NULL;
 	NMSettingMatch *s_match;
 	guint i, num;
+	const char *name;
 
 	s_match = (NMSettingMatch *) nm_connection_get_setting (connection, NM_TYPE_SETTING_MATCH);
 	if (!s_match)
-		return TRUE;
+		return;
 
 	num = nm_setting_match_get_num_drivers (s_match);
-	{
-		nm_auto_free_gstring GString *str = NULL;
+	if (num > 0) {
+		nm_gstring_prepare (&str);
 		for (i = 0; i < num; i++) {
-			const char *name;
-
 			name = nm_setting_match_get_driver (s_match, i);
-			if (!name || !name[0])
-				continue;
-
-			if (!str)
-				str = g_string_new ("");
-			else
-				g_string_append_c (str, ' ');
+			nm_gstring_add_space_delimiter (str);
 			nm_utils_escaped_tokens_escape_gstr (name, NM_ASCII_SPACES, str);
 		}
-
-		if (str)
-			svSetValueStr (ifcfg, "MATCH_DRIVER", str->str);
+		svSetValueStr (ifcfg, "MATCH_DRIVER", str->str);
 	}
 
 	num = nm_setting_match_get_num_interface_names (s_match);
-	{
-		nm_auto_free_gstring GString *str = NULL;
+	if (num > 0) {
+		nm_gstring_prepare (&str);
 		for (i = 0; i < num; i++) {
-			const char *name;
-
 			name = nm_setting_match_get_interface_name (s_match, i);
-			if (!name || !name[0])
-				continue;
-
-			if (!str)
-				str = g_string_new ("");
-			else
-				g_string_append_c (str, ' ');
+			nm_gstring_add_space_delimiter (str);
 			nm_utils_escaped_tokens_escape_gstr (name, NM_ASCII_SPACES, str);
 		}
-
-		if (str)
-			svSetValueStr (ifcfg, "MATCH_INTERFACE_NAME", str->str);
+		svSetValueStr (ifcfg, "MATCH_INTERFACE_NAME", str->str);
 	}
 
-
 	num = nm_setting_match_get_num_kernel_command_lines (s_match);
-	{
-		nm_auto_free_gstring GString *str = NULL;
+	if (num > 0) {
+		nm_gstring_prepare (&str);
 		for (i = 0; i < num; i++) {
-			const char *name;
-
 			name = nm_setting_match_get_kernel_command_line (s_match, i);
-			if (!name || !name[0])
-				continue;
-
-			if (!str)
-				str = g_string_new ("");
-			else
-				g_string_append_c (str, ' ');
+			nm_gstring_add_space_delimiter (str);
 			nm_utils_escaped_tokens_escape_gstr (name, NM_ASCII_SPACES, str);
 		}
-
-		if (str)
-			svSetValueStr (ifcfg, "MATCH_KERNEL_COMMAND_LINE", str->str);
+		svSetValueStr (ifcfg, "MATCH_KERNEL_COMMAND_LINE", str->str);
 	}
-
-	return TRUE;
 }
 
 static void
@@ -3208,8 +3177,7 @@ do_write_construct (NMConnection *connection,
 	if (!write_user_setting (connection, ifcfg, error))
 		return FALSE;
 
-	if (!write_match_setting (connection, ifcfg, error))
-		return FALSE;
+	write_match_setting (connection, ifcfg);
 
 	write_sriov_setting (connection, ifcfg);
 

From ace437338d2d80a2fd83a416034149324c14cfbd Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 16:01:09 +0200
Subject: [PATCH 149/222] ifcfg-rh: minor cleanup of make_match_setting()

---
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 991ad77d0d..2b9d5fd528 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -1539,19 +1539,19 @@ make_user_setting (shvarFile *ifcfg)
 
 
 static void
-make_match_setting_prop (const char *v, NMSettingMatch **s_match,
-                         void (*add_fcn) (NMSettingMatch *s_match, const char *value) ) {
+make_match_setting_prop (const char *v,
+                         NMSettingMatch **s_match,
+                         void (*add_fcn) (NMSettingMatch *s_match, const char *value))
+{
 	gs_free const char **strv = NULL;
 	gsize i;
 
-	if (v) {
-		strv = nm_utils_escaped_tokens_split (v, NM_ASCII_SPACES);
-		if (strv) {
-			for (i = 0; strv[i]; i++) {
-				if (!(*s_match))
-					*s_match = (NMSettingMatch *) nm_setting_match_new ();
-				add_fcn (*s_match, strv[i]);
-			}
+	strv = nm_utils_escaped_tokens_split (v, NM_ASCII_SPACES);
+	if (strv) {
+		for (i = 0; strv[i]; i++) {
+			if (!(*s_match))
+				*s_match = NM_SETTING_MATCH (nm_setting_match_new ());
+			add_fcn (*s_match, strv[i]);
 		}
 	}
 }
@@ -1572,7 +1572,7 @@ make_match_setting (shvarFile *ifcfg)
 	v = svGetValueStr (ifcfg, "MATCH_DRIVER", &value_d);
 	make_match_setting_prop(v, &s_match, nm_setting_match_add_driver);
 
-	return (NMSetting *) s_match;
+	return NM_SETTING (s_match);
 }
 
 static NMSetting *

From 623cf7c9a3ee41c109e8b8710b8391adc2cc5c9a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 16:10:30 +0200
Subject: [PATCH 150/222] core: accept %NULL argument to
 nm_wildcard_match_check()

%NULL means that the string is unknown. The pattern should still match
if there are no positive matches that want to match against the string.

For example, the nm_device_get_driver() might return NULL. If we have
a match.driver setting, we still need to handle that somehow that it
makes sense.
---
 src/nm-core-utils.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index a9f50a0f7a..415e1dc415 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -1703,11 +1703,13 @@ nm_wildcard_match_check (const char *str,
                          const char *const *patterns,
                          guint num_patterns)
 {
-	guint i, neg = 0;
+	gsize i, neg = 0;
 
 	for (i = 0; i < num_patterns; i++) {
 		if (patterns[i][0] == '!') {
 			neg++;
+			if (!str)
+				continue;
 			if (!fnmatch (patterns[i] + 1, str, 0))
 				return FALSE;
 		}
@@ -1716,10 +1718,12 @@ nm_wildcard_match_check (const char *str,
 	if (neg == num_patterns)
 		return TRUE;
 
-	for (i = 0; i < num_patterns; i++) {
-		if (   patterns[i][0] != '!'
-		    && !fnmatch (patterns[i], str, 0))
-			return TRUE;
+	if (str) {
+		for (i = 0; i < num_patterns; i++) {
+			if (   patterns[i][0] != '!'
+			    && !fnmatch (patterns[i], str, 0))
+				return TRUE;
+		}
 	}
 
 	return FALSE;

From bdd0e89b9a0a52b433e82c2df0604089d677cb4e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 16:17:19 +0200
Subject: [PATCH 151/222] device: handle match.driver also with unknown device
 driver

If the driver is unknown, that doesn't necessarily mean that the match
passes. Instead, the match passes if there is no positive match that
asks for the driver name.
---
 src/devices/nm-device.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index e4661a7dc4..2430a52f14 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -6042,6 +6042,7 @@ check_connection_compatible (NMDevice *self, NMConnection *connection, GError **
 	                                                        NM_TYPE_SETTING_MATCH);
 	if (s_match) {
 		const char *const *patterns;
+		const char *device_driver;
 		guint num_patterns = 0;
 
 		/* interface_names */
@@ -6104,17 +6105,12 @@ check_connection_compatible (NMDevice *self, NMConnection *connection, GError **
 			}
 		}
 
-		{ /* driver */
-			const char *device_driver = nm_device_get_driver (self);
-
-			if (device_driver) {
-				patterns = nm_setting_match_get_drivers (s_match, &num_patterns);
-				if (!nm_wildcard_match_check (device_driver, patterns, num_patterns)) {
-					nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
-					                            "device does not satisfy match.driver property");
-					return FALSE;
-				}
-			}
+		device_driver = nm_device_get_driver (self);
+		patterns = nm_setting_match_get_drivers (s_match, &num_patterns);
+		if (!nm_wildcard_match_check (device_driver, patterns, num_patterns)) {
+			nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
+			                            "device does not satisfy match.driver property");
+			return FALSE;
 		}
 	}
 

From 5beb42b9428feef7200aef4b3907682c7b16bcb2 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 16:20:35 +0200
Subject: [PATCH 152/222] device: style fixes

---
 src/devices/nm-device.c | 55 ++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 2430a52f14..44e5183ec2 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -6045,7 +6045,6 @@ check_connection_compatible (NMDevice *self, NMConnection *connection, GError **
 		const char *device_driver;
 		guint num_patterns = 0;
 
-		/* interface_names */
 		patterns = nm_setting_match_get_interface_names (s_match, &num_patterns);
 		if (!nm_wildcard_match_check (device_iface, patterns, num_patterns)) {
 			nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
@@ -6053,50 +6052,56 @@ check_connection_compatible (NMDevice *self, NMConnection *connection, GError **
 			return FALSE;
 		}
 
-		{ /* kernel_command_line */
+		{
 			const char *const*proc_cmdline;
-			const char *const*proc_cmdline_i;
-			unsigned i;
 			gboolean pos_patterns = FALSE;
+			guint i;
 
 			patterns = nm_setting_match_get_kernel_command_lines (s_match, &num_patterns);
 			proc_cmdline = nm_utils_proc_cmdline_split ();
-			for(i=0; i<num_patterns; i++) {
-				gboolean found = FALSE;
-				gboolean negative = FALSE;
-				const char *equal;
-				const char *patterns_i = patterns[i];
 
-				if(patterns_i[0] == '!') {
+			for (i = 0; i < num_patterns; i++) {
+				const char *patterns_i = patterns[i];
+				const char *const*proc_cmdline_i;
+				gboolean negative = FALSE;
+				gboolean found = FALSE;
+				const char *equal;
+
+				if (patterns_i[0] == '!') {
 					++patterns_i;
 					negative = TRUE;
-				} else {
+				} else
 					pos_patterns = TRUE;
-				}
-				equal = strchr(patterns_i, '=');
+
+				equal = strchr (patterns_i, '=');
 
 				proc_cmdline_i = proc_cmdline;
 				while (*proc_cmdline_i) {
-					if (equal) {  /* if pattern contains = compare full key=value */
-						found = nm_streq0(*proc_cmdline_i, patterns_i);
-					} else {      /* otherwise consider pattern as key only */
-						size_t l = strlen(patterns_i);
-						if (strncmp(*proc_cmdline_i, patterns_i, l) == 0) {
-							if((*proc_cmdline_i)[l] == 0 || (*proc_cmdline_i)[l] == '=') {
-								found = TRUE;
-							}
-						}
+					if (equal) {
+						/* if pattern contains = compare full key=value */
+						found = nm_streq (*proc_cmdline_i, patterns_i);
+					} else {
+						gsize l = strlen (patterns_i);
+
+						/* otherwise consider pattern as key only */
+						if (   strncmp (*proc_cmdline_i, patterns_i, l) == 0
+						    && NM_IN_SET ((*proc_cmdline_i)[l], '\0', '='))
+							found = TRUE;
 					}
-					if(found && negative) {
+					if (   found
+					    && negative) {
+						/* first negative match */
 						nm_utils_error_set (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
 						                    "device does not satisfy match.kernel-command-line property %s",
 						                    patterns[i]);
-						return FALSE;  /* first negative match */
+						return FALSE;
 					}
 					proc_cmdline_i++;
 				}
 
-				if (pos_patterns == TRUE && found == FALSE) {  /* positive patterns configured but no match */
+				if (   pos_patterns
+				    && !found) {
+					/* positive patterns configured but no match */
 					nm_utils_error_set (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
 					                    "device does not satisfy any match.kernel-command-line property %s...",
 					                    patterns[0]);

From fbccd24db6f3d82fd2716150a07b0e1b7a079bc8 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 7 May 2020 08:26:34 +0200
Subject: [PATCH 153/222] cli/polkit: add missing variable initialization in
 dbus_method_call_cb()

Reported by coverity:

>>> CID 210217: (UNINIT)
>>> Using uninitialized value "identities_gvariant" when calling
    "gs_local_variant_unref".

Fixes: df1d214b2ea7 ('clients: polkit-agent: implement polkit agent without using libpolkit')
---
 clients/common/nm-polkit-listener.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index 7691ff4e06..d6361f4bfc 100644
--- a/clients/common/nm-polkit-listener.c
+++ b/clients/common/nm-polkit-listener.c
@@ -663,7 +663,7 @@ dbus_method_call_cb (GDBusConnection *connection,
 	const char *message;
 	const char *cookie;
 	AuthRequest *request;
-	gs_unref_variant GVariant *identities_gvariant;
+	gs_unref_variant GVariant *identities_gvariant = NULL;
 
 	if (nm_streq (method_name, "BeginAuthentication")) {
 		g_variant_get (parameters,

From 8cb58ef1ebebf719d639b962db9a6139de0c5ce9 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 7 May 2020 08:59:41 +0200
Subject: [PATCH 154/222] cli/polkit: add missing variable initialization in
 retrieve_session_id_cb()

Reported by coverity:

>>> CID 210213 Uninitialized pointer read (UNINIT)
>>> Using uninitialized value iter when calling
    _nm_auto_free_variant_iter

Fixes: df1d214b2ea7 ('clients: polkit-agent: implement polkit agent without using libpolkit')
---
 clients/common/nm-polkit-listener.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index d6361f4bfc..ace205e809 100644
--- a/clients/common/nm-polkit-listener.c
+++ b/clients/common/nm-polkit-listener.c
@@ -339,7 +339,7 @@ retrieve_session_id_cb (GObject *source_object,
 	NMPolkitListener *listener = NM_POLKIT_LISTENER (user_data);
 	char *session_id;
 	guint32 session_uid;
-	nm_auto_free_variant_iter GVariantIter *iter;
+	nm_auto_free_variant_iter GVariantIter *iter = NULL;
 	gs_unref_variant GVariant *ret = NULL;
 	gs_free_error GError *error = NULL;
 	gs_free char *err_str = NULL;

From 966e3341a6fb0c2868be5355f077eeaa34025b28 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 7 May 2020 09:09:07 +0200
Subject: [PATCH 155/222] libnm-core: replace malloc() with g_malloc()

For consistency with the rest of the code, prefer g_malloc() over
malloc().
---
 libnm-core/nm-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 8bddbd23ea..7b69b4ef7a 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -5444,7 +5444,7 @@ attribute_escape (const char *src, char c1, char c2)
 {
 	char *ret, *dest;
 
-	dest = ret = malloc (strlen (src) * 2 + 1);
+	dest = ret = g_malloc (strlen (src) * 2 + 1);
 
 	while (*src) {
 		if (*src == c1 || *src == c2 || *src == '\\')

From 272f19108b8c6250697ab081e21191f9108d710d Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 7 May 2020 09:20:06 +0200
Subject: [PATCH 156/222] libnm: fix assertion in NML_IS_DBUS_OBJECT()

Reported by coverity:

>>> CID 210228: Null pointer dereferences (REVERSE_INULL)
>>> Null-checking "dbobj" suggests that it may be null, but it has
    already been dereferenced on all paths leading to the check.

Fixes: ce0e898fb476 ('libnm: refactor caching of D-Bus objects in NMClient')
---
 libnm/nm-libnm-utils.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h
index 64ce81ad3b..b59ba5f036 100644
--- a/libnm/nm-libnm-utils.h
+++ b/libnm/nm-libnm-utils.h
@@ -671,7 +671,8 @@ NML_IS_DBUS_OBJECT (NMLDBusObject *dbobj)
 	nm_assert (   !dbobj
 	           || (   NM_IS_REF_STRING (dbobj->dbus_path)
 	               && dbobj->ref_count > 0));
-	nm_assert (   !dbobj->nmobj
+	nm_assert (   !dbobj
+	           || !dbobj->nmobj
 	           || NM_IS_OBJECT (dbobj->nmobj)
 	           || NM_IS_CLIENT (dbobj->nmobj));
 	return !!dbobj;

From 581aa981c27d4bde17eb8772fe92697f586a6ed6 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 7 May 2020 09:30:02 +0200
Subject: [PATCH 157/222] ifcfg-rh: check return value of fdopen()

Reported by coverity:

>>> CID 210222: Null pointer dereferences (NULL_RETURNS)
>>> Dereferencing a pointer that might be "NULL" "f" when calling
    "fseek".

Fixes: ac5206aa9c5a ('2007-11-21')
---
 src/settings/plugins/ifcfg-rh/shvar.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c
index f2a1dd7875..cd63661d9a 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.c
+++ b/src/settings/plugins/ifcfg-rh/shvar.c
@@ -1492,6 +1492,13 @@ svWriteFile (shvarFile *s, int mode, GError **error)
 			return FALSE;
 		}
 		f = fdopen (tmpfd, "w");
+		if (!f) {
+			errsv = errno;
+			g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errsv),
+			             "Internal error writing file '%s': %s",
+			             s->fileName, nm_strerror_native (errsv));
+			return FALSE;
+		}
 		fseek (f, 0, SEEK_SET);
 		c_list_for_each (current, &s->lst_head) {
 			const shvarLine *line = c_list_entry (current, shvarLine, lst);

From a29b13c7f1eb03cb59ae0cd7bfa5dbd9f027ec84 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 7 May 2020 09:37:12 +0200
Subject: [PATCH 158/222] libnm: remove early return statement in
 test_nm_auth_permissions()

Reported by coverity:

>>> CID 210230: Control flow issues (UNREACHABLE)
>>> This code cannot be reached: "i = 0;".

Fixes: 09e17888f7f0 ('libnm: add mapping functions between string and NMClientPermission enum')
---
 libnm/tests/test-libnm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libnm/tests/test-libnm.c b/libnm/tests/test-libnm.c
index 90d0cf0d3f..d437c82c6c 100644
--- a/libnm/tests/test-libnm.c
+++ b/libnm/tests/test-libnm.c
@@ -3103,7 +3103,7 @@ test_nm_auth_permissions (void)
 		g_assert (s == nm_auth_permission_names_by_idx[i - 1]);
 		g_assert_cmpint (nm_auth_permission_from_string (s), ==, i);
 	}
-	return;
+
 	for (i = 0; i < NM_CLIENT_PERMISSION_LAST; i++)
 		g_assert_cmpint (nm_auth_permission_from_string (nm_auth_permission_names_by_idx[i]), ==, i + 1);
 }

From d170f8b7f26c072760ea05f34ed06a22cf00c7c3 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 7 May 2020 11:14:26 +0200
Subject: [PATCH 159/222] device: fix compilation error
 "--without-more-asserts"

Defining the name "dispose" breaks

   object_class->dispose = dispose;

below.

Fixes: fdba9200c0c0 ('device: avoid coverity warning about unused variable')
---
 src/devices/nm-device-macvlan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c
index 9079bb2b52..3435df1be7 100644
--- a/src/devices/nm-device-macvlan.c
+++ b/src/devices/nm-device-macvlan.c
@@ -471,8 +471,6 @@ dispose (GObject *object)
 	nm_assert (NM_DEVICE_MACVLAN_GET_PRIVATE (object)->parent_state_id == 0);
 	nm_assert (NM_DEVICE_MACVLAN_GET_PRIVATE (object)->parent_mtu_id == 0);
 }
-#else
-#define dispose ((void (*) (GObject *object)) NULL)
 #endif
 
 static const NMDBusInterfaceInfoExtended interface_info_device_macvlan = {
@@ -498,7 +496,9 @@ nm_device_macvlan_class_init (NMDeviceMacvlanClass *klass)
 	NMDBusObjectClass *dbus_object_class = NM_DBUS_OBJECT_CLASS (klass);
 	NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
 
+#if NM_MORE_ASSERTS
 	object_class->dispose = dispose;
+#endif
 	object_class->get_property = get_property;
 	object_class->set_property = set_property;
 

From b447c80ad811850b9540225a96cb5496f8210b34 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 22:13:06 +0200
Subject: [PATCH 160/222] acd: avoid alloca() inside an unbounded loop

---
 src/devices/nm-acd-manager.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/devices/nm-acd-manager.c b/src/devices/nm-acd-manager.c
index 735dd25b09..d9caadc6b6 100644
--- a/src/devices/nm-acd-manager.c
+++ b/src/devices/nm-acd-manager.c
@@ -81,7 +81,20 @@ _acd_event_to_string (unsigned int event)
 	return NULL;
 }
 
-#define acd_event_to_string_a(event) NM_UTILS_LOOKUP_STR_A (_acd_event_to_string, event)
+#define ACD_EVENT_TO_STRING_BUF_SIZE 50
+
+static const char *
+_acd_event_to_string_buf (unsigned event, char buffer[ACD_EVENT_TO_STRING_BUF_SIZE])
+{
+	const char *s;
+
+	s = _acd_event_to_string (event);
+	if (s)
+		return s;
+
+	g_snprintf (buffer, ACD_EVENT_TO_STRING_BUF_SIZE, "(%u)", event);
+	return buffer;
+}
 
 static const char *
 acd_error_to_string (int error)
@@ -172,6 +185,7 @@ acd_event (int fd,
 
 	while (   !n_acd_pop_event (self->acd, &event)
 	       && event) {
+		char to_string_buffer[ACD_EVENT_TO_STRING_BUF_SIZE];
 		gs_free char *hwaddr_str = NULL;
 		gboolean check_probing_done = FALSE;
 
@@ -215,7 +229,7 @@ acd_event (int fd,
 			       nm_platform_link_get_name (NM_PLATFORM_GET, self->ifindex));
 			break;
 		default:
-			_LOGD ("unhandled event '%s'", acd_event_to_string_a (event->event));
+			_LOGD ("unhandled event '%s'", _acd_event_to_string_buf (event->event, to_string_buffer));
 			break;
 		}
 

From 53b229770199e197d6482a96710650a55609afe1 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 22:29:46 +0200
Subject: [PATCH 161/222] ndisc: avoid static analysis complaining about
 overflow check in receive_ra()

lgtm.com flags this. The check was there to be better safe than sorry.
Also, it seems better to have code that shows what happens instead
of a verbose code comment (or no comment at all). Anyway, avoid the
false positive.
---
 src/ndisc/nm-lndp-ndisc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ndisc/nm-lndp-ndisc.c b/src/ndisc/nm-lndp-ndisc.c
index b698489c0d..cff3db827b 100644
--- a/src/ndisc/nm-lndp-ndisc.c
+++ b/src/ndisc/nm-lndp-ndisc.c
@@ -179,9 +179,9 @@ receive_ra (struct ndp *ndp, struct ndp_msg *msg, gpointer user_data)
 	 */
 	#define NM_NDISC_VLTIME_MULT ((guint32) 48)
 	clamp_pltime = ndp_msgra_router_lifetime (msgra);
-	clamp_vltime =   (clamp_pltime < G_MAXUINT32 / NM_NDISC_VLTIME_MULT)
-	               ? clamp_pltime * NM_NDISC_VLTIME_MULT
-	               : G_MAXUINT32;
+
+	/* clamp_pltime has at most 16 bit set, and multiplication cannot overflow. */
+	clamp_vltime = clamp_pltime * NM_NDISC_VLTIME_MULT;
 
 	ndp_msg_opt_for_each_offset (offset, msg, NDP_MSG_OPT_PREFIX) {
 		guint8 r_plen;

From 6f0dadabd750e28a3617d798f1d9325d0f0c4b79 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 22:33:52 +0200
Subject: [PATCH 162/222] cli: avoid non-thread-safe localtime() function in
 nmcli

Static analysis tools flag the use of localtime() because it is not
thread safe. Of course, that was no problem here, but avoiding the
warning is simple.

Also, if we allocate 128 bytes, let strftime use it.
---
 clients/cli/connections.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 0e4a95e68a..ec0b9200a7 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -541,6 +541,8 @@ _metagen_con_show_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 			if (info->info_type == NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP)
 				return (*out_to_free = g_strdup_printf ("%" G_GUINT64_FORMAT, timestamp));
 			else {
+				struct tm localtime_result;
+
 				if (!timestamp) {
 					if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY)
 						return _("never");
@@ -548,7 +550,7 @@ _metagen_con_show_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 				}
 				timestamp_real = timestamp;
 				s_mut = g_malloc0 (128);
-				strftime (s_mut, 64, "%c", localtime (&timestamp_real));
+				strftime (s_mut, 127, "%c", localtime_r (&timestamp_real, &localtime_result));
 				return (*out_to_free = s_mut);
 			}
 		}

From b93e12cb43b6401ac3a891fe8841f08eddbf6b1d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 22:41:44 +0200
Subject: [PATCH 163/222] cli: avoid redundant "if" check that is always TRUE
 in nmcli_editor_tab_completion()

---
 clients/cli/connections.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index ec0b9200a7..65cc1e905e 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -6282,7 +6282,7 @@ nmcli_editor_tab_completion (const char *text, int start, int end)
 							rl_completion_append_character = '.';
 						} else
 							generator_func = gen_property_names;
-					} else if (num >= 3) {
+					} else {
 						if (num == 3 && should_complete_files (NULL, line))
 							rl_attempted_completion_over = 0;
 						else if (should_complete_vpn_uuids (NULL, line)) {

From 3a1273f777133d5be745950dce4555c2adb664f0 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 23:18:54 +0200
Subject: [PATCH 164/222] cli: avoid empty if block without a comment

lgtm.com flags this as "Empty block without comment".
Avoid it.

This code is of course ugly. Much work was already done to
port such occurrences, and more is needed. I won't add a FIXME
comment, because lgtm.com flags those too. :)
---
 clients/cli/connections.c | 3 +++
 clients/cli/devices.c     | 4 ++++
 clients/cli/general.c     | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 65cc1e905e..e6d6c69905 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -1451,7 +1451,9 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc)
 	gboolean was_output = FALSE;
 
 	if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "common") == 0) {
+		/* pass */
 	} else if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "all") == 0) {
+		/* pass */
 	} else
 		fields_str = nmc->required_fields;
 
@@ -2076,6 +2078,7 @@ do_connections_show (const NMCCommand *cmd, NmCli *nmc, int argc, const char *co
 		if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "common") == 0)
 			fields_str = NMC_FIELDS_CON_SHOW_COMMON;
 		else if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "all") == 0) {
+			/* pass */
 		} else
 			fields_str = nmc->required_fields;
 
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 7031b43756..2d79d2ae9a 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -1436,6 +1436,7 @@ show_device_info (NMDevice *device, NmCli *nmc)
 	if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "common") == 0)
 		fields_str = NMC_FIELDS_DEV_SHOW_SECTIONS_COMMON;
 	else if (g_ascii_strcasecmp (nmc->required_fields, "all") == 0) {
+		/* pass */
 	} else
 		fields_str = nmc->required_fields;
 
@@ -1749,6 +1750,7 @@ do_devices_status (const NMCCommand *cmd, NmCli *nmc, int argc, const char *cons
 	if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "common") == 0)
 		fields_str = "DEVICE,TYPE,STATE,CONNECTION";
 	else if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "all") == 0) {
+		/* pass */
 	} else
 		fields_str = nmc->required_fields;
 
@@ -3149,6 +3151,7 @@ do_device_wifi_list (const NMCCommand *cmd, NmCli *nmc, int argc, const char *co
 	if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "common") == 0)
 		fields_str = NMC_FIELDS_DEV_WIFI_LIST_COMMON;
 	else if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "all") == 0) {
+		/* pass */
 	} else
 		fields_str = nmc->required_fields;
 
@@ -4651,6 +4654,7 @@ do_device_lldp_list (const NMCCommand *cmd, NmCli *nmc, int argc, const char *co
 	if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "common") == 0)
 		fields_str = NMC_FIELDS_DEV_LLDP_LIST_COMMON;
 	else if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "all") == 0) {
+		/* pass */
 	} else
 		fields_str = nmc->required_fields;
 
diff --git a/clients/cli/general.c b/clients/cli/general.c
index 747203bb06..05ff4dee37 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -545,7 +545,9 @@ print_permissions (void *user_data)
 	}
 
 	if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "common") == 0) {
+		/* pass */
 	} else if (g_ascii_strcasecmp (nmc->required_fields, "all") == 0) {
+		/* pass */
 	} else
 		fields_str = nmc->required_fields;
 
@@ -694,7 +696,9 @@ show_general_logging (NmCli *nmc)
 	};
 
 	if (!nmc->required_fields || g_ascii_strcasecmp (nmc->required_fields, "common") == 0) {
+		/* pass */
 	} else if (g_ascii_strcasecmp (nmc->required_fields, "all") == 0) {
+		/* pass */
 	} else
 		fields_str = nmc->required_fields;
 

From 9acf32a7a8035ddee027baa4fef445c7e74696e2 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 23:03:10 +0200
Subject: [PATCH 165/222] config: avoid lgtm.com warning about int bitfield for
 NMConfigDeviceStateData.nm_owned

lgtm.com warns:

  int nm_owned:3;
  >> Bit field nm_owned of type int should have explicitly unsigned integral, explicitly signed integral, or enumeration type.

So make it a NMTernary instead. It's nicer anyway.
---
 src/nm-config.c  | 16 +++++++++-------
 src/nm-config.h  |  4 ++--
 src/nm-manager.c |  6 ++++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/nm-config.c b/src/nm-config.c
index 63347db7bb..9a16aa0374 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -2210,7 +2210,7 @@ _config_device_state_data_new (int ifindex, GKeyFile *kf)
 	gs_free char *perm_hw_addr_fake = NULL;
 	gsize connection_uuid_len;
 	gsize perm_hw_addr_fake_len;
-	int nm_owned = -1;
+	NMTernary nm_owned;
 	char *p;
 	guint32 route_metric_default_effective;
 	guint32 route_metric_default_aspired;
@@ -2252,7 +2252,7 @@ _config_device_state_data_new (int ifindex, GKeyFile *kf)
 	nm_owned = nm_config_keyfile_get_boolean (kf,
 	                                          DEVICE_RUN_STATE_KEYFILE_GROUP_DEVICE,
 	                                          DEVICE_RUN_STATE_KEYFILE_KEY_DEVICE_NM_OWNED,
-	                                          -1);
+	                                          NM_TERNARY_DEFAULT);
 
 	/* metric zero is not a valid metric. While zero valid for IPv4, for IPv6 it is an alias
 	 * for 1024. Since we handle here IPv4 and IPv6 the same, we cannot allow zero. */
@@ -2325,9 +2325,11 @@ nm_config_device_state_load (int ifindex)
 		return NULL;
 
 	device_state = _config_device_state_data_new (ifindex, kf);
-	nm_owned_str = device_state->nm_owned == TRUE ?
-	               ", nm-owned=1" :
-	               (device_state->nm_owned == FALSE ? ", nm-owned=0" : "");
+	nm_owned_str =   device_state->nm_owned == NM_TERNARY_TRUE
+	               ? ", nm-owned=1"
+	               : (  device_state->nm_owned == NM_TERNARY_FALSE
+	                  ? ", nm-owned=0"
+	                  : "");
 
 	_LOGT ("device-state: %s #%d (%s); managed=%s%s%s%s%s%s%s%s, route-metric-default=%"G_GUINT32_FORMAT"-%"G_GUINT32_FORMAT"",
 	       kf ? "read" : "miss",
@@ -2390,7 +2392,7 @@ nm_config_device_state_write (int ifindex,
                               NMConfigDeviceStateManagedType managed,
                               const char *perm_hw_addr_fake,
                               const char *connection_uuid,
-                              int nm_owned,
+                              NMTernary nm_owned,
                               guint32 route_metric_default_aspired,
                               guint32 route_metric_default_effective,
                               const char *next_server,
@@ -2429,7 +2431,7 @@ nm_config_device_state_write (int ifindex,
 		                       DEVICE_RUN_STATE_KEYFILE_KEY_DEVICE_CONNECTION_UUID,
 		                       connection_uuid);
 	}
-	if (nm_owned >= 0) {
+	if (nm_owned != NM_TERNARY_DEFAULT) {
 		g_key_file_set_boolean (kf,
 		                        DEVICE_RUN_STATE_KEYFILE_GROUP_DEVICE,
 		                        DEVICE_RUN_STATE_KEYFILE_KEY_DEVICE_NM_OWNED,
diff --git a/src/nm-config.h b/src/nm-config.h
index b4478ceb04..0fce7ec0cb 100644
--- a/src/nm-config.h
+++ b/src/nm-config.h
@@ -243,7 +243,7 @@ struct _NMConfigDeviceStateData {
 
 	/* whether the device was nm-owned (0/1) or -1 for
 	 * non-software devices. */
-	int nm_owned:3;
+	NMTernary nm_owned:3;
 };
 
 NMConfigDeviceStateData *nm_config_device_state_load (int ifindex);
@@ -252,7 +252,7 @@ gboolean nm_config_device_state_write (int ifindex,
                                        NMConfigDeviceStateManagedType managed,
                                        const char *perm_hw_addr_fake,
                                        const char *connection_uuid,
-                                       int nm_owned,
+                                       NMTernary nm_owned,
                                        guint32 route_metric_default_aspired,
                                        guint32 route_metric_default_effective,
                                        const char *next_server,
diff --git a/src/nm-manager.c b/src/nm-manager.c
index bbe501259f..8cee206bef 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -6552,7 +6552,7 @@ nm_manager_write_device_state (NMManager *self, NMDevice *device, int *out_ifind
 	gboolean perm_hw_addr_is_fake;
 	guint32 route_metric_default_aspired;
 	guint32 route_metric_default_effective;
-	int nm_owned;
+	NMTernary nm_owned;
 	NMDhcpConfig *dhcp_config;
 	const char *next_server = NULL;
 	const char *root_path = NULL;
@@ -6588,7 +6588,9 @@ nm_manager_write_device_state (NMManager *self, NMDevice *device, int *out_ifind
 	if (perm_hw_addr_fake && !perm_hw_addr_is_fake)
 		perm_hw_addr_fake = NULL;
 
-	nm_owned = nm_device_is_software (device) ? nm_device_is_nm_owned (device) : -1;
+	nm_owned =   nm_device_is_software (device)
+	           ? nm_device_is_nm_owned (device)
+	           : NM_TERNARY_DEFAULT;
 
 	route_metric_default_effective = _device_route_metric_get (self, ifindex, NM_DEVICE_TYPE_UNKNOWN,
 	                                                           TRUE, &route_metric_default_aspired);

From 9e6d6191d1d76c71edd02a8781a5049b4041707c Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 23:06:36 +0200
Subject: [PATCH 166/222] tests: add include guard to "nm-test-libnm-utils.h"
 header

It causes a warning on lgtm.com.
---
 shared/nm-test-libnm-utils.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/shared/nm-test-libnm-utils.h b/shared/nm-test-libnm-utils.h
index 06dbc72d71..04e8fb649b 100644
--- a/shared/nm-test-libnm-utils.h
+++ b/shared/nm-test-libnm-utils.h
@@ -3,6 +3,9 @@
  * Copyright (C) 2014 - 2015 Red Hat, Inc.
  */
 
+#ifndef __NM_TEST_LIBNM_UTILS_H__
+#define __NM_TEST_LIBNM_UTILS_H__
+
 #include "NetworkManager.h"
 
 #include "nm-utils/nm-test-utils.h"
@@ -82,3 +85,5 @@ nmtstc_client_new (gboolean allow_iterate_main_context)
 {
 	return nmtstc_context_object_new (NM_TYPE_CLIENT, allow_iterate_main_context, NULL);
 }
+
+#endif /* __NM_TEST_LIBNM_UTILS_H__ */

From 0258616bd8ea65be0bff4fac94880cba12a0b94a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 22:37:07 +0200
Subject: [PATCH 167/222] libnm: fix redundant line constructing
 dbus_type_name_map in "generate-setting-docs.py"

---
 libnm/generate-setting-docs.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libnm/generate-setting-docs.py b/libnm/generate-setting-docs.py
index 025689ea3c..2bd13f5aa4 100755
--- a/libnm/generate-setting-docs.py
+++ b/libnm/generate-setting-docs.py
@@ -47,7 +47,6 @@ dbus_type_name_map = {
     'aay': 'array of byte array',
     'a(ayuay)': 'array of legacy IPv6 address struct',
     'a(ayuayu)': 'array of legacy IPv6 route struct',
-    'aa{sv}': 'array of vardict',
 }
 
 ns_map = {

From cc1c2c9fc96eb9eeae5ddcb29c350a062e6781e7 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 23:16:34 +0200
Subject: [PATCH 168/222] libnm: remove unused import from
 "generate-setting-docs.py"

---
 libnm/generate-setting-docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libnm/generate-setting-docs.py b/libnm/generate-setting-docs.py
index 2bd13f5aa4..38b914b3c9 100755
--- a/libnm/generate-setting-docs.py
+++ b/libnm/generate-setting-docs.py
@@ -10,7 +10,7 @@ import os
 import gi
 gi.require_version('GIRepository', '2.0')
 from gi.repository import GIRepository
-import argparse, datetime, re, sys
+import argparse, re, sys
 import xml.etree.ElementTree as ET
 
 try:

From a5614dc469aada7c3b2b294a318defb40a50205b Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 23:09:21 +0200
Subject: [PATCH 169/222] examples: remove unused assignment in
 "examples/python/gi/wifi-p2p.py"

lgtm.com warns about this.
---
 examples/python/gi/wifi-p2p.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/python/gi/wifi-p2p.py b/examples/python/gi/wifi-p2p.py
index 746d8d7975..804df34c89 100755
--- a/examples/python/gi/wifi-p2p.py
+++ b/examples/python/gi/wifi-p2p.py
@@ -82,7 +82,7 @@ def scan_timeout_cb(device):
 
 def start_find_cb(device, async_result, user_data):
     try:
-        r = device.start_find_finish(async_result)
+        device.start_find_finish(async_result)
     except Exception as e:
         sys.stderr.write("Error: %s\n" % e)
         main_loop.quit()

From 41a7a262591e25985431a70e8b597ce85d10ebd6 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 23:16:34 +0200
Subject: [PATCH 170/222] examples: remove unused imports from python examples

---
 examples/python/dbus/get-active-connection-uuids.py | 2 +-
 examples/python/dbus/list-devices.py                | 2 +-
 examples/python/dbus/wifi-active-ap.py              | 2 +-
 examples/python/gi/checkpoint.py                    | 2 --
 examples/python/gi/dns.py                           | 1 -
 examples/python/gi/get-active-connections.py        | 2 +-
 examples/python/gi/get-devices.py                   | 2 +-
 examples/python/gi/get-interface-flags.py           | 2 +-
 examples/python/gi/get_ips.py                       | 2 +-
 examples/python/gi/nm-add-connection2.py            | 1 -
 examples/python/gi/nm-update2.py                    | 1 -
 examples/python/gi/nm-wg-set                        | 1 -
 12 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/examples/python/dbus/get-active-connection-uuids.py b/examples/python/dbus/get-active-connection-uuids.py
index 8d0e5c15e7..dd168c0aab 100755
--- a/examples/python/dbus/get-active-connection-uuids.py
+++ b/examples/python/dbus/get-active-connection-uuids.py
@@ -4,7 +4,7 @@
 # Copyright (C) 2010 Red Hat, Inc.
 #
 
-import dbus, sys
+import dbus
 
 # This example takes a device interface name as a parameter and tells
 # NetworkManager to disconnect that device, closing down any network
diff --git a/examples/python/dbus/list-devices.py b/examples/python/dbus/list-devices.py
index 4a9ebe4e53..aebc902bbe 100755
--- a/examples/python/dbus/list-devices.py
+++ b/examples/python/dbus/list-devices.py
@@ -4,7 +4,7 @@
 # Copyright (C) 2011 - 2012 Red Hat, Inc.
 #
 
-import dbus, sys
+import dbus
 
 # This example lists basic information about network interfaces known to NM
 
diff --git a/examples/python/dbus/wifi-active-ap.py b/examples/python/dbus/wifi-active-ap.py
index 790f11a9ef..b81c06a933 100755
--- a/examples/python/dbus/wifi-active-ap.py
+++ b/examples/python/dbus/wifi-active-ap.py
@@ -11,7 +11,7 @@
 # https://developer.gnome.org/NetworkManager/1.0/ref-settings.html
 #
 
-import dbus, sys, time
+import dbus, sys
 
 bus = dbus.SystemBus()
 service_name = "org.freedesktop.NetworkManager"
diff --git a/examples/python/gi/checkpoint.py b/examples/python/gi/checkpoint.py
index b3b4e0f8a5..b1ecbb8984 100755
--- a/examples/python/gi/checkpoint.py
+++ b/examples/python/gi/checkpoint.py
@@ -10,8 +10,6 @@ import gi
 gi.require_version('NM', '1.0')
 from gi.repository import GLib, NM
 
-import os
-
 ###############################################################################
 
 def usage():
diff --git a/examples/python/gi/dns.py b/examples/python/gi/dns.py
index f93f97e514..da2a6a6c43 100755
--- a/examples/python/gi/dns.py
+++ b/examples/python/gi/dns.py
@@ -4,7 +4,6 @@
 # Copyright (C) 2016 Red Hat, Inc.
 #
 
-import sys
 import gi
 gi.require_version('NM', '1.0')
 from gi.repository import GLib, NM
diff --git a/examples/python/gi/get-active-connections.py b/examples/python/gi/get-active-connections.py
index 072f245ab0..6da8b61890 100755
--- a/examples/python/gi/get-active-connections.py
+++ b/examples/python/gi/get-active-connections.py
@@ -8,7 +8,7 @@
 
 import gi
 gi.require_version('NM', '1.0')
-from gi.repository import GLib, NM
+from gi.repository import NM
 
 if __name__ == "__main__":
     client = NM.Client.new(None)
diff --git a/examples/python/gi/get-devices.py b/examples/python/gi/get-devices.py
index 113d384b30..88bcc8945b 100755
--- a/examples/python/gi/get-devices.py
+++ b/examples/python/gi/get-devices.py
@@ -8,7 +8,7 @@
 
 import gi
 gi.require_version('NM', '1.0')
-from gi.repository import GLib, NM
+from gi.repository import NM
 
 if __name__ == "__main__":
     client = NM.Client.new(None)
diff --git a/examples/python/gi/get-interface-flags.py b/examples/python/gi/get-interface-flags.py
index 756999169b..e1d1721a4f 100755
--- a/examples/python/gi/get-interface-flags.py
+++ b/examples/python/gi/get-interface-flags.py
@@ -6,7 +6,7 @@
 
 import gi
 gi.require_version('NM', '1.0')
-from gi.repository import GLib, NM
+from gi.repository import NM
 
 if __name__ == "__main__":
     client = NM.Client.new(None)
diff --git a/examples/python/gi/get_ips.py b/examples/python/gi/get_ips.py
index 13b0a8b6db..75be2f8c5d 100755
--- a/examples/python/gi/get_ips.py
+++ b/examples/python/gi/get_ips.py
@@ -7,7 +7,7 @@
 import sys, socket
 import gi
 gi.require_version('NM', '1.0')
-from gi.repository import GLib, NM
+from gi.repository import NM
 
 #
 #  This example shows how to get addresses, routes and DNS information
diff --git a/examples/python/gi/nm-add-connection2.py b/examples/python/gi/nm-add-connection2.py
index 01c1ae7bd9..c5ec3f3bbe 100755
--- a/examples/python/gi/nm-add-connection2.py
+++ b/examples/python/gi/nm-add-connection2.py
@@ -5,7 +5,6 @@
 #
 
 import sys
-import re
 
 import gi
 gi.require_version('NM', '1.0')
diff --git a/examples/python/gi/nm-update2.py b/examples/python/gi/nm-update2.py
index 5a65879371..23e277c78d 100755
--- a/examples/python/gi/nm-update2.py
+++ b/examples/python/gi/nm-update2.py
@@ -5,7 +5,6 @@
 #
 
 import sys
-import re
 
 import gi
 gi.require_version('NM', '1.0')
diff --git a/examples/python/gi/nm-wg-set b/examples/python/gi/nm-wg-set
index ca31ac7207..81d86c7c0a 100755
--- a/examples/python/gi/nm-wg-set
+++ b/examples/python/gi/nm-wg-set
@@ -58,7 +58,6 @@
 #       nm-wg-set id "$PROFILE" $WG_ARGS
 
 import sys
-import re
 import os
 
 import gi

From 5c08981356a1038f49050d748f09d859bf471810 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 22:33:52 +0200
Subject: [PATCH 171/222] examples: avoid non-thread-safe localtime() function
 example

Just to silence the warning on lgtm.com.
---
 examples/C/glib/list-connections-libnm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/examples/C/glib/list-connections-libnm.c b/examples/C/glib/list-connections-libnm.c
index 77d5dfb729..7bed0c014e 100644
--- a/examples/C/glib/list-connections-libnm.c
+++ b/examples/C/glib/list-connections-libnm.c
@@ -30,10 +30,15 @@ show_connection (NMConnection *connection)
 
 	s_con = nm_connection_get_setting_connection (connection);
 	if (s_con) {
+		struct tm localtime_data;
+
 		/* Get various info from NMSettingConnection and show it */
 		timestamp = nm_setting_connection_get_timestamp (s_con);
 		timestamp_str = g_strdup_printf ("%" G_GUINT64_FORMAT, timestamp);
-		strftime (timestamp_real_str, sizeof (timestamp_real_str), "%c", localtime ((time_t *) &timestamp));
+		strftime (timestamp_real_str,
+		          sizeof (timestamp_real_str),
+		          "%c",
+		          localtime_r ((time_t *) &timestamp, &localtime_data));
 
 		val1 = nm_setting_connection_get_id (s_con);
 		val2 = nm_setting_connection_get_uuid (s_con);

From c7d0a8605067a7b86a36bc2ce5470d0367a4d737 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 23:40:43 +0200
Subject: [PATCH 172/222] examples: avoid "except" for BaseException in
 examples

lgtm.com flags this as "Except block directly handles BaseException".
---
 examples/python/gi/checkpoint.py | 2 +-
 examples/python/gi/nm-wg-set     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/python/gi/checkpoint.py b/examples/python/gi/checkpoint.py
index b1ecbb8984..a695a64613 100755
--- a/examples/python/gi/checkpoint.py
+++ b/examples/python/gi/checkpoint.py
@@ -134,7 +134,7 @@ def do_adjust_rollback_timeout(client):
         sys.exit("Missing timeout")
     try:
         add_timeout = int(sys.argv[3])
-    except:
+    except Exception:
         sys.exit("Invalid timeout")
 
     path = validate_path(sys.argv[2], client)
diff --git a/examples/python/gi/nm-wg-set b/examples/python/gi/nm-wg-set
index 81d86c7c0a..1f5279ee69 100755
--- a/examples/python/gi/nm-wg-set
+++ b/examples/python/gi/nm-wg-set
@@ -442,7 +442,7 @@ if __name__ == '__main__':
         secrets = conn.get_secrets(NM.SETTING_WIREGUARD_SETTING_NAME)
         if secrets:
             conn.update_secrets(NM.SETTING_WIREGUARD_SETTING_NAME, secrets)
-    except:
+    except Exception:
         pass
 
     if not argv:

From 8ad448444a14cbb421e89509da9c2a5d30eb4004 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 23:42:13 +0200
Subject: [PATCH 173/222] examples: avoid "x == None" checks in python examples

lgmt.com says "Testing for None should use the is operator".
---
 examples/python/dbus/checkpoint.py   | 2 +-
 examples/python/gi/deactivate-all.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/python/dbus/checkpoint.py b/examples/python/dbus/checkpoint.py
index 62c7573b8c..1ea1b1a7fc 100755
--- a/examples/python/dbus/checkpoint.py
+++ b/examples/python/dbus/checkpoint.py
@@ -41,7 +41,7 @@ devList = []
 
 for arg in sys.argv[2:]:
     path = GetDevicePath(arg)
-    if path == None:
+    if path is None:
         raise Exception("NetworkManager knows nothing about %s" % arg)
     else:
         devList.append(path)
diff --git a/examples/python/gi/deactivate-all.py b/examples/python/gi/deactivate-all.py
index 3af350e4c3..7e528d0b3e 100755
--- a/examples/python/gi/deactivate-all.py
+++ b/examples/python/gi/deactivate-all.py
@@ -57,7 +57,7 @@ if __name__ == "__main__":
 
     # deactivate the connections
     for ac in connections:
-        if ctype == None or ctype == ac.get_connection_type():
+        if ctype is None or ctype == ac.get_connection_type():
             sys.stdout.write("Deactivating %s (%s)" % (ac.get_id(), ac.get_uuid()))
             try:
                 client.deactivate_connection(ac, None)

From 64331d6085c39ac563fa64e2cf2b1a8a17dec38e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 23:43:57 +0200
Subject: [PATCH 174/222] examples: remove unused code from
 "examples/python/dbus/vpn.py"

lgtm.com says "The value assigned to local variable all_connections is never used".
Just drop the entire statement. It's not right there.
---
 examples/python/dbus/vpn.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/python/dbus/vpn.py b/examples/python/dbus/vpn.py
index 8939d26206..14fa2f1d2e 100755
--- a/examples/python/dbus/vpn.py
+++ b/examples/python/dbus/vpn.py
@@ -56,7 +56,6 @@ def get_active_connection_path(uuid):
     proxy = bus.get_object('org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager')
     iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.DBus.Properties')
     active_connections = iface.Get('org.freedesktop.NetworkManager', 'ActiveConnections')
-    all_connections = get_connections()
 
     for a in active_connections:
         proxy = bus.get_object('org.freedesktop.NetworkManager', a)

From 5a09292f1fa8c984e29a4a418acb6052589bd5dd Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 09:12:01 +0200
Subject: [PATCH 175/222] shared: fix accessing "str" argument to
 NM_STR_HAS_PREFIX() macro twice

Macros preferably behave function-like, for example in that they evaluate
arguments exactly ones. Sometimes, we want to evaluate arguments
lazily, like in NM_IN_SET() or nm_g_set_error_take_lazy(). But it
is almost always undesirable to evaluate an argument more than once.

Fix NM_STR_HAS_PREFIX() for that.

Also, rename the local variable to not use the name "_str",
which may be a common name that the caller would like to use.
---
 shared/nm-glib-aux/nm-macros-internal.h | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h
index d5a8513e54..6b7285e470 100644
--- a/shared/nm-glib-aux/nm-macros-internal.h
+++ b/shared/nm-glib-aux/nm-macros-internal.h
@@ -929,19 +929,24 @@ nm_streq0 (const char *s1, const char *s2)
 
 #define NM_STR_HAS_PREFIX(str, prefix) \
 	({ \
-		const char *const _str = (str); \
+		const char *const _str_has_prefix = (str); \
 		\
-		_str && (strncmp ((str), ""prefix"", NM_STRLEN (prefix)) == 0); \
+		nm_assert (strlen (prefix) == NM_STRLEN (prefix)); \
+		\
+		   _str_has_prefix \
+		&& (strncmp (_str_has_prefix, ""prefix"", NM_STRLEN (prefix)) == 0); \
 	})
 
 #define NM_STR_HAS_SUFFIX(str, suffix) \
 	({ \
-		const char *_str; \
+		const char *const _str_has_suffix = (str); \
 		gsize _l; \
 		\
-		(   (_str = (str)) \
-		 && ((_l = strlen (_str)) >= NM_STRLEN (suffix)) \
-		 && (memcmp (&_str[_l - NM_STRLEN (suffix)], \
+		nm_assert (strlen (suffix) == NM_STRLEN (suffix)); \
+		\
+		(   _str_has_suffix \
+		 && ((_l = strlen (_str_has_suffix)) >= NM_STRLEN (suffix)) \
+		 && (memcmp (&_str_has_suffix[_l - NM_STRLEN (suffix)], \
 		             ""suffix"", \
 		             NM_STRLEN (suffix)) == 0)); \
 	})

From a617177070b4da95d17962db4a01550ceed6c957 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 08:21:49 +0200
Subject: [PATCH 176/222] shared: add NM_STR_HAS_PREFIX_WITH_MORE() helper

---
 shared/nm-glib-aux/nm-macros-internal.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h
index 6b7285e470..8c0aa21820 100644
--- a/shared/nm-glib-aux/nm-macros-internal.h
+++ b/shared/nm-glib-aux/nm-macros-internal.h
@@ -951,6 +951,16 @@ nm_streq0 (const char *s1, const char *s2)
 		             NM_STRLEN (suffix)) == 0)); \
 	})
 
+/* whether @str starts with the string literal @prefix and is followed by
+ * some other text. It is like NM_STR_HAS_PREFIX() && !nm_streq() together. */
+#define NM_STR_HAS_PREFIX_WITH_MORE(str, prefix) \
+	({ \
+		const char *const _str_has_prefix_with_more = (str); \
+		\
+		   NM_STR_HAS_PREFIX (_str_has_prefix_with_more, ""prefix"") \
+		&& _str_has_prefix_with_more[NM_STRLEN (prefix)] != '\0'; \
+	})
+
 /*****************************************************************************/
 
 static inline GString *

From e31b31e5e573895c2f13cb3614f5763561f3a734 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 08:23:00 +0200
Subject: [PATCH 177/222] shared: add nm_g_error_matches() helper

---
 shared/nm-glib-aux/nm-shared-utils.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index 590059ec4e..fafaefc45d 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -926,6 +926,21 @@ _nm_g_slice_free_fcn_define (32)
 
 /*****************************************************************************/
 
+/* Like g_error_matches() however:
+ * - as macro it is always inlined.
+ * - the @domain is usually a error quark getter function that cannot
+ *   be inlined. This macro calls the getter only if there is an error (lazy).
+ * - accept a list of allowed codes, instead of only one.
+ */
+#define nm_g_error_matches(error, err_domain, ...) \
+	({ \
+		const GError *const _error = (error); \
+		\
+		   _error \
+		&& _error->domain == (err_domain) \
+		&& NM_IN_SET (_error->code, __VA_ARGS__); \
+	})
+
 static inline void
 nm_g_set_error_take (GError **error, GError *error_take)
 {

From df27164d5e6e9ec619bae3ad97717d4664c8a96c Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 08:23:16 +0200
Subject: [PATCH 178/222] shared: add nm_keyfile_error_is_not_found() helper

---
 shared/nm-keyfile/nm-keyfile-utils.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/shared/nm-keyfile/nm-keyfile-utils.h b/shared/nm-keyfile/nm-keyfile-utils.h
index 9b35e17ed6..4764311bb0 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.h
+++ b/shared/nm-keyfile/nm-keyfile-utils.h
@@ -10,9 +10,21 @@
 #error Cannot use this header.
 #endif
 
+/*****************************************************************************/
+
+#include "nm-glib-aux/nm-shared-utils.h"
+
+/*****************************************************************************/
+
 #define NM_KEYFILE_GROUP_VPN_SECRETS          "vpn-secrets"
 #define NM_KEYFILE_GROUPPREFIX_WIREGUARD_PEER "wireguard-peer."
 
+#define nm_keyfile_error_is_not_found(error) \
+	nm_g_error_matches (error, \
+	                    G_KEY_FILE_ERROR, \
+	                    G_KEY_FILE_ERROR_GROUP_NOT_FOUND, \
+	                    G_KEY_FILE_ERROR_KEY_NOT_FOUND)
+
 const char *nm_keyfile_plugin_get_alias_for_setting_name (const char *setting_name);
 
 const char *nm_keyfile_plugin_get_setting_name_for_alias (const char *alias);

From e08bb66b340b374c176e8bbfaec50439fc0ba400 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 08:27:07 +0200
Subject: [PATCH 179/222] keyfile,config: use nm_keyfile_error_is_not_found()
 helper

---
 shared/nm-keyfile/nm-keyfile.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/shared/nm-keyfile/nm-keyfile.c b/shared/nm-keyfile/nm-keyfile.c
index c98fbdf2bb..0caef893e0 100644
--- a/shared/nm-keyfile/nm-keyfile.c
+++ b/shared/nm-keyfile/nm-keyfile.c
@@ -1622,9 +1622,7 @@ parity_good:
 out_err:
 	if (!err)
 		return;
-	if (   err->domain == G_KEY_FILE_ERROR
-	    && NM_IN_SET (err->code, G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-	                             G_KEY_FILE_ERROR_KEY_NOT_FOUND)) {
+	if (nm_keyfile_error_is_not_found (err)) {
 		/* ignore such errors. The key is not present. */
 		return;
 	}
@@ -3154,9 +3152,7 @@ read_one_setting_value (KeyfileReaderInfo *info,
 		g_return_if_reached ();
 
 	if (err) {
-		if (   err->domain == G_KEY_FILE_ERROR
-		    && NM_IN_SET (err->code, G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-		                             G_KEY_FILE_ERROR_KEY_NOT_FOUND)) {
+		if (nm_keyfile_error_is_not_found (err)) {
 			/* ignore such errors. The key is not present. */
 		} else {
 			handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,

From 5cdb636301f934aaa7dbf39340d721e438f76c7d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 08:32:29 +0200
Subject: [PATCH 180/222] keyfile: use nm_g_error_matches() in
 g_error_matches()

nm_g_error_matches() can be inlined and first checks whether the error
argument is not NULL. At least from the keyfile accessor functions, use
this macro, as they are called many times.
---
 shared/nm-keyfile/nm-keyfile-utils.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared/nm-keyfile/nm-keyfile-utils.c b/shared/nm-keyfile/nm-keyfile-utils.c
index 45235495a6..0ffce40b96 100644
--- a/shared/nm-keyfile/nm-keyfile-utils.c
+++ b/shared/nm-keyfile/nm-keyfile-utils.c
@@ -117,7 +117,7 @@ nm_keyfile_plugin_kf_get_string_list (GKeyFile *kf,
 	gsize l;
 
 	list = g_key_file_get_string_list (kf, group, key, &l, &local);
-	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) {
+	if (nm_g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) {
 		alias = nm_keyfile_plugin_get_alias_for_setting_name (group);
 		if (alias) {
 			g_clear_error (&local);
@@ -246,7 +246,7 @@ fcn_name (GKeyFile *kf, \
 	GError *local = NULL; \
 \
 	val = key_file_get_fcn (kf, group, key, &local); \
-	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) { \
+	if (nm_g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) { \
 		alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
 		if (alias) { \
 			g_clear_error (&local); \
@@ -323,7 +323,7 @@ nm_keyfile_plugin_kf_get_keys (GKeyFile *kf,
 	gsize l;
 
 	keys = g_key_file_get_keys (kf, group, &l, &local);
-	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) {
+	if (nm_g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) {
 		alias = nm_keyfile_plugin_get_alias_for_setting_name (group);
 		if (alias) {
 			g_clear_error (&local);
@@ -351,7 +351,7 @@ nm_keyfile_plugin_kf_has_key (GKeyFile *kf,
 	GError *local = NULL;
 
 	has = g_key_file_has_key (kf, group, key, &local);
-	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) {
+	if (nm_g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) {
 		alias = nm_keyfile_plugin_get_alias_for_setting_name (group);
 		if (alias) {
 			g_clear_error (&local);

From f588dabb4f3c116c58b6d79aeac5af8c4e220c32 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 08:28:04 +0200
Subject: [PATCH 181/222] settings: ensure that "plugins-=ifcfg-rh" works with
 the default plugins

On Fedora/RHEL, the default for main.plugins is "ifcfg-rh". You would
expect that a single configuration file

  [main]
  plugins-=ifcfg-rh

would result in an empty list of plugins (which subsequently gets
completed with "keyfile").

That didn't happen due to a bug. Fix it.
---
 src/nm-config-data.c |  7 +++++--
 src/nm-config.c      | 20 ++++++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/nm-config-data.c b/src/nm-config-data.c
index 29dafa14ed..4d85bebf2e 100644
--- a/src/nm-config-data.c
+++ b/src/nm-config-data.c
@@ -12,6 +12,7 @@
 #include "devices/nm-device.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile/nm-keyfile-internal.h"
+#include "nm-keyfile/nm-keyfile-utils.h"
 
 /*****************************************************************************/
 
@@ -215,6 +216,7 @@ nm_config_data_get_value_int64 (const NMConfigData *self, const char *group, con
 char **
 nm_config_data_get_plugins (const NMConfigData *self, gboolean allow_default)
 {
+	gs_free_error GError *error = NULL;
 	const NMConfigDataPrivate *priv;
 	char **list;
 
@@ -222,8 +224,9 @@ nm_config_data_get_plugins (const NMConfigData *self, gboolean allow_default)
 
 	priv = NM_CONFIG_DATA_GET_PRIVATE (self);
 
-	list = g_key_file_get_string_list (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "plugins", NULL, NULL);
-	if (!list && allow_default) {
+	list = g_key_file_get_string_list (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "plugins", NULL, &error);
+	if (   nm_keyfile_error_is_not_found (error)
+	    && allow_default) {
 		gs_unref_keyfile GKeyFile *kf = nm_config_create_keyfile ();
 
 		/* let keyfile split the default string according to its own escaping rules. */
diff --git a/src/nm-config.c b/src/nm-config.c
index 9a16aa0374..9cee2da702 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -15,6 +15,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile/nm-keyfile-internal.h"
+#include "nm-keyfile/nm-keyfile-utils.h"
 
 #define DEFAULT_CONFIG_MAIN_FILE        NMCONFDIR "/NetworkManager.conf"
 #define DEFAULT_CONFIG_DIR              NMCONFDIR "/conf.d"
@@ -977,7 +978,7 @@ read_config (GKeyFile *keyfile, gboolean is_base_config,
 			gsize key_len;
 
 			key = keys[k];
-			g_assert (key && *key);
+			nm_assert (key && *key);
 
 			if (   _HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)
 			    || _HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_SET)) {
@@ -996,6 +997,7 @@ read_config (GKeyFile *keyfile, gboolean is_base_config,
 			    && (last_char == '+' || last_char == '-')) {
 				gs_free char *base_key = g_strndup (key, key_len - 1);
 				gboolean is_string_list;
+				gboolean old_val_was_set = FALSE;
 
 				is_string_list = _setting_is_string_list (group, base_key);
 
@@ -1007,13 +1009,19 @@ read_config (GKeyFile *keyfile, gboolean is_base_config,
 					gs_free char **new_val = NULL;
 
 					if (is_string_list) {
-						old_val = g_key_file_get_string_list (keyfile, group, base_key, NULL, NULL);
+						gs_free_error GError *old_error = NULL;
+
+						old_val = g_key_file_get_string_list (keyfile, group, base_key, NULL, &old_error);
 						new_val = g_key_file_get_string_list (kf, group, key, NULL, NULL);
-						if (!old_val && !g_key_file_has_key (keyfile, group, base_key, NULL)) {
-							/* we must fill the unspecified value with the compile-time default. */
-							if (nm_streq (group, NM_CONFIG_KEYFILE_GROUP_MAIN) && nm_streq (base_key, "plugins")) {
+						if (   nm_streq (group, NM_CONFIG_KEYFILE_GROUP_MAIN)
+						    && nm_streq (base_key, "plugins")) {
+							old_val_was_set = !nm_keyfile_error_is_not_found (old_error);
+							if (   !old_val
+							    && !old_val_was_set) {
+								/* we must fill the unspecified value with the compile-time default. */
 								g_key_file_set_value (keyfile, group, base_key, NM_CONFIG_DEFAULT_MAIN_PLUGINS);
 								old_val = g_key_file_get_string_list (keyfile, group, base_key, NULL, NULL);
+								old_val_was_set = TRUE;
 							}
 						}
 					} else {
@@ -1059,7 +1067,7 @@ read_config (GKeyFile *keyfile, gboolean is_base_config,
 							g_key_file_set_value (keyfile, group, base_key, specs_joined);
 						}
 					} else {
-						if (is_string_list)
+						if (is_string_list && !old_val_was_set)
 							g_key_file_remove_key (keyfile, group, base_key, NULL);
 						else
 							g_key_file_set_value (keyfile, group, base_key, "");

From 3201b0692582d1df587752a8b101e70307da8850 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 09:02:48 +0200
Subject: [PATCH 182/222] config: use cleanup attribute in read_config()

---
 src/nm-config.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/nm-config.c b/src/nm-config.c
index 9cee2da702..31ce8de990 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -903,15 +903,20 @@ check_config_key (const char *group, const char *key)
 }
 
 static gboolean
-read_config (GKeyFile *keyfile, gboolean is_base_config,
-             const char *dirname, const char *path,
-             GPtrArray *warnings, GError **error)
+read_config (GKeyFile *keyfile,
+             gboolean is_base_config,
+             const char *dirname,
+             const char *path,
+             GPtrArray *warnings,
+             GError **error)
 {
-	GKeyFile *kf;
-	char **groups, **keys;
-	gsize ngroups, nkeys;
-	int g, k;
+	gs_unref_keyfile GKeyFile *kf = NULL;
+	gs_strfreev char **groups = NULL;
 	gs_free char *path_free = NULL;
+	gsize ngroups;
+	gsize nkeys;
+	int g;
+	int k;
 
 	g_return_val_if_fail (keyfile, FALSE);
 	g_return_val_if_fail (path, FALSE);
@@ -932,14 +937,11 @@ read_config (GKeyFile *keyfile, gboolean is_base_config,
 	kf = nm_config_create_keyfile ();
 	if (!g_key_file_load_from_file (kf, path, G_KEY_FILE_NONE, error)) {
 		g_prefix_error (error, "%s: ", path);
-		g_key_file_free (kf);
 		return FALSE;
 	}
 
-	if (ignore_config_snippet (kf, is_base_config)) {
-		g_key_file_free (kf);
+	if (ignore_config_snippet (kf, is_base_config))
 		return TRUE;
-	}
 
 	/* the config-group is internal to every configuration snippets. It doesn't make sense
 	 * to merge it into the global configuration, and it doesn't make sense to preserve the
@@ -963,6 +965,7 @@ read_config (GKeyFile *keyfile, gboolean is_base_config,
 
 	for (g = 0; groups && groups[g]; g++) {
 		const char *group = groups[g];
+		gs_strfreev char **keys = NULL;
 
 		if (g_str_has_prefix (group, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN)) {
 			/* internal groups cannot be set by user configuration. */
@@ -972,8 +975,8 @@ read_config (GKeyFile *keyfile, gboolean is_base_config,
 		if (!keys)
 			continue;
 		for (k = 0; keys[k]; k++) {
+			gs_free char *new_value = NULL;
 			const char *key;
-			char *new_value;
 			char last_char;
 			gsize key_len;
 
@@ -1087,12 +1090,8 @@ read_config (GKeyFile *keyfile, gboolean is_base_config,
 				                 g_strdup_printf ("unknown key '%s' in section [%s] of file '%s'",
 				                                  key, group, path));
 			}
-			g_free (new_value);
 		}
-		g_strfreev (keys);
 	}
-	g_strfreev (groups);
-	g_key_file_free (kf);
 
 	return TRUE;
 }

From ff321e250edccbf84b6eeeb87e98b4b4a09a983d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 May 2020 08:23:18 +0200
Subject: [PATCH 183/222] config: use NM_STR_HAS_PREFIX_WITH_MORE() instead of
 duplicate implementation

---
 src/nm-config-data.c | 12 ++----------
 src/nm-config.c      | 24 ++++++++----------------
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/nm-config-data.c b/src/nm-config-data.c
index 4d85bebf2e..4169a36ea4 100644
--- a/src/nm-config-data.c
+++ b/src/nm-config-data.c
@@ -117,14 +117,6 @@ G_DEFINE_TYPE (NMConfigData, nm_config_data, G_TYPE_OBJECT)
 
 /*****************************************************************************/
 
-#define _HAS_PREFIX(str, prefix) \
-	({ \
-		const char *_str = (str); \
-		g_str_has_prefix ( _str, ""prefix"") && _str[NM_STRLEN(prefix)] != '\0'; \
-	})
-
-/*****************************************************************************/
-
 const char *
 nm_config_data_get_config_main_file (const NMConfigData *self)
 {
@@ -553,14 +545,14 @@ _merge_keyfiles (GKeyFile *keyfile_user, GKeyFile *keyfile_intern)
 				continue;
 
 			if (   !is_intern && !is_atomic
-			    && _HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)) {
+			    && NM_STR_HAS_PREFIX_WITH_MORE (key, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)) {
 				const char *key_base = &key[NM_STRLEN (NM_CONFIG_KEYFILE_KEYPREFIX_WAS)];
 
 				if (!g_key_file_has_key (keyfile_intern, group, key_base, NULL))
 					g_key_file_remove_key (keyfile, group, key_base, NULL);
 				continue;
 			}
-			if (!is_intern && !is_atomic && _HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_SET))
+			if (!is_intern && !is_atomic && NM_STR_HAS_PREFIX_WITH_MORE (key, NM_CONFIG_KEYFILE_KEYPREFIX_SET))
 				continue;
 
 			value = g_key_file_get_value (keyfile_intern, group, key, NULL);
diff --git a/src/nm-config.c b/src/nm-config.c
index 31ce8de990..d553d1b5e3 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -145,14 +145,6 @@ static void _set_config_data (NMConfig *self, NMConfigData *new_data, NMConfigCh
 
 /*****************************************************************************/
 
-#define _HAS_PREFIX(str, prefix) \
-	({ \
-		const char *_str = (str); \
-		g_str_has_prefix ( _str, ""prefix"") && _str[NM_STRLEN(prefix)] != '\0'; \
-	})
-
-/*****************************************************************************/
-
 int
 nm_config_parse_boolean (const char *str,
                          int default_value)
@@ -983,8 +975,8 @@ read_config (GKeyFile *keyfile,
 			key = keys[k];
 			nm_assert (key && *key);
 
-			if (   _HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)
-			    || _HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_SET)) {
+			if (   NM_STR_HAS_PREFIX_WITH_MORE (key, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)
+			    || NM_STR_HAS_PREFIX_WITH_MORE (key, NM_CONFIG_KEYFILE_KEYPREFIX_SET)) {
 				/* these keys are protected. We ignore them if the user sets them. */
 				continue;
 			}
@@ -1520,7 +1512,7 @@ intern_config_read (const char *filename,
 				if (strcmp (key, NM_CONFIG_KEYFILE_KEY_ATOMIC_SECTION_WAS) == 0)
 					continue;
 				g_key_file_set_value (keyfile_intern, group, key, value_set);
-			} else if (_HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_SET)) {
+			} else if (NM_STR_HAS_PREFIX_WITH_MORE (key, NM_CONFIG_KEYFILE_KEYPREFIX_SET)) {
 				const char *key_base = &key[NM_STRLEN (NM_CONFIG_KEYFILE_KEYPREFIX_SET)];
 				gs_free char *value_was = NULL;
 				gs_free char *value_conf = NULL;
@@ -1540,7 +1532,7 @@ intern_config_read (const char *filename,
 				}
 				has_intern = TRUE;
 				g_key_file_set_value (keyfile_intern, group, key_base, value_set);
-			} else if (_HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)) {
+			} else if (NM_STR_HAS_PREFIX_WITH_MORE (key, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)) {
 				const char *key_base = &key[NM_STRLEN (NM_CONFIG_KEYFILE_KEYPREFIX_WAS)];
 				gs_free char *key_set = g_strdup_printf (NM_CONFIG_KEYFILE_KEYPREFIX_SET"%s", key_base);
 				gs_free char *value_was = NULL;
@@ -1714,16 +1706,16 @@ intern_config_write (const char *filename,
 			else {
 				gs_free char *value_was = NULL;
 
-				if (_HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_SET)) {
+				if (NM_STR_HAS_PREFIX_WITH_MORE (key, NM_CONFIG_KEYFILE_KEYPREFIX_SET)) {
 					/* Setting a key with .set prefix has no meaning, as these keys
 					 * are protected. Just set the value you want to set instead.
 					 * Why did this happen?? */
 					g_warn_if_reached ();
-				} else if (_HAS_PREFIX (key, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)) {
+				} else if (NM_STR_HAS_PREFIX_WITH_MORE (key, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)) {
 					const char *key_base = &key[NM_STRLEN (NM_CONFIG_KEYFILE_KEYPREFIX_WAS)];
 
-					if (   _HAS_PREFIX (key_base, NM_CONFIG_KEYFILE_KEYPREFIX_SET)
-					    || _HAS_PREFIX (key_base, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)) {
+					if (   NM_STR_HAS_PREFIX_WITH_MORE (key_base, NM_CONFIG_KEYFILE_KEYPREFIX_SET)
+					    || NM_STR_HAS_PREFIX_WITH_MORE (key_base, NM_CONFIG_KEYFILE_KEYPREFIX_WAS)) {
 						g_warn_if_reached ();
 						continue;
 					}

From 9ea7bf0da7fb889f4262576aa02d953f83775412 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 08:51:50 +0200
Subject: [PATCH 184/222] config: use nm_streq() and NM_STR_HAS_PREFIX() in
 "nm-config.c"

- nm_streq() is easier to read.

- NM_STR_HAS_PREFIX() works only with string literals, and gets
  inlined up to one strncmp() call. There is no need to call glib,
  to determine strlen(prefix) (that we already know), and then to
  call strncmp().
---
 src/nm-config.c | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/nm-config.c b/src/nm-config.c
index d553d1b5e3..17bed7fa9b 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -541,7 +541,7 @@ string_to_configure_and_quit (const char *value, GError **error)
 	if (value == NULL)
 		return NM_CONFIG_CONFIGURE_AND_QUIT_DISABLED;
 
-	if (strcmp (value, "initrd") == 0)
+	if (nm_streq (value, "initrd"))
 		return NM_CONFIG_CONFIGURE_AND_QUIT_INITRD;
 
 	ret = nm_config_parse_boolean (value, NM_CONFIG_CONFIGURE_AND_QUIT_INVALID);
@@ -664,8 +664,8 @@ _sort_groups_cmp (const char **pa, const char **pb, gpointer dummy)
 	a = *pa;
 	b = *pb;
 
-	a_is_connection = g_str_has_prefix (a, NM_CONFIG_KEYFILE_GROUPPREFIX_CONNECTION);
-	b_is_connection = g_str_has_prefix (b, NM_CONFIG_KEYFILE_GROUPPREFIX_CONNECTION);
+	a_is_connection = NM_STR_HAS_PREFIX (a, NM_CONFIG_KEYFILE_GROUPPREFIX_CONNECTION);
+	b_is_connection = NM_STR_HAS_PREFIX (b, NM_CONFIG_KEYFILE_GROUPPREFIX_CONNECTION);
 
 	if (a_is_connection != b_is_connection) {
 		/* one is a [connection*] entry, the other not. We sort [connection*] entries
@@ -682,8 +682,8 @@ _sort_groups_cmp (const char **pa, const char **pb, gpointer dummy)
 		return pa > pb ? -1 : 1;
 	}
 
-	a_is_device = g_str_has_prefix (a, NM_CONFIG_KEYFILE_GROUPPREFIX_DEVICE);
-	b_is_device = g_str_has_prefix (b, NM_CONFIG_KEYFILE_GROUPPREFIX_DEVICE);
+	a_is_device = NM_STR_HAS_PREFIX (a, NM_CONFIG_KEYFILE_GROUPPREFIX_DEVICE);
+	b_is_device = NM_STR_HAS_PREFIX (b, NM_CONFIG_KEYFILE_GROUPPREFIX_DEVICE);
 
 	if (a_is_device != b_is_device) {
 		/* one is a [device*] entry, the other not. We sort [device*] entries
@@ -719,13 +719,13 @@ _nm_config_sort_groups (char **groups, gsize ngroups)
 static gboolean
 _setting_is_device_spec (const char *group, const char *key)
 {
-#define _IS(group_v, key_v) (strcmp (group, (""group_v)) == 0 && strcmp (key, (""key_v)) == 0)
+#define _IS(group_v, key_v) (nm_streq (group, ""group_v"") && nm_streq (key, ""key_v""))
 	return    _IS (NM_CONFIG_KEYFILE_GROUP_MAIN, NM_CONFIG_KEYFILE_KEY_MAIN_NO_AUTO_DEFAULT)
 	       || _IS (NM_CONFIG_KEYFILE_GROUP_MAIN, NM_CONFIG_KEYFILE_KEY_MAIN_IGNORE_CARRIER)
 	       || _IS (NM_CONFIG_KEYFILE_GROUP_MAIN, NM_CONFIG_KEYFILE_KEY_MAIN_ASSUME_IPV6LL_ONLY)
 	       || _IS (NM_CONFIG_KEYFILE_GROUP_KEYFILE, NM_CONFIG_KEYFILE_KEY_KEYFILE_UNMANAGED_DEVICES)
-	       || (g_str_has_prefix (group, NM_CONFIG_KEYFILE_GROUPPREFIX_CONNECTION) && !strcmp (key, NM_CONFIG_KEYFILE_KEY_MATCH_DEVICE))
-	       || (g_str_has_prefix (group, NM_CONFIG_KEYFILE_GROUPPREFIX_DEVICE    ) && !strcmp (key, NM_CONFIG_KEYFILE_KEY_MATCH_DEVICE));
+	       || (NM_STR_HAS_PREFIX (group, NM_CONFIG_KEYFILE_GROUPPREFIX_CONNECTION) && nm_streq (key, NM_CONFIG_KEYFILE_KEY_MATCH_DEVICE))
+	       || (NM_STR_HAS_PREFIX (group, NM_CONFIG_KEYFILE_GROUPPREFIX_DEVICE    ) && nm_streq (key, NM_CONFIG_KEYFILE_KEY_MATCH_DEVICE));
 }
 
 static gboolean
@@ -734,7 +734,7 @@ _setting_is_string_list (const char *group, const char *key)
 	return    _IS (NM_CONFIG_KEYFILE_GROUP_MAIN, NM_CONFIG_KEYFILE_KEY_MAIN_PLUGINS)
 	       || _IS (NM_CONFIG_KEYFILE_GROUP_MAIN, NM_CONFIG_KEYFILE_KEY_MAIN_DEBUG)
 	       || _IS (NM_CONFIG_KEYFILE_GROUP_LOGGING, NM_CONFIG_KEYFILE_KEY_LOGGING_DOMAINS)
-	       || g_str_has_prefix (group, NM_CONFIG_KEYFILE_GROUPPREFIX_TEST_APPEND_STRINGLIST);
+	       || NM_STR_HAS_PREFIX (group, NM_CONFIG_KEYFILE_GROUPPREFIX_TEST_APPEND_STRINGLIST);
 #undef _IS
 }
 
@@ -959,7 +959,7 @@ read_config (GKeyFile *keyfile,
 		const char *group = groups[g];
 		gs_strfreev char **keys = NULL;
 
-		if (g_str_has_prefix (group, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN)) {
+		if (NM_STR_HAS_PREFIX (group, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN)) {
 			/* internal groups cannot be set by user configuration. */
 			continue;
 		}
@@ -981,7 +981,7 @@ read_config (GKeyFile *keyfile,
 				continue;
 			}
 
-			if (!strcmp (key, NM_CONFIG_KEYFILE_KEY_ATOMIC_SECTION_WAS)) {
+			if (nm_streq (key, NM_CONFIG_KEYFILE_KEY_ATOMIC_SECTION_WAS)) {
 				/* the "was" key is protected and it cannot be set by user configuration. */
 				continue;
 			}
@@ -1173,7 +1173,7 @@ _get_config_dir_files (const char *config_dir)
 	if (direnum) {
 		while ((info = g_file_enumerator_next_file (direnum, NULL, NULL))) {
 			name = g_file_info_get_name (info);
-			if (g_str_has_suffix (name, ".conf"))
+			if (NM_STR_HAS_SUFFIX (name, ".conf"))
 				g_ptr_array_add (confs, g_strdup (name));
 			g_object_unref (info);
 		}
@@ -1471,14 +1471,14 @@ intern_config_read (const char *filename,
 		const char *group = groups[g];
 		gboolean is_intern, is_atomic;
 
-		if (!strcmp (group, NM_CONFIG_KEYFILE_GROUP_CONFIG))
+		if (nm_streq (group, NM_CONFIG_KEYFILE_GROUP_CONFIG))
 			continue;
 
 		keys = g_key_file_get_keys (keyfile, group, NULL, NULL);
 		if (!keys)
 			continue;
 
-		is_intern = g_str_has_prefix (group, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN);
+		is_intern = NM_STR_HAS_PREFIX (group, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN);
 		is_atomic = !is_intern && _is_atomic_section (atomic_section_prefixes, group);
 
 		if (is_atomic) {
@@ -1488,7 +1488,7 @@ intern_config_read (const char *filename,
 			conf_section_is = _keyfile_serialize_section (keyfile_conf, group);
 			conf_section_was = g_key_file_get_string (keyfile, group, NM_CONFIG_KEYFILE_KEY_ATOMIC_SECTION_WAS, NULL);
 
-			if (g_strcmp0 (conf_section_was, conf_section_is) != 0) {
+			if (!nm_streq0 (conf_section_was, conf_section_is)) {
 				/* the section no longer matches. Skip it entirely. */
 				needs_rewrite = TRUE;
 				continue;
@@ -1509,7 +1509,7 @@ intern_config_read (const char *filename,
 				has_intern = TRUE;
 				g_key_file_set_value (keyfile_intern, group, key, value_set);
 			} else if (is_atomic) {
-				if (strcmp (key, NM_CONFIG_KEYFILE_KEY_ATOMIC_SECTION_WAS) == 0)
+				if (nm_streq (key, NM_CONFIG_KEYFILE_KEY_ATOMIC_SECTION_WAS))
 					continue;
 				g_key_file_set_value (keyfile_intern, group, key, value_set);
 			} else if (NM_STR_HAS_PREFIX_WITH_MORE (key, NM_CONFIG_KEYFILE_KEYPREFIX_SET)) {
@@ -1522,7 +1522,7 @@ intern_config_read (const char *filename,
 					value_conf = g_key_file_get_value (keyfile_conf, group, key_base, NULL);
 				value_was = g_key_file_get_value (keyfile, group, key_was, NULL);
 
-				if (g_strcmp0 (value_conf, value_was) != 0) {
+				if (!nm_streq0 (value_conf, value_was)) {
 					/* if value_was is no longer the same as @value_conf, it means the user
 					 * changed the configuration since the last write. In this case, we
 					 * drop the value. It also means our file is out-of-date, and we should
@@ -1547,7 +1547,7 @@ intern_config_read (const char *filename,
 					value_conf = g_key_file_get_value (keyfile_conf, group, key_base, NULL);
 				value_was = g_key_file_get_value (keyfile, group, key, NULL);
 
-				if (g_strcmp0 (value_conf, value_was) != 0) {
+				if (!nm_streq0 (value_conf, value_was)) {
 					/* if value_was is no longer the same as @value_conf, it means the user
 					 * changed the configuration since the last write. In this case, we
 					 * don't overwrite the user-provided value. It also means our file is
@@ -1576,7 +1576,7 @@ out:
 		if (g_key_file_remove_group (keyfile_intern, NM_CONFIG_KEYFILE_GROUP_INTERN_GLOBAL_DNS, NULL))
 			needs_rewrite = TRUE;
 		for (g = 0; groups && groups[g]; g++) {
-			if (   g_str_has_prefix (groups[g], NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN_GLOBAL_DNS_DOMAIN)
+			if (   NM_STR_HAS_PREFIX (groups[g], NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN_GLOBAL_DNS_DOMAIN)
 			    && groups[g][NM_STRLEN (NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN_GLOBAL_DNS_DOMAIN)]) {
 				g_key_file_remove_group (keyfile_intern, groups[g], NULL);
 				needs_rewrite = TRUE;
@@ -1605,8 +1605,8 @@ _intern_config_write_sort_fcn (const char **a, const char **b, const char *const
 	const char *g_b = (b ? *b : NULL);
 	gboolean a_is, b_is;
 
-	a_is = g_str_has_prefix (g_a, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN);
-	b_is = g_str_has_prefix (g_b, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN);
+	a_is = NM_STR_HAS_PREFIX (g_a, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN);
+	b_is = NM_STR_HAS_PREFIX (g_b, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN);
 
 	if (a_is != b_is) {
 		if (a_is)
@@ -1667,7 +1667,7 @@ intern_config_write (const char *filename,
 		if (!keys)
 			continue;
 
-		is_intern = g_str_has_prefix (group, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN);
+		is_intern = NM_STR_HAS_PREFIX (group, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN);
 		is_atomic = !is_intern && _is_atomic_section (atomic_section_prefixes, group);
 
 		if (is_atomic) {
@@ -1734,7 +1734,7 @@ intern_config_write (const char *filename,
 				} else {
 					if (keyfile_conf) {
 						value_was = g_key_file_get_value (keyfile_conf, group, key, NULL);
-						if (g_strcmp0 (value_set, value_was) == 0) {
+						if (nm_streq0 (value_set, value_was)) {
 							/* there is no point in storing the identical value as we have via
 							 * user configuration. Skip it. */
 							continue;
@@ -1836,7 +1836,7 @@ nm_config_set_global_dns (NMConfig *self, NMGlobalDnsConfig *global_dns, GError
 	g_key_file_remove_group (keyfile, NM_CONFIG_KEYFILE_GROUP_INTERN_GLOBAL_DNS, NULL);
 	groups = g_key_file_get_groups (keyfile, NULL);
 	for (i = 0; groups[i]; i++) {
-		if (g_str_has_prefix (groups[i], NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN_GLOBAL_DNS_DOMAIN))
+		if (NM_STR_HAS_PREFIX (groups[i], NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN_GLOBAL_DNS_DOMAIN))
 			g_key_file_remove_group (keyfile, groups[i], NULL);
 	}
 	g_strfreev (groups);

From 85fa23a6b599a6bbed55d85ac4c61ab9318908ba Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 09:26:58 +0200
Subject: [PATCH 185/222] config: minor cleanup in _sort_groups_cmp() and
 _intern_config_write_sort_fcn()

---
 src/nm-config.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/nm-config.c b/src/nm-config.c
index 17bed7fa9b..d638059588 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -657,13 +657,11 @@ ignore_config_snippet (GKeyFile *keyfile, gboolean is_base_config)
 static int
 _sort_groups_cmp (const char **pa, const char **pb, gpointer dummy)
 {
-	const char *a, *b;
+	const char *a = *pa;
+	const char *b = *pb;
 	gboolean a_is_connection, b_is_connection;
 	gboolean a_is_device, b_is_device;
 
-	a = *pa;
-	b = *pb;
-
 	a_is_connection = NM_STR_HAS_PREFIX (a, NM_CONFIG_KEYFILE_GROUPPREFIX_CONNECTION);
 	b_is_connection = NM_STR_HAS_PREFIX (b, NM_CONFIG_KEYFILE_GROUPPREFIX_CONNECTION);
 
@@ -1601,8 +1599,8 @@ out:
 static int
 _intern_config_write_sort_fcn (const char **a, const char **b, const char *const*atomic_section_prefixes)
 {
-	const char *g_a = (a ? *a : NULL);
-	const char *g_b = (b ? *b : NULL);
+	const char *g_a = *a;
+	const char *g_b = *b;
 	gboolean a_is, b_is;
 
 	a_is = NM_STR_HAS_PREFIX (g_a, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN);

From 6e9967939b5b7dd6a49405d4d6018a528414ca4d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 8 May 2020 07:43:27 +0200
Subject: [PATCH 186/222] acd: fix char buffer argument to
 _acd_event_to_string_buf()

---
 src/devices/nm-acd-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/devices/nm-acd-manager.c b/src/devices/nm-acd-manager.c
index d9caadc6b6..1c6c42a0ea 100644
--- a/src/devices/nm-acd-manager.c
+++ b/src/devices/nm-acd-manager.c
@@ -84,7 +84,7 @@ _acd_event_to_string (unsigned int event)
 #define ACD_EVENT_TO_STRING_BUF_SIZE 50
 
 static const char *
-_acd_event_to_string_buf (unsigned event, char buffer[ACD_EVENT_TO_STRING_BUF_SIZE])
+_acd_event_to_string_buf (unsigned event, char buffer[static ACD_EVENT_TO_STRING_BUF_SIZE])
 {
 	const char *s;
 

From a0b295590754b800d2b6a0e55e72425ca1bd24b0 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 4 May 2020 18:09:32 +0200
Subject: [PATCH 187/222] shared: add NM_ENSURE_NOT_NULL() macro

---
 shared/nm-glib-aux/nm-macros-internal.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h
index 8c0aa21820..637d62bb5d 100644
--- a/shared/nm-glib-aux/nm-macros-internal.h
+++ b/shared/nm-glib-aux/nm-macros-internal.h
@@ -630,6 +630,14 @@ NM_G_ERROR_MSG (GError *error)
 		NM_CONSTCAST_FULL (type, (obj), _obj, GObject, ##__VA_ARGS__); \
 	})
 
+#define NM_ENSURE_NOT_NULL(ptr) \
+	({ \
+		typeof (ptr) _ptr = (ptr); \
+		\
+		nm_assert (_ptr != NULL); \
+		_ptr; \
+	})
+
 #if _NM_CC_SUPPORT_GENERIC
 /* returns @value, if the type of @value matches @type.
  * This requires support for C11 _Generic(). If no support is

From 0b2ecf5e35801ef89129040119e404d0eaeb856e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 4 May 2020 18:05:56 +0200
Subject: [PATCH 188/222] shared: add NM_G_PARAM_SPEC_GET_DEFAULT_*() helper
 macros

---
 shared/nm-glib-aux/nm-shared-utils.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index fafaefc45d..fb9e3ac903 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -1158,6 +1158,25 @@ GParamSpec *nm_g_object_class_find_property_from_gtype (GType gtype,
 
 /*****************************************************************************/
 
+#define _NM_G_PARAM_SPEC_CAST(param_spec, _value_type, _c_type) \
+	({ \
+		const GParamSpec *const _param_spec = (param_spec); \
+		\
+		nm_assert (   !_param_spec \
+		           || _param_spec->value_type == (_value_type)); \
+		((const _c_type *) _param_spec); \
+	})
+
+#define NM_G_PARAM_SPEC_CAST_BOOLEAN(param_spec) _NM_G_PARAM_SPEC_CAST (param_spec, G_TYPE_BOOLEAN, GParamSpecBoolean)
+#define NM_G_PARAM_SPEC_CAST_UINT(param_spec)    _NM_G_PARAM_SPEC_CAST (param_spec, G_TYPE_UINT,    GParamSpecUInt)
+#define NM_G_PARAM_SPEC_CAST_UINT64(param_spec)  _NM_G_PARAM_SPEC_CAST (param_spec, G_TYPE_UINT64,  GParamSpecUInt64)
+
+#define NM_G_PARAM_SPEC_GET_DEFAULT_BOOLEAN(param_spec) (NM_G_PARAM_SPEC_CAST_BOOLEAN (NM_ENSURE_NOT_NULL (param_spec))->default_value)
+#define NM_G_PARAM_SPEC_GET_DEFAULT_UINT(param_spec)    (NM_G_PARAM_SPEC_CAST_UINT    (NM_ENSURE_NOT_NULL (param_spec))->default_value)
+#define NM_G_PARAM_SPEC_GET_DEFAULT_UINT64(param_spec)  (NM_G_PARAM_SPEC_CAST_UINT64  (NM_ENSURE_NOT_NULL (param_spec))->default_value)
+
+/*****************************************************************************/
+
 GType nm_g_type_find_implementing_class_for_property (GType gtype,
                                                       const char *pname);
 

From 83830badda2fc6ce2e4fd779c836dae7a33d43b2 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 29 Apr 2020 20:40:00 +0200
Subject: [PATCH 189/222] device: use NM_G_PARAM_SPEC_GET_DEFAULT_*() in
 NMDeviceBridge's commit_option()

---
 src/devices/nm-device-bridge.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 4ca3b5b043..05d7c8fcc5 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -398,15 +398,12 @@ commit_option (NMDevice *device, NMSetting *setting, const Option *option, gbool
 			/* zero means "unspecified" for some NM properties but isn't in the
 			 * allowed kernel range, so reset the property to the default value.
 			 */
-			if (option->default_if_zero && uval == 0) {
-				g_value_unset (&val);
-				g_value_init (&val, G_PARAM_SPEC_VALUE_TYPE (pspec));
-				g_param_value_set_default (pspec, &val);
-
+			if (   option->default_if_zero
+			    && uval == 0) {
 				if (pspec->value_type == G_TYPE_UINT64)
-					uval = g_value_get_uint64 (&val);
+					uval = NM_G_PARAM_SPEC_GET_DEFAULT_UINT64 (pspec);
 				else
-					uval = (guint) g_value_get_uint (&val);
+					uval = NM_G_PARAM_SPEC_GET_DEFAULT_UINT (pspec);
 			}
 
 			/* Linux kernel bridge interfaces use 'centiseconds' for time-based values.

From 9996597666c7bf5a0b52e340c6943b6234dff283 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 29 Apr 2020 18:29:38 +0200
Subject: [PATCH 190/222] ifcfg: refactor GObject accessors in
 write_bridge_setting()

---
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    | 93 ++++++-------------
 1 file changed, 30 insertions(+), 63 deletions(-)

diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index f3f5647dbc..d6fd82e6bc 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1362,55 +1362,22 @@ write_team_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wired,
 	return TRUE;
 }
 
-static guint32
-get_setting_default_uint (NMSetting *setting, const char *prop)
+static gboolean
+get_setting_default_boolean (gpointer setting, const char *prop)
 {
-	GParamSpec *pspec;
-	GValue val = G_VALUE_INIT;
-	guint32 ret = 0;
+	return NM_G_PARAM_SPEC_GET_DEFAULT_BOOLEAN (g_object_class_find_property (G_OBJECT_GET_CLASS (setting), prop));
+}
 
-	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), prop);
-	g_assert (pspec);
-	g_value_init (&val, pspec->value_type);
-	g_param_value_set_default (pspec, &val);
-	g_assert (G_VALUE_HOLDS_UINT (&val));
-	ret = g_value_get_uint (&val);
-	g_value_unset (&val);
-	return ret;
+static guint
+get_setting_default_uint (gpointer setting, const char *prop)
+{
+	return NM_G_PARAM_SPEC_GET_DEFAULT_UINT (g_object_class_find_property (G_OBJECT_GET_CLASS (setting), prop));
 }
 
 static guint64
-get_setting_default_uint64 (NMSetting *setting, const char *prop)
+get_setting_default_uint64 (gpointer setting, const char *prop)
 {
-	GParamSpec *pspec;
-	GValue val = G_VALUE_INIT;
-	guint32 ret = 0;
-
-	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), prop);
-	g_assert (pspec);
-	g_value_init (&val, pspec->value_type);
-	g_param_value_set_default (pspec, &val);
-	g_assert (G_VALUE_HOLDS_UINT64 (&val));
-	ret = g_value_get_uint64 (&val);
-	g_value_unset (&val);
-	return ret;
-}
-
-static gboolean
-get_setting_default_boolean (NMSetting *setting, const char *prop)
-{
-	GParamSpec *pspec;
-	GValue val = G_VALUE_INIT;
-	gboolean ret = 0;
-
-	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), prop);
-	g_assert (pspec);
-	g_value_init (&val, pspec->value_type);
-	g_param_value_set_default (pspec, &val);
-	g_assert (G_VALUE_HOLDS_BOOLEAN (&val));
-	ret = g_value_get_boolean (&val);
-	g_value_unset (&val);
-	return ret;
+	return NM_G_PARAM_SPEC_GET_DEFAULT_UINT64 (g_object_class_find_property (G_OBJECT_GET_CLASS (setting), prop));
 }
 
 static gboolean
@@ -1478,20 +1445,20 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		svSetValueStr (ifcfg, "STP", "yes");
 
 		i = nm_setting_bridge_get_forward_delay (s_bridge);
-		if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_FORWARD_DELAY))
+		if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_FORWARD_DELAY))
 			svSetValueInt64 (ifcfg, "DELAY", i);
 
 		g_string_append_printf (opts, "priority=%u", nm_setting_bridge_get_priority (s_bridge));
 
 		i = nm_setting_bridge_get_hello_time (s_bridge);
-		if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_HELLO_TIME)) {
+		if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_HELLO_TIME)) {
 			if (opts->len)
 				g_string_append_c (opts, ' ');
 			g_string_append_printf (opts, "hello_time=%u", i);
 		}
 
 		i = nm_setting_bridge_get_max_age (s_bridge);
-		if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MAX_AGE)) {
+		if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MAX_AGE)) {
 			if (opts->len)
 				g_string_append_c (opts, ' ');
 			g_string_append_printf (opts, "max_age=%u", i);
@@ -1499,7 +1466,7 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 	}
 
 	i = nm_setting_bridge_get_ageing_time (s_bridge);
-	if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_AGEING_TIME)) {
+	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_AGEING_TIME)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "ageing_time=%u", i);
@@ -1513,7 +1480,7 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 	}
 
 	i = nm_setting_bridge_get_group_forward_mask (s_bridge);
-	if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_GROUP_FORWARD_MASK)) {
+	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_GROUP_FORWARD_MASK)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "group_fwd_mask=%u", i);
@@ -1521,84 +1488,84 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 
 
 	i = nm_setting_bridge_get_multicast_hash_max (s_bridge);
-	if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_HASH_MAX)) {
+	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_HASH_MAX)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "multicast_hash_max=%u", i);
 	}
 
 	i = nm_setting_bridge_get_multicast_last_member_count (s_bridge);
-	if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT)) {
+	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "multicast_last_member_count=%u", i);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_last_member_interval (s_bridge);
-	if (u64 != get_setting_default_uint64 (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL)) {
+	if (u64 != get_setting_default_uint64 (s_bridge, NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "multicast_last_member_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_membership_interval (s_bridge);
-	if (u64 != get_setting_default_uint64 (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL)) {
+	if (u64 != get_setting_default_uint64 (s_bridge, NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "multicast_membership_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
 	b = nm_setting_bridge_get_multicast_querier (s_bridge);
-	if (b != get_setting_default_boolean (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERIER)) {
+	if (b != get_setting_default_boolean (s_bridge, NM_SETTING_BRIDGE_MULTICAST_QUERIER)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "multicast_querier=%u", (guint) b);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_querier_interval (s_bridge);
-	if (u64 != get_setting_default_uint64 (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL)) {
+	if (u64 != get_setting_default_uint64 (s_bridge, NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "multicast_querier_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_query_interval (s_bridge);
-	if (u64 != get_setting_default_uint64 (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL)) {
+	if (u64 != get_setting_default_uint64 (s_bridge, NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "multicast_query_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_query_response_interval (s_bridge);
-	if (u64 != get_setting_default_uint64 (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL)) {
+	if (u64 != get_setting_default_uint64 (s_bridge, NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "multicast_query_response_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
 	b = nm_setting_bridge_get_multicast_query_use_ifaddr (s_bridge);
-	if (b != get_setting_default_boolean (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR)) {
+	if (b != get_setting_default_boolean (s_bridge, NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "multicast_query_use_ifaddr=%u", (guint) b);
 	}
 
 	b = nm_setting_bridge_get_multicast_snooping (s_bridge);
-	if (b != get_setting_default_boolean (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_SNOOPING)) {
+	if (b != get_setting_default_boolean (s_bridge, NM_SETTING_BRIDGE_MULTICAST_SNOOPING)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "multicast_snooping=%u", (guint32) b);
 	}
 
 	i = nm_setting_bridge_get_multicast_startup_query_count (s_bridge);
-	if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT)) {
+	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "multicast_startup_query_count=%u", i);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_startup_query_interval (s_bridge);
-	if (u64 != get_setting_default_uint64 (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL)) {
+	if (u64 != get_setting_default_uint64 (s_bridge, NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "multicast_startup_query_interval=%"G_GUINT64_FORMAT, u64);
@@ -1612,14 +1579,14 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 	}
 
 	b = nm_setting_bridge_get_vlan_filtering (s_bridge);
-	if (b != get_setting_default_boolean (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_VLAN_FILTERING)) {
+	if (b != get_setting_default_boolean (s_bridge, NM_SETTING_BRIDGE_VLAN_FILTERING)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "vlan_filtering=%u", (guint32) b);
 	}
 
 	i = nm_setting_bridge_get_vlan_default_pvid (s_bridge);
-	if (i != get_setting_default_uint (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID)) {
+	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "default_pvid=%u", i);
@@ -1633,7 +1600,7 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 	}
 
 	b = nm_setting_bridge_get_vlan_stats_enabled (s_bridge);
-	if (b != get_setting_default_boolean (NM_SETTING (s_bridge), NM_SETTING_BRIDGE_VLAN_STATS_ENABLED)) {
+	if (b != get_setting_default_boolean (s_bridge, NM_SETTING_BRIDGE_VLAN_STATS_ENABLED)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
 		g_string_append_printf (opts, "vlan_stats_enabled=%u", (guint) b);

From 4338cf3800848b0450a47f9788f1c4f23a23142e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 14:44:57 +0200
Subject: [PATCH 191/222] ifcfg-rh/trivial: rename variable i in
 write_bridge_*setting() to indicate integer type

---
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index d6fd82e6bc..b9f8161b9c 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1420,7 +1420,7 @@ static gboolean
 write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wired, GError **error)
 {
 	NMSettingBridge *s_bridge;
-	guint32 i;
+	guint32 u32;
 	guint64 u64;
 	gboolean b;
 	const char *s;
@@ -1444,32 +1444,32 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 	if (nm_setting_bridge_get_stp (s_bridge)) {
 		svSetValueStr (ifcfg, "STP", "yes");
 
-		i = nm_setting_bridge_get_forward_delay (s_bridge);
-		if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_FORWARD_DELAY))
-			svSetValueInt64 (ifcfg, "DELAY", i);
+		u32 = nm_setting_bridge_get_forward_delay (s_bridge);
+		if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_FORWARD_DELAY))
+			svSetValueInt64 (ifcfg, "DELAY", u32);
 
 		g_string_append_printf (opts, "priority=%u", nm_setting_bridge_get_priority (s_bridge));
 
-		i = nm_setting_bridge_get_hello_time (s_bridge);
-		if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_HELLO_TIME)) {
+		u32 = nm_setting_bridge_get_hello_time (s_bridge);
+		if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_HELLO_TIME)) {
 			if (opts->len)
 				g_string_append_c (opts, ' ');
-			g_string_append_printf (opts, "hello_time=%u", i);
+			g_string_append_printf (opts, "hello_time=%u", u32);
 		}
 
-		i = nm_setting_bridge_get_max_age (s_bridge);
-		if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MAX_AGE)) {
+		u32 = nm_setting_bridge_get_max_age (s_bridge);
+		if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MAX_AGE)) {
 			if (opts->len)
 				g_string_append_c (opts, ' ');
-			g_string_append_printf (opts, "max_age=%u", i);
+			g_string_append_printf (opts, "max_age=%u", u32);
 		}
 	}
 
-	i = nm_setting_bridge_get_ageing_time (s_bridge);
-	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_AGEING_TIME)) {
+	u32 = nm_setting_bridge_get_ageing_time (s_bridge);
+	if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_AGEING_TIME)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
-		g_string_append_printf (opts, "ageing_time=%u", i);
+		g_string_append_printf (opts, "ageing_time=%u", u32);
 	}
 
 	s = nm_setting_bridge_get_group_address (s_bridge);
@@ -1479,26 +1479,26 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "group_address=%s", s);
 	}
 
-	i = nm_setting_bridge_get_group_forward_mask (s_bridge);
-	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_GROUP_FORWARD_MASK)) {
+	u32 = nm_setting_bridge_get_group_forward_mask (s_bridge);
+	if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_GROUP_FORWARD_MASK)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
-		g_string_append_printf (opts, "group_fwd_mask=%u", i);
+		g_string_append_printf (opts, "group_fwd_mask=%u", u32);
 	}
 
 
-	i = nm_setting_bridge_get_multicast_hash_max (s_bridge);
-	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_HASH_MAX)) {
+	u32 = nm_setting_bridge_get_multicast_hash_max (s_bridge);
+	if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_HASH_MAX)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
-		g_string_append_printf (opts, "multicast_hash_max=%u", i);
+		g_string_append_printf (opts, "multicast_hash_max=%u", u32);
 	}
 
-	i = nm_setting_bridge_get_multicast_last_member_count (s_bridge);
-	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT)) {
+	u32 = nm_setting_bridge_get_multicast_last_member_count (s_bridge);
+	if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
-		g_string_append_printf (opts, "multicast_last_member_count=%u", i);
+		g_string_append_printf (opts, "multicast_last_member_count=%u", u32);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_last_member_interval (s_bridge);
@@ -1557,11 +1557,11 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "multicast_snooping=%u", (guint32) b);
 	}
 
-	i = nm_setting_bridge_get_multicast_startup_query_count (s_bridge);
-	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT)) {
+	u32 = nm_setting_bridge_get_multicast_startup_query_count (s_bridge);
+	if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
-		g_string_append_printf (opts, "multicast_startup_query_count=%u", i);
+		g_string_append_printf (opts, "multicast_startup_query_count=%u", u32);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_startup_query_interval (s_bridge);
@@ -1585,11 +1585,11 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "vlan_filtering=%u", (guint32) b);
 	}
 
-	i = nm_setting_bridge_get_vlan_default_pvid (s_bridge);
-	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID)) {
+	u32 = nm_setting_bridge_get_vlan_default_pvid (s_bridge);
+	if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
-		g_string_append_printf (opts, "default_pvid=%u", i);
+		g_string_append_printf (opts, "default_pvid=%u", u32);
 	}
 
 	s = nm_setting_bridge_get_vlan_protocol (s_bridge);
@@ -1628,7 +1628,7 @@ static gboolean
 write_bridge_port_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
 {
 	NMSettingBridgePort *s_port;
-	guint32 i;
+	guint32 u32;
 	GString *string;
 
 	s_port = nm_connection_get_setting_bridge_port (connection);
@@ -1638,15 +1638,15 @@ write_bridge_port_setting (NMConnection *connection, shvarFile *ifcfg, GError **
 	/* Bridge options */
 	string = g_string_sized_new (32);
 
-	i = nm_setting_bridge_port_get_priority (s_port);
-	if (i != get_setting_default_uint (NM_SETTING (s_port), NM_SETTING_BRIDGE_PORT_PRIORITY))
-		g_string_append_printf (string, "priority=%u", i);
+	u32 = nm_setting_bridge_port_get_priority (s_port);
+	if (u32 != get_setting_default_uint (NM_SETTING (s_port), NM_SETTING_BRIDGE_PORT_PRIORITY))
+		g_string_append_printf (string, "priority=%u", u32);
 
-	i = nm_setting_bridge_port_get_path_cost (s_port);
-	if (i != get_setting_default_uint (NM_SETTING (s_port), NM_SETTING_BRIDGE_PORT_PATH_COST)) {
+	u32 = nm_setting_bridge_port_get_path_cost (s_port);
+	if (u32 != get_setting_default_uint (NM_SETTING (s_port), NM_SETTING_BRIDGE_PORT_PATH_COST)) {
 		if (string->len)
 			g_string_append_c (string, ' ');
-		g_string_append_printf (string, "path_cost=%u", i);
+		g_string_append_printf (string, "path_cost=%u", u32);
 	}
 
 	if (nm_setting_bridge_port_get_hairpin_mode (s_port)) {

From adf377c2c0601db290ef785df4e9dce12d47f35a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 10:46:31 +0200
Subject: [PATCH 192/222] libnm: move defines for bridge defaults to
 "nm-core-internal.h" header

---
 libnm-core/nm-core-internal.h  | 21 +++++++++++++++++++++
 libnm-core/nm-setting-bridge.c | 21 ---------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index bcf3cb406b..c1f6fd5fa2 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -100,6 +100,27 @@
 #define NM_BR_MIN_MULTICAST_HASH_MAX 1
 #define NM_BR_MAX_MULTICAST_HASH_MAX G_MAXUINT32
 
+#define BRIDGE_AGEING_TIME_DEFAULT                         300
+#define BRIDGE_FORWARD_DELAY_DEFAULT                       15
+#define BRIDGE_HELLO_TIME_DEFAULT                          2
+#define BRIDGE_MAX_AGE_DEFAULT                             20
+#define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
+#define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT      100
+#define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT       26000
+#define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT          25500
+#define BRIDGE_MULTICAST_HASH_MAX_DEFAULT                  4096
+#define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
+#define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT            12500
+#define BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT   1000
+#define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
+#define BRIDGE_MULTICAST_SNOOPING_DEFAULT                  TRUE
+#define BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT       2
+#define BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT    3125
+#define BRIDGE_PRIORITY_DEFAULT                            0x8000
+#define BRIDGE_STP_DEFAULT                                 TRUE
+#define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT                   1
+#define BRIDGE_VLAN_STATS_ENABLED_DEFAULT                  FALSE
+
 /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
  * connection can be replaced by a already-defined connection. This flag only
  * takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 2b6d1ef5d5..76bffbc8f8 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -22,27 +22,6 @@
  * necessary for bridging connections.
  **/
 
-#define BRIDGE_AGEING_TIME_DEFAULT                         300
-#define BRIDGE_FORWARD_DELAY_DEFAULT                       15
-#define BRIDGE_HELLO_TIME_DEFAULT                          2
-#define BRIDGE_MAX_AGE_DEFAULT                             20
-#define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
-#define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT      100
-#define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT       26000
-#define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT          25500
-#define BRIDGE_MULTICAST_HASH_MAX_DEFAULT                  4096
-#define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
-#define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT            12500
-#define BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT   1000
-#define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
-#define BRIDGE_MULTICAST_SNOOPING_DEFAULT                  TRUE
-#define BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT       2
-#define BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT    3125
-#define BRIDGE_PRIORITY_DEFAULT                            0x8000
-#define BRIDGE_STP_DEFAULT                                 TRUE
-#define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT                   1
-#define BRIDGE_VLAN_STATS_ENABLED_DEFAULT                  FALSE
-
 /*****************************************************************************/
 
 NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBridge,

From f5527ecc5a6d66a55ba78faeeb1dde02b1a92e23 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 10:49:58 +0200
Subject: [PATCH 193/222] libnm: adjust bridge defines
 NM_BRIDGE_MULTICAST_HASH_MAX_*

---
 libnm-core/nm-core-internal.h  | 6 +++---
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index c1f6fd5fa2..01321eb976 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -97,8 +97,9 @@
 #define NM_BR_PORT_MAX_PATH_COST 65535
 #define NM_BR_PORT_DEF_PATH_COST 100
 
-#define NM_BR_MIN_MULTICAST_HASH_MAX 1
-#define NM_BR_MAX_MULTICAST_HASH_MAX G_MAXUINT32
+#define NM_BRIDGE_MULTICAST_HASH_MAX_MIN 1u
+#define NM_BRIDGE_MULTICAST_HASH_MAX_DEF 4096u
+#define NM_BRIDGE_MULTICAST_HASH_MAX_MAX ((guint) G_MAXUINT32)
 
 #define BRIDGE_AGEING_TIME_DEFAULT                         300
 #define BRIDGE_FORWARD_DELAY_DEFAULT                       15
@@ -108,7 +109,6 @@
 #define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT      100
 #define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT       26000
 #define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT          25500
-#define BRIDGE_MULTICAST_HASH_MAX_DEFAULT                  4096
 #define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
 #define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT            12500
 #define BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT   1000
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 76bffbc8f8..c725376a1d 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1576,7 +1576,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->multicast_last_member_count       = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT;
 	priv->multicast_last_member_interval    = BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT;
 	priv->multicast_membership_interval     = BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT;
-	priv->multicast_hash_max                = BRIDGE_MULTICAST_HASH_MAX_DEFAULT;
+	priv->multicast_hash_max                = NM_BRIDGE_MULTICAST_HASH_MAX_DEF;
 	priv->multicast_snooping                = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
 	priv->priority                          = BRIDGE_PRIORITY_DEFAULT;
 	priv->stp                               = BRIDGE_STP_DEFAULT;
@@ -2082,7 +2082,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_HASH_MAX] =
 	    g_param_spec_uint (NM_SETTING_BRIDGE_MULTICAST_HASH_MAX, "", "",
-	                       NM_BR_MIN_MULTICAST_HASH_MAX, NM_BR_MAX_MULTICAST_HASH_MAX, BRIDGE_MULTICAST_HASH_MAX_DEFAULT,
+	                       NM_BRIDGE_MULTICAST_HASH_MAX_MIN, NM_BRIDGE_MULTICAST_HASH_MAX_MAX, NM_BRIDGE_MULTICAST_HASH_MAX_DEF,
 	                       G_PARAM_READWRITE |
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 05d7c8fcc5..487cd28f82 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -276,7 +276,7 @@ static const Option master_options[] = {
 	                                                             TRUE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,                      "hash_max",
 	                                                             NULL, NULL,
-	                                                             NM_BR_MIN_MULTICAST_HASH_MAX, NM_BR_MAX_MULTICAST_HASH_MAX, 4096,
+	                                                             NM_BRIDGE_MULTICAST_HASH_MAX_MIN, NM_BRIDGE_MULTICAST_HASH_MAX_MAX, NM_BRIDGE_MULTICAST_HASH_MAX_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,             "multicast_last_member_count",
 	                                                             NULL, NULL,

From f61e354cfa00de200fd69d3eb5c14ae812b84e9a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 10:49:58 +0200
Subject: [PATCH 194/222] libnm: adjust bridge defines NM_BRIDGE_AGEING_TIME_*

---
 libnm-core/nm-core-internal.h  | 6 +++---
 libnm-core/nm-setting-bridge.c | 8 ++++----
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 01321eb976..815510360a 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -88,8 +88,9 @@
 #define NM_BR_MAX_MAX_AGE       40
 
 /* IEEE 802.1D-1998 Table 7.4 */
-#define NM_BR_MIN_AGEING_TIME   0
-#define NM_BR_MAX_AGEING_TIME   1000000
+#define NM_BRIDGE_AGEING_TIME_MIN 0u
+#define NM_BRIDGE_AGEING_TIME_DEF 300u
+#define NM_BRIDGE_AGEING_TIME_MAX 1000000u
 
 #define NM_BR_PORT_MAX_PRIORITY 63
 #define NM_BR_PORT_DEF_PRIORITY 32
@@ -101,7 +102,6 @@
 #define NM_BRIDGE_MULTICAST_HASH_MAX_DEF 4096u
 #define NM_BRIDGE_MULTICAST_HASH_MAX_MAX ((guint) G_MAXUINT32)
 
-#define BRIDGE_AGEING_TIME_DEFAULT                         300
 #define BRIDGE_FORWARD_DELAY_DEFAULT                       15
 #define BRIDGE_HELLO_TIME_DEFAULT                          2
 #define BRIDGE_MAX_AGE_DEFAULT                             20
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index c725376a1d..7898369ebd 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1224,8 +1224,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		return FALSE;
 
 	if (!check_range (priv->ageing_time,
-	                  NM_BR_MIN_AGEING_TIME,
-	                  NM_BR_MAX_AGEING_TIME,
+	                  NM_BRIDGE_AGEING_TIME_MIN,
+	                  NM_BRIDGE_AGEING_TIME_MAX,
 	                  !priv->stp,
 	                  NM_SETTING_BRIDGE_AGEING_TIME,
 	                  error))
@@ -1569,7 +1569,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 
 	priv->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
 
-	priv->ageing_time                       = BRIDGE_AGEING_TIME_DEFAULT;
+	priv->ageing_time                       = NM_BRIDGE_AGEING_TIME_DEF;
 	priv->forward_delay                     = BRIDGE_FORWARD_DELAY_DEFAULT;
 	priv->hello_time                        = BRIDGE_HELLO_TIME_DEFAULT;
 	priv->max_age                           = BRIDGE_MAX_AGE_DEFAULT;
@@ -1786,7 +1786,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_AGEING_TIME] =
 	    g_param_spec_uint (NM_SETTING_BRIDGE_AGEING_TIME, "", "",
-	                       NM_BR_MIN_AGEING_TIME, NM_BR_MAX_AGEING_TIME, BRIDGE_AGEING_TIME_DEFAULT,
+	                       NM_BRIDGE_AGEING_TIME_MIN, NM_BRIDGE_AGEING_TIME_MAX, NM_BRIDGE_AGEING_TIME_DEF,
 	                       G_PARAM_READWRITE |
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 487cd28f82..1f71aa8395 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -268,7 +268,7 @@ static const Option master_options[] = {
 	                                                             TRUE, TRUE, TRUE },
 	{ NM_SETTING_BRIDGE_AGEING_TIME,                             "ageing_time",
 	                                                             NULL, NULL,
-	                                                             NM_BR_MIN_AGEING_TIME, NM_BR_MAX_AGEING_TIME, 300,
+	                                                             NM_BRIDGE_AGEING_TIME_MIN, NM_BRIDGE_AGEING_TIME_MAX, NM_BRIDGE_AGEING_TIME_DEF,
 	                                                             TRUE, TRUE, FALSE },
 	{ NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,                      "group_fwd_mask",
 	                                                             NULL, NULL,

From 8ee4dbf7090dc0fd4ae07abb1bd447d698abd37e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 10:49:58 +0200
Subject: [PATCH 195/222] libnm: adjust bridge defines
 NM_BRIDGE_FORWARD_DELAY_*

---
 libnm-core/nm-core-internal.h  | 6 +++---
 libnm-core/nm-setting-bridge.c | 8 ++++----
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 815510360a..1667159784 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -81,8 +81,9 @@
 #define NM_BR_MIN_HELLO_TIME    1
 #define NM_BR_MAX_HELLO_TIME    10
 
-#define NM_BR_MIN_FORWARD_DELAY 2
-#define NM_BR_MAX_FORWARD_DELAY 30
+#define NM_BRIDGE_FORWARD_DELAY_MIN 2u
+#define NM_BRIDGE_FORWARD_DELAY_DEF 15u
+#define NM_BRIDGE_FORWARD_DELAY_MAX 30u
 
 #define NM_BR_MIN_MAX_AGE       6
 #define NM_BR_MAX_MAX_AGE       40
@@ -102,7 +103,6 @@
 #define NM_BRIDGE_MULTICAST_HASH_MAX_DEF 4096u
 #define NM_BRIDGE_MULTICAST_HASH_MAX_MAX ((guint) G_MAXUINT32)
 
-#define BRIDGE_FORWARD_DELAY_DEFAULT                       15
 #define BRIDGE_HELLO_TIME_DEFAULT                          2
 #define BRIDGE_MAX_AGE_DEFAULT                             20
 #define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 7898369ebd..1302eb9985 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1200,8 +1200,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	}
 
 	if (!check_range (priv->forward_delay,
-	                  NM_BR_MIN_FORWARD_DELAY,
-	                  NM_BR_MAX_FORWARD_DELAY,
+	                  NM_BRIDGE_FORWARD_DELAY_MIN,
+	                  NM_BRIDGE_FORWARD_DELAY_MAX,
 	                  !priv->stp,
 	                  NM_SETTING_BRIDGE_FORWARD_DELAY,
 	                  error))
@@ -1570,7 +1570,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
 
 	priv->ageing_time                       = NM_BRIDGE_AGEING_TIME_DEF;
-	priv->forward_delay                     = BRIDGE_FORWARD_DELAY_DEFAULT;
+	priv->forward_delay                     = NM_BRIDGE_FORWARD_DELAY_DEF;
 	priv->hello_time                        = BRIDGE_HELLO_TIME_DEFAULT;
 	priv->max_age                           = BRIDGE_MAX_AGE_DEFAULT;
 	priv->multicast_last_member_count       = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT;
@@ -1726,7 +1726,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_FORWARD_DELAY] =
 	    g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY, "", "",
-	                       0, NM_BR_MAX_FORWARD_DELAY, BRIDGE_FORWARD_DELAY_DEFAULT,
+	                       0, NM_BRIDGE_FORWARD_DELAY_MAX, NM_BRIDGE_FORWARD_DELAY_DEF,
 	                       G_PARAM_READWRITE |
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 1f71aa8395..23a373d3aa 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -256,7 +256,7 @@ static const Option master_options[] = {
 	                                                             TRUE, FALSE, TRUE },
 	{ NM_SETTING_BRIDGE_FORWARD_DELAY,                           "forward_delay",
 	                                                             NULL, NULL,
-	                                                             0, NM_BR_MAX_FORWARD_DELAY, 15,
+	                                                             NM_BRIDGE_FORWARD_DELAY_MIN, NM_BRIDGE_FORWARD_DELAY_MAX, NM_BRIDGE_FORWARD_DELAY_DEF,
 	                                                             TRUE, TRUE, TRUE},
 	{ NM_SETTING_BRIDGE_HELLO_TIME,                              "hello_time",
 	                                                             NULL, NULL,

From 696fae40b78d8c4bf3dee675dd63e2e0a8f933b1 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 10:49:58 +0200
Subject: [PATCH 196/222] libnm: adjust bridge defines NM_BRIDGE_STP_DEF

---
 libnm-core/nm-core-internal.h  | 3 ++-
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 1667159784..1f56e17043 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -103,6 +103,8 @@
 #define NM_BRIDGE_MULTICAST_HASH_MAX_DEF 4096u
 #define NM_BRIDGE_MULTICAST_HASH_MAX_MAX ((guint) G_MAXUINT32)
 
+#define NM_BRIDGE_STP_DEF TRUE
+
 #define BRIDGE_HELLO_TIME_DEFAULT                          2
 #define BRIDGE_MAX_AGE_DEFAULT                             20
 #define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
@@ -117,7 +119,6 @@
 #define BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT       2
 #define BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT    3125
 #define BRIDGE_PRIORITY_DEFAULT                            0x8000
-#define BRIDGE_STP_DEFAULT                                 TRUE
 #define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT                   1
 #define BRIDGE_VLAN_STATS_ENABLED_DEFAULT                  FALSE
 
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 1302eb9985..c832a22a6f 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1579,7 +1579,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->multicast_hash_max                = NM_BRIDGE_MULTICAST_HASH_MAX_DEF;
 	priv->multicast_snooping                = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
 	priv->priority                          = BRIDGE_PRIORITY_DEFAULT;
-	priv->stp                               = BRIDGE_STP_DEFAULT;
+	priv->stp                               = NM_BRIDGE_STP_DEF;
 	priv->vlan_default_pvid                 = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
 	priv->vlan_stats_enabled                = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
 	priv->multicast_query_interval          = BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT;
@@ -1684,7 +1684,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_STP] =
 	    g_param_spec_boolean (NM_SETTING_BRIDGE_STP, "", "",
-	                          BRIDGE_STP_DEFAULT,
+	                          NM_BRIDGE_STP_DEF,
 	                          G_PARAM_READWRITE |
 	                          NM_SETTING_PARAM_INFERRABLE |
 	                          G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 23a373d3aa..fa8a406c82 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -248,7 +248,7 @@ typedef struct {
 static const Option master_options[] = {
 	{ NM_SETTING_BRIDGE_STP,                                     "stp_state", /* this must stay as the first item */
 	                                                             NULL, NULL,
-	                                                             0, 1, 1,
+	                                                             FALSE, TRUE, NM_BRIDGE_STP_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_PRIORITY,                                "priority",
 	                                                             NULL, NULL,

From d7dd4c70d0b218a5a490d18f419aabf99837e46f Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 11:26:17 +0200
Subject: [PATCH 197/222] libnm: adjust bridge defines NM_BRIDGE_HELLO_TIME_*

---
 libnm-core/nm-core-internal.h  | 6 +++---
 libnm-core/nm-setting-bridge.c | 8 ++++----
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 1f56e17043..decd18f36d 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -78,8 +78,9 @@
 #include "nm-libnm-core-intern/nm-libnm-core-utils.h"
 
 /* IEEE 802.1D-1998 timer values */
-#define NM_BR_MIN_HELLO_TIME    1
-#define NM_BR_MAX_HELLO_TIME    10
+#define NM_BRIDGE_HELLO_TIME_MIN 1u
+#define NM_BRIDGE_HELLO_TIME_DEF 2u
+#define NM_BRIDGE_HELLO_TIME_MAX 10u
 
 #define NM_BRIDGE_FORWARD_DELAY_MIN 2u
 #define NM_BRIDGE_FORWARD_DELAY_DEF 15u
@@ -105,7 +106,6 @@
 
 #define NM_BRIDGE_STP_DEF TRUE
 
-#define BRIDGE_HELLO_TIME_DEFAULT                          2
 #define BRIDGE_MAX_AGE_DEFAULT                             20
 #define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
 #define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT      100
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index c832a22a6f..7950a1d5fd 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1208,8 +1208,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		return FALSE;
 
 	if (!check_range (priv->hello_time,
-	                  NM_BR_MIN_HELLO_TIME,
-	                  NM_BR_MAX_HELLO_TIME,
+	                  NM_BRIDGE_HELLO_TIME_MIN,
+	                  NM_BRIDGE_HELLO_TIME_MAX,
 	                  !priv->stp,
 	                  NM_SETTING_BRIDGE_HELLO_TIME,
 	                  error))
@@ -1571,7 +1571,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 
 	priv->ageing_time                       = NM_BRIDGE_AGEING_TIME_DEF;
 	priv->forward_delay                     = NM_BRIDGE_FORWARD_DELAY_DEF;
-	priv->hello_time                        = BRIDGE_HELLO_TIME_DEFAULT;
+	priv->hello_time                        = NM_BRIDGE_HELLO_TIME_DEF;
 	priv->max_age                           = BRIDGE_MAX_AGE_DEFAULT;
 	priv->multicast_last_member_count       = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT;
 	priv->multicast_last_member_interval    = BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT;
@@ -1746,7 +1746,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_HELLO_TIME] =
 	    g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME, "", "",
-	                       0, NM_BR_MAX_HELLO_TIME, BRIDGE_HELLO_TIME_DEFAULT,
+	                       0, NM_BRIDGE_HELLO_TIME_MAX, NM_BRIDGE_HELLO_TIME_DEF,
 	                       G_PARAM_READWRITE |
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index fa8a406c82..784084cbd0 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -260,7 +260,7 @@ static const Option master_options[] = {
 	                                                             TRUE, TRUE, TRUE},
 	{ NM_SETTING_BRIDGE_HELLO_TIME,                              "hello_time",
 	                                                             NULL, NULL,
-	                                                             0, NM_BR_MAX_HELLO_TIME, 2,
+	                                                             NM_BRIDGE_HELLO_TIME_MIN, NM_BRIDGE_HELLO_TIME_MAX, NM_BRIDGE_HELLO_TIME_DEF,
 	                                                             TRUE, TRUE, TRUE },
 	{ NM_SETTING_BRIDGE_MAX_AGE,                                 "max_age",
 	                                                             NULL, NULL,

From e2cb0837cc572cab3fc032ff2fb6078fc0a3d8db Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 11:45:27 +0200
Subject: [PATCH 198/222] libnm: adjust bridge defines NM_BRIDGE_MAX_AGE_*

---
 libnm-core/nm-core-internal.h  | 6 +++---
 libnm-core/nm-setting-bridge.c | 8 ++++----
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index decd18f36d..8cea7e44c7 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -86,8 +86,9 @@
 #define NM_BRIDGE_FORWARD_DELAY_DEF 15u
 #define NM_BRIDGE_FORWARD_DELAY_MAX 30u
 
-#define NM_BR_MIN_MAX_AGE       6
-#define NM_BR_MAX_MAX_AGE       40
+#define NM_BRIDGE_MAX_AGE_MIN 6u
+#define NM_BRIDGE_MAX_AGE_DEF 20u
+#define NM_BRIDGE_MAX_AGE_MAX 40u
 
 /* IEEE 802.1D-1998 Table 7.4 */
 #define NM_BRIDGE_AGEING_TIME_MIN 0u
@@ -106,7 +107,6 @@
 
 #define NM_BRIDGE_STP_DEF TRUE
 
-#define BRIDGE_MAX_AGE_DEFAULT                             20
 #define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
 #define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT      100
 #define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT       26000
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 7950a1d5fd..ced8b5bdb7 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1216,8 +1216,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		return FALSE;
 
 	if (!check_range (priv->max_age,
-	                  NM_BR_MIN_MAX_AGE,
-	                  NM_BR_MAX_MAX_AGE,
+	                  NM_BRIDGE_MAX_AGE_MIN,
+	                  NM_BRIDGE_MAX_AGE_MAX,
 	                  !priv->stp,
 	                  NM_SETTING_BRIDGE_MAX_AGE,
 	                  error))
@@ -1572,7 +1572,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->ageing_time                       = NM_BRIDGE_AGEING_TIME_DEF;
 	priv->forward_delay                     = NM_BRIDGE_FORWARD_DELAY_DEF;
 	priv->hello_time                        = NM_BRIDGE_HELLO_TIME_DEF;
-	priv->max_age                           = BRIDGE_MAX_AGE_DEFAULT;
+	priv->max_age                           = NM_BRIDGE_MAX_AGE_DEF;
 	priv->multicast_last_member_count       = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT;
 	priv->multicast_last_member_interval    = BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT;
 	priv->multicast_membership_interval     = BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT;
@@ -1766,7 +1766,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MAX_AGE] =
 	    g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE, "", "",
-	                       0, NM_BR_MAX_MAX_AGE, BRIDGE_MAX_AGE_DEFAULT,
+	                       0, NM_BRIDGE_MAX_AGE_MAX, NM_BRIDGE_MAX_AGE_DEF,
 	                       G_PARAM_READWRITE |
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 784084cbd0..460faa65fa 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -264,7 +264,7 @@ static const Option master_options[] = {
 	                                                             TRUE, TRUE, TRUE },
 	{ NM_SETTING_BRIDGE_MAX_AGE,                                 "max_age",
 	                                                             NULL, NULL,
-	                                                             0, NM_BR_MAX_MAX_AGE, 20,
+	                                                             NM_BRIDGE_MAX_AGE_MIN, NM_BRIDGE_MAX_AGE_MAX, NM_BRIDGE_MAX_AGE_DEF,
 	                                                             TRUE, TRUE, TRUE },
 	{ NM_SETTING_BRIDGE_AGEING_TIME,                             "ageing_time",
 	                                                             NULL, NULL,

From a690cedcba3dd95535594108a4805f15c626f37c Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 11:47:41 +0200
Subject: [PATCH 199/222] libnm: adjust bridge defines NM_BRIDGE_PRIORITY_*

---
 libnm-core/nm-core-internal.h  | 5 ++++-
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 8cea7e44c7..76ecd8f0e0 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -107,6 +107,10 @@
 
 #define NM_BRIDGE_STP_DEF TRUE
 
+#define NM_BRIDGE_PRIORITY_MIN 0u
+#define NM_BRIDGE_PRIORITY_DEF 0x8000u
+#define NM_BRIDGE_PRIORITY_MAX ((guint) G_MAXUINT16)
+
 #define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
 #define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT      100
 #define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT       26000
@@ -118,7 +122,6 @@
 #define BRIDGE_MULTICAST_SNOOPING_DEFAULT                  TRUE
 #define BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT       2
 #define BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT    3125
-#define BRIDGE_PRIORITY_DEFAULT                            0x8000
 #define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT                   1
 #define BRIDGE_VLAN_STATS_ENABLED_DEFAULT                  FALSE
 
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index ced8b5bdb7..c2a97e744a 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1578,7 +1578,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->multicast_membership_interval     = BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT;
 	priv->multicast_hash_max                = NM_BRIDGE_MULTICAST_HASH_MAX_DEF;
 	priv->multicast_snooping                = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
-	priv->priority                          = BRIDGE_PRIORITY_DEFAULT;
+	priv->priority                          = NM_BRIDGE_PRIORITY_DEF;
 	priv->stp                               = NM_BRIDGE_STP_DEF;
 	priv->vlan_default_pvid                 = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
 	priv->vlan_stats_enabled                = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
@@ -1706,7 +1706,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_PRIORITY] =
 	    g_param_spec_uint (NM_SETTING_BRIDGE_PRIORITY, "", "",
-	                       0, G_MAXUINT16, BRIDGE_PRIORITY_DEFAULT,
+	                       NM_BRIDGE_PRIORITY_MIN, NM_BRIDGE_PRIORITY_MAX, NM_BRIDGE_PRIORITY_DEF,
 	                       G_PARAM_READWRITE |
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 460faa65fa..f32bd66264 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -252,7 +252,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_PRIORITY,                                "priority",
 	                                                             NULL, NULL,
-	                                                             0, G_MAXUINT16, 0x8000,
+	                                                             NM_BRIDGE_PRIORITY_MIN, NM_BRIDGE_PRIORITY_MAX, NM_BRIDGE_PRIORITY_DEF,
 	                                                             TRUE, FALSE, TRUE },
 	{ NM_SETTING_BRIDGE_FORWARD_DELAY,                           "forward_delay",
 	                                                             NULL, NULL,

From a7421f8bf2f43efd669a61c79798b79f6c9f4946 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 11:53:18 +0200
Subject: [PATCH 200/222] libnm: adjust bridge defines
 NM_BRIDGE_PORT_PRIORITY_*

---
 libnm-core/nm-core-internal.h       | 5 +++--
 libnm-core/nm-setting-bridge-port.c | 4 ++--
 src/devices/nm-device-bridge.c      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 76ecd8f0e0..1c1e087d9e 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -95,8 +95,9 @@
 #define NM_BRIDGE_AGEING_TIME_DEF 300u
 #define NM_BRIDGE_AGEING_TIME_MAX 1000000u
 
-#define NM_BR_PORT_MAX_PRIORITY 63
-#define NM_BR_PORT_DEF_PRIORITY 32
+#define NM_BRIDGE_PORT_PRIORITY_MIN 0u
+#define NM_BRIDGE_PORT_PRIORITY_DEF 32u
+#define NM_BRIDGE_PORT_PRIORITY_MAX 63u
 
 #define NM_BR_PORT_MAX_PATH_COST 65535
 #define NM_BR_PORT_DEF_PATH_COST 100
diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c
index 72f37af572..92c66e3edc 100644
--- a/libnm-core/nm-setting-bridge-port.c
+++ b/libnm-core/nm-setting-bridge-port.c
@@ -442,7 +442,7 @@ nm_setting_bridge_port_init (NMSettingBridgePort *setting)
 
 	priv->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
 
-	priv->priority = NM_BR_PORT_DEF_PRIORITY;
+	priv->priority = NM_BRIDGE_PORT_PRIORITY_DEF;
 	priv->path_cost = NM_BR_PORT_DEF_PATH_COST;
 }
 
@@ -500,7 +500,7 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
 	 */
 	obj_properties[PROP_PRIORITY] =
 	    g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PRIORITY, "", "",
-	                       0, NM_BR_PORT_MAX_PRIORITY, NM_BR_PORT_DEF_PRIORITY,
+	                       NM_BRIDGE_PORT_PRIORITY_MIN, NM_BRIDGE_PORT_PRIORITY_MAX, NM_BRIDGE_PORT_PRIORITY_DEF,
 	                       G_PARAM_READWRITE |
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index f32bd66264..85e2df1269 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -344,7 +344,7 @@ static const Option master_options[] = {
 static const Option slave_options[] = {
 	{ NM_SETTING_BRIDGE_PORT_PRIORITY,     "priority",
 	                                       NULL, NULL,
-	                                       0, NM_BR_PORT_MAX_PRIORITY, NM_BR_PORT_DEF_PRIORITY,
+	                                       NM_BRIDGE_PORT_PRIORITY_MIN, NM_BRIDGE_PORT_PRIORITY_MAX, NM_BRIDGE_PORT_PRIORITY_DEF,
 	                                       TRUE, FALSE },
 	{ NM_SETTING_BRIDGE_PORT_PATH_COST,    "path_cost",
 	                                       NULL, NULL,

From 4c3691e52e274855a2a9ce9b9ac2bcda1f16cf8c Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 11:53:18 +0200
Subject: [PATCH 201/222] libnm: adjust bridge defines
 NM_BRIDGE_PORT_PATH_COST_*

---
 libnm-core/nm-core-internal.h       | 5 +++--
 libnm-core/nm-setting-bridge-port.c | 4 ++--
 src/devices/nm-device-bridge.c      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 1c1e087d9e..83643b9ac7 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -99,8 +99,9 @@
 #define NM_BRIDGE_PORT_PRIORITY_DEF 32u
 #define NM_BRIDGE_PORT_PRIORITY_MAX 63u
 
-#define NM_BR_PORT_MAX_PATH_COST 65535
-#define NM_BR_PORT_DEF_PATH_COST 100
+#define NM_BRIDGE_PORT_PATH_COST_MIN 0u
+#define NM_BRIDGE_PORT_PATH_COST_DEF 100u
+#define NM_BRIDGE_PORT_PATH_COST_MAX 65535u
 
 #define NM_BRIDGE_MULTICAST_HASH_MAX_MIN 1u
 #define NM_BRIDGE_MULTICAST_HASH_MAX_DEF 4096u
diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c
index 92c66e3edc..92ac28ecd2 100644
--- a/libnm-core/nm-setting-bridge-port.c
+++ b/libnm-core/nm-setting-bridge-port.c
@@ -443,7 +443,7 @@ nm_setting_bridge_port_init (NMSettingBridgePort *setting)
 	priv->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
 
 	priv->priority = NM_BRIDGE_PORT_PRIORITY_DEF;
-	priv->path_cost = NM_BR_PORT_DEF_PATH_COST;
+	priv->path_cost = NM_BRIDGE_PORT_PATH_COST_DEF;
 }
 
 /**
@@ -521,7 +521,7 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
 	 */
 	obj_properties[PROP_PATH_COST] =
 	    g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, "", "",
-	                       0, NM_BR_PORT_MAX_PATH_COST, NM_BR_PORT_DEF_PATH_COST,
+	                       NM_BRIDGE_PORT_PATH_COST_MIN, NM_BRIDGE_PORT_PATH_COST_MAX, NM_BRIDGE_PORT_PATH_COST_DEF,
 	                       G_PARAM_READWRITE |
 	                       G_PARAM_STATIC_STRINGS);
 
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 85e2df1269..3e56d94286 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -348,7 +348,7 @@ static const Option slave_options[] = {
 	                                       TRUE, FALSE },
 	{ NM_SETTING_BRIDGE_PORT_PATH_COST,    "path_cost",
 	                                       NULL, NULL,
-	                                       0, NM_BR_PORT_MAX_PATH_COST, 100,
+	                                       NM_BRIDGE_PORT_PATH_COST_MIN, NM_BRIDGE_PORT_PATH_COST_MAX, NM_BRIDGE_PORT_PATH_COST_DEF,
 	                                       TRUE, FALSE },
 	{ NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "hairpin_mode",
 	                                       NULL, NULL,

From 769b176263123faded0ac9e2aef770299806f2fa Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 12:31:04 +0200
Subject: [PATCH 202/222] libnm: adjust bridge defines
 NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_*

---
 libnm-core/nm-core-internal.h  | 5 ++++-
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 83643b9ac7..0d4b925dc3 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -113,7 +113,10 @@
 #define NM_BRIDGE_PRIORITY_DEF 0x8000u
 #define NM_BRIDGE_PRIORITY_MAX ((guint) G_MAXUINT16)
 
-#define BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT         2
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MIN 0u
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF 2u
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MAX ((guint) G_MAXUINT32)
+
 #define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT      100
 #define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT       26000
 #define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT          25500
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index c2a97e744a..1d2e58a8eb 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1573,7 +1573,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->forward_delay                     = NM_BRIDGE_FORWARD_DELAY_DEF;
 	priv->hello_time                        = NM_BRIDGE_HELLO_TIME_DEF;
 	priv->max_age                           = NM_BRIDGE_MAX_AGE_DEF;
-	priv->multicast_last_member_count       = BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT;
+	priv->multicast_last_member_count       = NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF;
 	priv->multicast_last_member_interval    = BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT;
 	priv->multicast_membership_interval     = BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT;
 	priv->multicast_hash_max                = NM_BRIDGE_MULTICAST_HASH_MAX_DEF;
@@ -2105,7 +2105,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_LAST_MEMBER_COUNT] =
 	    g_param_spec_uint (NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT, "", "",
-	                       0, G_MAXUINT32, BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEFAULT,
+	                       NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MIN, NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MAX, NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF,
 	                       G_PARAM_READWRITE |
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 3e56d94286..1926197ed7 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -280,7 +280,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,             "multicast_last_member_count",
 	                                                             NULL, NULL,
-	                                                             0, G_MAXUINT32, 2,
+	                                                             NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MIN, NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MAX, NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL,          "multicast_last_member_interval",
 	                                                             NULL, NULL,

From ec9e58ee0143c6d835df107d9578ab254ae1aa72 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 12:34:26 +0200
Subject: [PATCH 203/222] libnm: adjust bridge defines
 NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_*

---
 libnm-core/nm-core-internal.h  | 5 ++++-
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 0d4b925dc3..5f8f427cad 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -117,7 +117,10 @@
 #define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF 2u
 #define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MAX ((guint) G_MAXUINT32)
 
-#define BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT      100
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MIN ((guint64) 0)
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF ((guint64) 100)
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MAX G_MAXUINT64
+
 #define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT       26000
 #define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT          25500
 #define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 1d2e58a8eb..b6b36cdfde 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1574,7 +1574,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->hello_time                        = NM_BRIDGE_HELLO_TIME_DEF;
 	priv->max_age                           = NM_BRIDGE_MAX_AGE_DEF;
 	priv->multicast_last_member_count       = NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF;
-	priv->multicast_last_member_interval    = BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT;
+	priv->multicast_last_member_interval    = NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF;
 	priv->multicast_membership_interval     = BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT;
 	priv->multicast_hash_max                = NM_BRIDGE_MULTICAST_HASH_MAX_DEF;
 	priv->multicast_snooping                = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
@@ -2127,7 +2127,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_LAST_MEMBER_INTERVAL] =
 	    g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL, "", "",
-	                         0, G_MAXUINT64, BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEFAULT,
+	                         NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MIN, NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MAX, NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF,
 	                         G_PARAM_READWRITE |
 	                         NM_SETTING_PARAM_INFERRABLE |
 	                         G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 1926197ed7..15c0ce702f 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -284,7 +284,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL,          "multicast_last_member_interval",
 	                                                             NULL, NULL,
-	                                                             0, G_MAXUINT64, 100,
+	                                                             NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MIN, NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MAX, NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL,           "multicast_membership_interval",
 	                                                             NULL, NULL,

From a75ec12d8bc25eaa60cf0b8ea455d2cd8663aab3 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 12:38:37 +0200
Subject: [PATCH 204/222] libnm: adjust bridge defines
 NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_*

---
 libnm-core/nm-core-internal.h  | 5 ++++-
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 5f8f427cad..a11a77cbbe 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -121,7 +121,10 @@
 #define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF ((guint64) 100)
 #define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MAX G_MAXUINT64
 
-#define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT       26000
+#define NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MIN ((guint64) 0)
+#define NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF ((guint64) 26000)
+#define NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MAX G_MAXUINT64
+
 #define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT          25500
 #define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
 #define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT            12500
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index b6b36cdfde..5d8679ea6d 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1575,7 +1575,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->max_age                           = NM_BRIDGE_MAX_AGE_DEF;
 	priv->multicast_last_member_count       = NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF;
 	priv->multicast_last_member_interval    = NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF;
-	priv->multicast_membership_interval     = BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT;
+	priv->multicast_membership_interval     = NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF;
 	priv->multicast_hash_max                = NM_BRIDGE_MULTICAST_HASH_MAX_DEF;
 	priv->multicast_snooping                = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
 	priv->priority                          = NM_BRIDGE_PRIORITY_DEF;
@@ -2150,7 +2150,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_MEMBERSHIP_INTERVAL] =
 	    g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL, "", "",
-	                         0, G_MAXUINT64, BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT,
+	                         NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MIN, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MAX, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF,
 	                         G_PARAM_READWRITE |
 	                         NM_SETTING_PARAM_INFERRABLE |
 	                         G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 15c0ce702f..a0840b49b1 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -288,7 +288,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL,           "multicast_membership_interval",
 	                                                             NULL, NULL,
-	                                                             0, G_MAXUINT64, 26000,
+	                                                             NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MIN, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MAX, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER,                       "multicast_querier",
 	                                                             NULL, NULL,

From da6bbd73aa7eee90dc6b940ff43e3d63d0750195 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 12:42:15 +0200
Subject: [PATCH 205/222] libnm: adjust bridge defines
 NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_*

---
 libnm-core/nm-core-internal.h  | 5 ++++-
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index a11a77cbbe..42c3afaced 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -125,7 +125,10 @@
 #define NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF ((guint64) 26000)
 #define NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MAX G_MAXUINT64
 
-#define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT          25500
+#define NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MIN ((guint64) 0)
+#define NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF ((guint64) 25500)
+#define NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MAX G_MAXUINT64
+
 #define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
 #define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT            12500
 #define BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT   1000
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 5d8679ea6d..b422563a06 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1586,7 +1586,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->multicast_query_response_interval = BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT;
 	priv->multicast_query_use_ifaddr        = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
 	priv->multicast_querier                 = BRIDGE_MULTICAST_QUERIER_DEFAULT;
-	priv->multicast_querier_interval        = BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT;
+	priv->multicast_querier_interval        = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF;
 	priv->multicast_startup_query_count     = BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT;
 	priv->multicast_startup_query_interval  = BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT;
 }
@@ -2172,7 +2172,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_QUERIER_INTERVAL] =
 	    g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL, "", "",
-	                         0, G_MAXUINT64, BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT,
+	                         NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF,
 	                         G_PARAM_READWRITE |
 	                         NM_SETTING_PARAM_INFERRABLE |
 	                         G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index a0840b49b1..f66743e70b 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -296,7 +296,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL,              "multicast_querier_interval",
 	                                                             NULL, NULL,
-	                                                             0, G_MAXUINT64, 25500,
+	                                                             NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL,                "multicast_query_interval",
 	                                                             NULL, NULL,

From 08cfe812ecd28a5fc590fcd5a98ea4ad074496b5 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 12:45:20 +0200
Subject: [PATCH 206/222] libnm: adjust bridge defines
 NM_BRIDGE_MULTICAST_QUERIER_DEF

---
 libnm-core/nm-core-internal.h  | 3 ++-
 libnm-core/nm-setting-bridge.c | 5 +++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 42c3afaced..05204b2564 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -129,7 +129,8 @@
 #define NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF ((guint64) 25500)
 #define NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MAX G_MAXUINT64
 
-#define BRIDGE_MULTICAST_QUERIER_DEFAULT                   FALSE
+#define NM_BRIDGE_MULTICAST_QUERIER_DEF FALSE
+
 #define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT            12500
 #define BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT   1000
 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index b422563a06..5a6fa651a4 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1585,10 +1585,11 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->multicast_query_interval          = BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT;
 	priv->multicast_query_response_interval = BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT;
 	priv->multicast_query_use_ifaddr        = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
-	priv->multicast_querier                 = BRIDGE_MULTICAST_QUERIER_DEFAULT;
 	priv->multicast_querier_interval        = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF;
 	priv->multicast_startup_query_count     = BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT;
 	priv->multicast_startup_query_interval  = BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT;
+
+	nm_assert (priv->multicast_querier == NM_BRIDGE_MULTICAST_QUERIER_DEF);
 }
 
 /**
@@ -2061,7 +2062,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_QUERIER] =
 	    g_param_spec_boolean (NM_SETTING_BRIDGE_MULTICAST_QUERIER, "", "",
-	                          BRIDGE_MULTICAST_QUERIER_DEFAULT,
+	                          NM_BRIDGE_MULTICAST_QUERIER_DEF,
 	                          G_PARAM_READWRITE |
 	                          NM_SETTING_PARAM_INFERRABLE |
 	                          G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index f66743e70b..7941ca5304 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -292,7 +292,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER,                       "multicast_querier",
 	                                                             NULL, NULL,
-	                                                             0, 1, 0,
+	                                                             FALSE, TRUE, NM_BRIDGE_MULTICAST_QUERIER_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL,              "multicast_querier_interval",
 	                                                             NULL, NULL,

From 58001f70e853ec523058500757beaafcbd21b600 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 12:51:22 +0200
Subject: [PATCH 207/222] libnm: adjust bridge defines
 NM_BRIDGE_MULTICAST_QUERY_INTERVAL_*

---
 libnm-core/nm-core-internal.h  | 5 ++++-
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 05204b2564..ad1c689ad3 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -131,7 +131,10 @@
 
 #define NM_BRIDGE_MULTICAST_QUERIER_DEF FALSE
 
-#define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT            12500
+#define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MIN ((guint64) 0)
+#define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF ((guint64) 12500)
+#define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MAX G_MAXUINT64
+
 #define BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT   1000
 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
 #define BRIDGE_MULTICAST_SNOOPING_DEFAULT                  TRUE
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 5a6fa651a4..bd94d80fdb 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1582,7 +1582,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->stp                               = NM_BRIDGE_STP_DEF;
 	priv->vlan_default_pvid                 = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
 	priv->vlan_stats_enabled                = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
-	priv->multicast_query_interval          = BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT;
+	priv->multicast_query_interval          = NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF;
 	priv->multicast_query_response_interval = BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT;
 	priv->multicast_query_use_ifaddr        = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
 	priv->multicast_querier_interval        = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF;
@@ -2195,7 +2195,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_QUERY_INTERVAL] =
 	    g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL, "", "",
-	                         0, G_MAXUINT64, BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT,
+	                         NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF,
 	                         G_PARAM_READWRITE |
 	                         NM_SETTING_PARAM_INFERRABLE |
 	                         G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 7941ca5304..720c053875 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -300,7 +300,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL,                "multicast_query_interval",
 	                                                             NULL, NULL,
-	                                                             0, G_MAXUINT64, 12500,
+	                                                             NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL,       "multicast_query_response_interval",
 	                                                             NULL, NULL,

From 0db1d28e6d5df0c1bc91bd92718fb9ee71144268 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 13:07:07 +0200
Subject: [PATCH 208/222] libnm: adjust bridge defines
 NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_*

---
 libnm-core/nm-core-internal.h  | 5 ++++-
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index ad1c689ad3..e11f1fb110 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -135,7 +135,10 @@
 #define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF ((guint64) 12500)
 #define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MAX G_MAXUINT64
 
-#define BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT   1000
+#define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MIN ((guint64) 0)
+#define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF ((guint64) 1000)
+#define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MAX G_MAXUINT64
+
 #define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
 #define BRIDGE_MULTICAST_SNOOPING_DEFAULT                  TRUE
 #define BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT       2
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index bd94d80fdb..12db240427 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1583,7 +1583,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->vlan_default_pvid                 = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
 	priv->vlan_stats_enabled                = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
 	priv->multicast_query_interval          = NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF;
-	priv->multicast_query_response_interval = BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT;
+	priv->multicast_query_response_interval = NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF;
 	priv->multicast_query_use_ifaddr        = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
 	priv->multicast_querier_interval        = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF;
 	priv->multicast_startup_query_count     = BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT;
@@ -2217,7 +2217,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_QUERY_RESPONSE_INTERVAL] =
 	    g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL, "", "",
-	                         0, G_MAXUINT64, BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEFAULT,
+	                         NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF,
 	                         G_PARAM_READWRITE |
 	                         NM_SETTING_PARAM_INFERRABLE |
 	                         G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 720c053875..b7c9a358c5 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -304,7 +304,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL,       "multicast_query_response_interval",
 	                                                             NULL, NULL,
-	                                                             0, G_MAXUINT64, 1000,
+	                                                             NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,              "multicast_query_use_ifaddr",
 	                                                             NULL, NULL,

From 96bb90a1ef5a2d54b4f2509a11f49708d16a5d7a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 13:09:23 +0200
Subject: [PATCH 209/222] libnm: adjust bridge defines
 NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF

---
 libnm-core/nm-core-internal.h  | 3 ++-
 libnm-core/nm-setting-bridge.c | 6 +++---
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index e11f1fb110..445a932a3e 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -139,7 +139,8 @@
 #define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF ((guint64) 1000)
 #define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MAX G_MAXUINT64
 
-#define BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT          FALSE
+#define NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF FALSE
+
 #define BRIDGE_MULTICAST_SNOOPING_DEFAULT                  TRUE
 #define BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT       2
 #define BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT    3125
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 12db240427..8e41d61128 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1584,12 +1584,12 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->vlan_stats_enabled                = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
 	priv->multicast_query_interval          = NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF;
 	priv->multicast_query_response_interval = NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF;
-	priv->multicast_query_use_ifaddr        = BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT;
 	priv->multicast_querier_interval        = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF;
 	priv->multicast_startup_query_count     = BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT;
 	priv->multicast_startup_query_interval  = BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT;
 
-	nm_assert (priv->multicast_querier == NM_BRIDGE_MULTICAST_QUERIER_DEF);
+	nm_assert (priv->multicast_querier          == NM_BRIDGE_MULTICAST_QUERIER_DEF);
+	nm_assert (priv->multicast_query_use_ifaddr == NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF);
 }
 
 /**
@@ -2040,7 +2040,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_QUERY_USE_IFADDR] =
 	    g_param_spec_boolean (NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR, "", "",
-	                          BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEFAULT,
+	                          NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF,
 	                          G_PARAM_READWRITE |
 	                          NM_SETTING_PARAM_INFERRABLE |
 	                          G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index b7c9a358c5..4e74d1d72f 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -308,7 +308,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,              "multicast_query_use_ifaddr",
 	                                                             NULL, NULL,
-	                                                             0, 1, 0,
+	                                                             FALSE, TRUE, NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_SNOOPING,                      "multicast_snooping",
 	                                                             NULL, NULL,

From 433bb1fbe4df22242fe7702fb97ae77695fa03dc Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 13:11:32 +0200
Subject: [PATCH 210/222] libnm: adjust bridge defines
 NM_BRIDGE_MULTICAST_SNOOPING_DEF

---
 libnm-core/nm-core-internal.h  | 3 ++-
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 445a932a3e..1c688d47ea 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -141,7 +141,8 @@
 
 #define NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF FALSE
 
-#define BRIDGE_MULTICAST_SNOOPING_DEFAULT                  TRUE
+#define NM_BRIDGE_MULTICAST_SNOOPING_DEF TRUE
+
 #define BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT       2
 #define BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT    3125
 #define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT                   1
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 8e41d61128..7ead41a44f 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1577,7 +1577,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->multicast_last_member_interval    = NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF;
 	priv->multicast_membership_interval     = NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF;
 	priv->multicast_hash_max                = NM_BRIDGE_MULTICAST_HASH_MAX_DEF;
-	priv->multicast_snooping                = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
+	priv->multicast_snooping                = NM_BRIDGE_MULTICAST_SNOOPING_DEF;
 	priv->priority                          = NM_BRIDGE_PRIORITY_DEF;
 	priv->stp                               = NM_BRIDGE_STP_DEF;
 	priv->vlan_default_pvid                 = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
@@ -1831,7 +1831,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_SNOOPING] =
 	    g_param_spec_boolean (NM_SETTING_BRIDGE_MULTICAST_SNOOPING, "", "",
-	                          BRIDGE_MULTICAST_SNOOPING_DEFAULT,
+	                          NM_BRIDGE_MULTICAST_SNOOPING_DEF,
 	                          G_PARAM_READWRITE |
 	                          NM_SETTING_PARAM_INFERRABLE |
 	                          G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 4e74d1d72f..2c9ec58a02 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -312,7 +312,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_SNOOPING,                      "multicast_snooping",
 	                                                             NULL, NULL,
-	                                                             0, 1, 1,
+	                                                             FALSE, TRUE, NM_BRIDGE_MULTICAST_SNOOPING_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_ROUTER,                        "multicast_router",
 	                                                             to_sysfs_multicast_router, from_sysfs_multicast_router,

From 55311c6a6a5b7d25d64849c1c7aaaeca752e393d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 13:16:16 +0200
Subject: [PATCH 211/222] libnm: adjust bridge defines
 NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_*

---
 libnm-core/nm-core-internal.h  | 5 ++++-
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 1c688d47ea..75b001117f 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -143,7 +143,10 @@
 
 #define NM_BRIDGE_MULTICAST_SNOOPING_DEF TRUE
 
-#define BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT       2
+#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MIN 0u
+#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF 2u
+#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MAX ((guint) G_MAXUINT32)
+
 #define BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT    3125
 #define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT                   1
 #define BRIDGE_VLAN_STATS_ENABLED_DEFAULT                  FALSE
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 7ead41a44f..1bdd762bf2 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1585,7 +1585,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->multicast_query_interval          = NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF;
 	priv->multicast_query_response_interval = NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF;
 	priv->multicast_querier_interval        = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF;
-	priv->multicast_startup_query_count     = BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT;
+	priv->multicast_startup_query_count     = NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF;
 	priv->multicast_startup_query_interval  = BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT;
 
 	nm_assert (priv->multicast_querier          == NM_BRIDGE_MULTICAST_QUERIER_DEF);
@@ -2238,7 +2238,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_STARTUP_QUERY_COUNT] =
 	    g_param_spec_uint (NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT, "", "",
-	                       0, G_MAXUINT32, BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEFAULT,
+	                       NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MIN, NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MAX, NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF,
 	                       G_PARAM_READWRITE |
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 2c9ec58a02..ba4b9e098b 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -320,7 +320,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT,           "multicast_startup_query_count",
 	                                                             NULL, NULL,
-	                                                             0, G_MAXUINT32, 2,
+	                                                             NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MIN, NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MAX, NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL,        "multicast_startup_query_interval",
 	                                                             NULL, NULL,

From f34144f70b0da2a03a90d5f27815fdd1d9b5be63 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 13:18:25 +0200
Subject: [PATCH 212/222] libnm: adjust bridge defines
 NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_*

---
 libnm-core/nm-core-internal.h  | 5 ++++-
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 75b001117f..1b4f8fd7ea 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -147,7 +147,10 @@
 #define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF 2u
 #define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MAX ((guint) G_MAXUINT32)
 
-#define BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT    3125
+#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MIN ((guint64) 0)
+#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF ((guint64) 3125)
+#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX G_MAXUINT64
+
 #define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT                   1
 #define BRIDGE_VLAN_STATS_ENABLED_DEFAULT                  FALSE
 
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 1bdd762bf2..dbd81a7d89 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1586,7 +1586,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->multicast_query_response_interval = NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF;
 	priv->multicast_querier_interval        = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF;
 	priv->multicast_startup_query_count     = NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF;
-	priv->multicast_startup_query_interval  = BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT;
+	priv->multicast_startup_query_interval  = NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF;
 
 	nm_assert (priv->multicast_querier          == NM_BRIDGE_MULTICAST_QUERIER_DEF);
 	nm_assert (priv->multicast_query_use_ifaddr == NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF);
@@ -2260,7 +2260,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_MULTICAST_STARTUP_QUERY_INTERVAL] =
 	    g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL, "", "",
-	                         0, G_MAXUINT64, BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEFAULT,
+	                         NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MIN, NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX, NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF,
 	                         G_PARAM_READWRITE |
 	                         NM_SETTING_PARAM_INFERRABLE |
 	                         G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index ba4b9e098b..a963a0449d 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -324,7 +324,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL,        "multicast_startup_query_interval",
 	                                                             NULL, NULL,
-	                                                             0, G_MAXUINT64, 3125,
+	                                                             NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MIN, NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX, NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_GROUP_ADDRESS,                           "group_addr",
 	                                                             to_sysfs_group_address, from_sysfs_group_address,

From bfcfdc2955b2a9833aef3b539eb8b254f88e6203 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 13:26:30 +0200
Subject: [PATCH 213/222] libnm: adjust bridge defines
 NM_BRIDGE_VLAN_STATS_ENABLED_DEF

---
 libnm-core/nm-core-internal.h  | 3 ++-
 libnm-core/nm-setting-bridge.c | 4 ++--
 src/devices/nm-device-bridge.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 1b4f8fd7ea..4fc6d913c4 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -151,8 +151,9 @@
 #define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF ((guint64) 3125)
 #define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX G_MAXUINT64
 
+#define NM_BRIDGE_VLAN_STATS_ENABLED_DEF FALSE
+
 #define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT                   1
-#define BRIDGE_VLAN_STATS_ENABLED_DEFAULT                  FALSE
 
 /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
  * connection can be replaced by a already-defined connection. This flag only
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index dbd81a7d89..df34111e0d 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1581,7 +1581,6 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->priority                          = NM_BRIDGE_PRIORITY_DEF;
 	priv->stp                               = NM_BRIDGE_STP_DEF;
 	priv->vlan_default_pvid                 = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
-	priv->vlan_stats_enabled                = BRIDGE_VLAN_STATS_ENABLED_DEFAULT;
 	priv->multicast_query_interval          = NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF;
 	priv->multicast_query_response_interval = NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF;
 	priv->multicast_querier_interval        = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF;
@@ -1590,6 +1589,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 
 	nm_assert (priv->multicast_querier          == NM_BRIDGE_MULTICAST_QUERIER_DEF);
 	nm_assert (priv->multicast_query_use_ifaddr == NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF);
+	nm_assert (priv->vlan_stats_enabled         == NM_BRIDGE_VLAN_STATS_ENABLED_DEF);
 }
 
 /**
@@ -1991,7 +1991,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_VLAN_STATS_ENABLED] =
 	    g_param_spec_boolean (NM_SETTING_BRIDGE_VLAN_STATS_ENABLED, "", "",
-	                          BRIDGE_VLAN_STATS_ENABLED_DEFAULT,
+	                          NM_BRIDGE_VLAN_STATS_ENABLED_DEF,
 	                          G_PARAM_READWRITE |
 	                          NM_SETTING_PARAM_INFERRABLE |
 	                          G_PARAM_STATIC_STRINGS);
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index a963a0449d..0a8bc4f2e6 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -336,7 +336,7 @@ static const Option master_options[] = {
 	                                                             FALSE, FALSE, FALSE },
 	{ NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,                      "vlan_stats_enabled",
 	                                                             NULL, NULL,
-	                                                             0, 1, 0,
+	                                                             FALSE, TRUE, NM_BRIDGE_VLAN_STATS_ENABLED_DEF,
 	                                                             FALSE, FALSE, FALSE },
 	{ NULL, NULL }
 };

From 42288df043497b6e881c0a8e4f35df1553bd5530 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 13:29:21 +0200
Subject: [PATCH 214/222] libnm: adjust bridge defines
 NM_BRIDGE_VLAN_DEFAULT_PVID_DEF

---
 libnm-core/nm-core-internal.h  | 2 +-
 libnm-core/nm-setting-bridge.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 4fc6d913c4..57f46f94be 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -153,7 +153,7 @@
 
 #define NM_BRIDGE_VLAN_STATS_ENABLED_DEF FALSE
 
-#define BRIDGE_VLAN_DEFAULT_PVID_DEFAULT                   1
+#define NM_BRIDGE_VLAN_DEFAULT_PVID_DEF 1u
 
 /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
  * connection can be replaced by a already-defined connection. This flag only
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index df34111e0d..18aaff2a5e 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -1580,7 +1580,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
 	priv->multicast_snooping                = NM_BRIDGE_MULTICAST_SNOOPING_DEF;
 	priv->priority                          = NM_BRIDGE_PRIORITY_DEF;
 	priv->stp                               = NM_BRIDGE_STP_DEF;
-	priv->vlan_default_pvid                 = BRIDGE_VLAN_DEFAULT_PVID_DEFAULT;
+	priv->vlan_default_pvid                 = NM_BRIDGE_VLAN_DEFAULT_PVID_DEF;
 	priv->multicast_query_interval          = NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF;
 	priv->multicast_query_response_interval = NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF;
 	priv->multicast_querier_interval        = NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF;
@@ -1876,7 +1876,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 */
 	obj_properties[PROP_VLAN_DEFAULT_PVID] =
 	    g_param_spec_uint (NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID, "", "",
-	                       0, NM_BRIDGE_VLAN_VID_MAX, BRIDGE_VLAN_DEFAULT_PVID_DEFAULT,
+	                       0, NM_BRIDGE_VLAN_VID_MAX, NM_BRIDGE_VLAN_DEFAULT_PVID_DEF,
 	                       G_PARAM_READWRITE |
 	                       NM_SETTING_PARAM_INFERRABLE |
 	                       G_PARAM_STATIC_STRINGS);

From 7c22710c1730f9ef31089e73657eafd14314c733 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 13:56:56 +0200
Subject: [PATCH 215/222] libnm: use boolean values for range of
 NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE in slave_options

---
 src/devices/nm-device-bridge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 0a8bc4f2e6..064dd8d2b8 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -352,7 +352,7 @@ static const Option slave_options[] = {
 	                                       TRUE, FALSE },
 	{ NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "hairpin_mode",
 	                                       NULL, NULL,
-	                                       0, 1, 0,
+	                                       FALSE, TRUE, FALSE,
 	                                       FALSE, FALSE },
 	{ NULL, NULL }
 };

From 6044fce960a44aa96fbafdffdf6eb5503daba2c4 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 5 May 2020 14:40:04 +0200
Subject: [PATCH 216/222] bridge: refactor definition of options array to use a
 macro and C99 designated initializer

Yes, it's a macro and it's more lines of code.

But I think this is much easier to read and to maintain.
---
 src/devices/nm-device-bridge.c | 244 +++++++++++++++++++--------------
 1 file changed, 138 insertions(+), 106 deletions(-)

diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 064dd8d2b8..544e66140c 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -245,116 +245,148 @@ typedef struct {
 	bool only_with_stp;
 } Option;
 
+#define OPTION(_name, _sysname, ...) \
+	{ \
+		.name    = ""_name"", \
+		.sysname = ""_sysname"", \
+		__VA_ARGS__ \
+	}
+
+#define OPTION_TYPE_INT(min, max, def) \
+	.nm_min = (min), .nm_max = (max), .nm_default = (def)
+
+#define OPTION_TYPE_BOOL(def) \
+	OPTION_TYPE_INT (FALSE, TRUE, def)
+
+#define OPTION_TYPE_TOFROM(to, fro) \
+	.to_sysfs = (to), .from_sysfs = (fro)
+
 static const Option master_options[] = {
-	{ NM_SETTING_BRIDGE_STP,                                     "stp_state", /* this must stay as the first item */
-	                                                             NULL, NULL,
-	                                                             FALSE, TRUE, NM_BRIDGE_STP_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_PRIORITY,                                "priority",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_PRIORITY_MIN, NM_BRIDGE_PRIORITY_MAX, NM_BRIDGE_PRIORITY_DEF,
-	                                                             TRUE, FALSE, TRUE },
-	{ NM_SETTING_BRIDGE_FORWARD_DELAY,                           "forward_delay",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_FORWARD_DELAY_MIN, NM_BRIDGE_FORWARD_DELAY_MAX, NM_BRIDGE_FORWARD_DELAY_DEF,
-	                                                             TRUE, TRUE, TRUE},
-	{ NM_SETTING_BRIDGE_HELLO_TIME,                              "hello_time",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_HELLO_TIME_MIN, NM_BRIDGE_HELLO_TIME_MAX, NM_BRIDGE_HELLO_TIME_DEF,
-	                                                             TRUE, TRUE, TRUE },
-	{ NM_SETTING_BRIDGE_MAX_AGE,                                 "max_age",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_MAX_AGE_MIN, NM_BRIDGE_MAX_AGE_MAX, NM_BRIDGE_MAX_AGE_DEF,
-	                                                             TRUE, TRUE, TRUE },
-	{ NM_SETTING_BRIDGE_AGEING_TIME,                             "ageing_time",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_AGEING_TIME_MIN, NM_BRIDGE_AGEING_TIME_MAX, NM_BRIDGE_AGEING_TIME_DEF,
-	                                                             TRUE, TRUE, FALSE },
-	{ NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,                      "group_fwd_mask",
-	                                                             NULL, NULL,
-	                                                             0, 0xFFFF, 0,
-	                                                             TRUE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,                      "hash_max",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_MULTICAST_HASH_MAX_MIN, NM_BRIDGE_MULTICAST_HASH_MAX_MAX, NM_BRIDGE_MULTICAST_HASH_MAX_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,             "multicast_last_member_count",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MIN, NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MAX, NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL,          "multicast_last_member_interval",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MIN, NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MAX, NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL,           "multicast_membership_interval",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MIN, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MAX, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER,                       "multicast_querier",
-	                                                             NULL, NULL,
-	                                                             FALSE, TRUE, NM_BRIDGE_MULTICAST_QUERIER_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL,              "multicast_querier_interval",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL,                "multicast_query_interval",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL,       "multicast_query_response_interval",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,              "multicast_query_use_ifaddr",
-	                                                             NULL, NULL,
-	                                                             FALSE, TRUE, NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_SNOOPING,                      "multicast_snooping",
-	                                                             NULL, NULL,
-	                                                             FALSE, TRUE, NM_BRIDGE_MULTICAST_SNOOPING_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_ROUTER,                        "multicast_router",
-	                                                             to_sysfs_multicast_router, from_sysfs_multicast_router,
-	                                                             0, 0, 0,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT,           "multicast_startup_query_count",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MIN, NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MAX, NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL,        "multicast_startup_query_interval",
-	                                                             NULL, NULL,
-	                                                             NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MIN, NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX, NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_GROUP_ADDRESS,                           "group_addr",
-	                                                             to_sysfs_group_address, from_sysfs_group_address,
-	                                                             0, 0, 0,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_VLAN_PROTOCOL,                           "vlan_protocol",
-	                                                             to_sysfs_vlan_protocol, from_sysfs_vlan_protocol,
-	                                                             0, 0, 0,
-	                                                             FALSE, FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,                      "vlan_stats_enabled",
-	                                                             NULL, NULL,
-	                                                             FALSE, TRUE, NM_BRIDGE_VLAN_STATS_ENABLED_DEF,
-	                                                             FALSE, FALSE, FALSE },
-	{ NULL, NULL }
+	OPTION (NM_SETTING_BRIDGE_STP, /* this must stay as the first item */
+	        "stp_state",
+	        OPTION_TYPE_BOOL (NM_BRIDGE_STP_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_PRIORITY,
+	        "priority",
+	        OPTION_TYPE_INT (NM_BRIDGE_PRIORITY_MIN, NM_BRIDGE_PRIORITY_MAX, NM_BRIDGE_PRIORITY_DEF),
+	        .default_if_zero    = TRUE,
+	        .only_with_stp      = TRUE,
+	),
+	OPTION (NM_SETTING_BRIDGE_FORWARD_DELAY,
+	        "forward_delay",
+	        OPTION_TYPE_INT (NM_BRIDGE_FORWARD_DELAY_MIN, NM_BRIDGE_FORWARD_DELAY_MAX, NM_BRIDGE_FORWARD_DELAY_DEF),
+	        .default_if_zero    = TRUE,
+	        .user_hz_compensate = TRUE,
+	        .only_with_stp      = TRUE,
+	),
+	OPTION (NM_SETTING_BRIDGE_HELLO_TIME,
+	        "hello_time",
+	        OPTION_TYPE_INT (NM_BRIDGE_HELLO_TIME_MIN, NM_BRIDGE_HELLO_TIME_MAX, NM_BRIDGE_HELLO_TIME_DEF),
+	        .default_if_zero    = TRUE,
+	        .user_hz_compensate = TRUE,
+	        .only_with_stp      = TRUE,
+	),
+	OPTION (NM_SETTING_BRIDGE_MAX_AGE,
+	        "max_age",
+	        OPTION_TYPE_INT (NM_BRIDGE_MAX_AGE_MIN, NM_BRIDGE_MAX_AGE_MAX, NM_BRIDGE_MAX_AGE_DEF),
+	        .default_if_zero    = TRUE,
+	        .user_hz_compensate = TRUE,
+	        .only_with_stp      = TRUE,
+	),
+	OPTION (NM_SETTING_BRIDGE_AGEING_TIME,
+	        "ageing_time",
+	        OPTION_TYPE_INT (NM_BRIDGE_AGEING_TIME_MIN, NM_BRIDGE_AGEING_TIME_MAX, NM_BRIDGE_AGEING_TIME_DEF),
+	        .default_if_zero    = TRUE,
+	        .user_hz_compensate = TRUE,
+	),
+	OPTION (NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,
+	        "group_fwd_mask",
+	        OPTION_TYPE_INT (0, 0xFFFF, 0),
+	        .default_if_zero    = TRUE,
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_HASH_MAX,
+	        "hash_max",
+	        OPTION_TYPE_INT (NM_BRIDGE_MULTICAST_HASH_MAX_MIN, NM_BRIDGE_MULTICAST_HASH_MAX_MAX, NM_BRIDGE_MULTICAST_HASH_MAX_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT,
+	        "multicast_last_member_count",
+	        OPTION_TYPE_INT (NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MIN, NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MAX, NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL,
+	        "multicast_last_member_interval",
+	        OPTION_TYPE_INT (NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MIN, NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MAX, NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL,
+	        "multicast_membership_interval",
+	        OPTION_TYPE_INT (NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MIN, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MAX, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_QUERIER,
+	        "multicast_querier",
+	        OPTION_TYPE_BOOL (NM_BRIDGE_MULTICAST_QUERIER_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL,
+	        "multicast_querier_interval",
+	        OPTION_TYPE_INT (NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL,
+	        "multicast_query_interval",
+	        OPTION_TYPE_INT (NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL,
+	        "multicast_query_response_interval",
+	        OPTION_TYPE_INT (NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MIN, NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MAX, NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,
+	        "multicast_query_use_ifaddr",
+	        OPTION_TYPE_BOOL (NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_SNOOPING,
+	        "multicast_snooping",
+	        OPTION_TYPE_BOOL (NM_BRIDGE_MULTICAST_SNOOPING_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_ROUTER,
+	        "multicast_router",
+	        OPTION_TYPE_TOFROM (to_sysfs_multicast_router, from_sysfs_multicast_router),
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT,
+	        "multicast_startup_query_count",
+	        OPTION_TYPE_INT (NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MIN, NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MAX, NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL,
+	        "multicast_startup_query_interval",
+	        OPTION_TYPE_INT (NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MIN, NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX, NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF),
+	),
+	OPTION (NM_SETTING_BRIDGE_GROUP_ADDRESS,
+	        "group_addr",
+	        OPTION_TYPE_TOFROM (to_sysfs_group_address, from_sysfs_group_address),
+	),
+	OPTION (NM_SETTING_BRIDGE_VLAN_PROTOCOL,
+	        "vlan_protocol",
+	        OPTION_TYPE_TOFROM (to_sysfs_vlan_protocol, from_sysfs_vlan_protocol),
+	),
+	OPTION (NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,
+	        "vlan_stats_enabled",
+	        OPTION_TYPE_BOOL (NM_BRIDGE_VLAN_STATS_ENABLED_DEF)
+	),
+	{ 0, }
 };
 
 static const Option slave_options[] = {
-	{ NM_SETTING_BRIDGE_PORT_PRIORITY,     "priority",
-	                                       NULL, NULL,
-	                                       NM_BRIDGE_PORT_PRIORITY_MIN, NM_BRIDGE_PORT_PRIORITY_MAX, NM_BRIDGE_PORT_PRIORITY_DEF,
-	                                       TRUE, FALSE },
-	{ NM_SETTING_BRIDGE_PORT_PATH_COST,    "path_cost",
-	                                       NULL, NULL,
-	                                       NM_BRIDGE_PORT_PATH_COST_MIN, NM_BRIDGE_PORT_PATH_COST_MAX, NM_BRIDGE_PORT_PATH_COST_DEF,
-	                                       TRUE, FALSE },
-	{ NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "hairpin_mode",
-	                                       NULL, NULL,
-	                                       FALSE, TRUE, FALSE,
-	                                       FALSE, FALSE },
-	{ NULL, NULL }
+	OPTION (NM_SETTING_BRIDGE_PORT_PRIORITY,
+	        "priority",
+	        OPTION_TYPE_INT (NM_BRIDGE_PORT_PRIORITY_MIN, NM_BRIDGE_PORT_PRIORITY_MAX, NM_BRIDGE_PORT_PRIORITY_DEF),
+	        .default_if_zero    = TRUE,
+	),
+	OPTION (NM_SETTING_BRIDGE_PORT_PATH_COST,
+	        "path_cost",
+	        OPTION_TYPE_INT (NM_BRIDGE_PORT_PATH_COST_MIN, NM_BRIDGE_PORT_PATH_COST_MAX, NM_BRIDGE_PORT_PATH_COST_DEF),
+	        .default_if_zero    = TRUE,
+	),
+	OPTION (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE,
+	        "hairpin_mode",
+	        OPTION_TYPE_BOOL (FALSE),
+	),
+	{ 0 }
 };
 
 static void

From f6e41c19ffcca6b2cd5a43ae480ebc5986be91c4 Mon Sep 17 00:00:00 2001
From: Benjamin Porter <FreedomBen@users.noreply.github.com>
Date: Thu, 7 May 2020 10:41:25 -0600
Subject: [PATCH 217/222] man: extents -> extends in man page

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/497
---
 man/nm-settings-ifcfg-rh.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl
index eac6b0a15d..e14b742fe9 100644
--- a/man/nm-settings-ifcfg-rh.xsl
+++ b/man/nm-settings-ifcfg-rh.xsl
@@ -241,7 +241,7 @@ DEVICETYPE=TeamPort
                   <listitem>
                     <para><literal>ONBOOT</literal> -
                     initscripts use ONBOOT=yes to mark the devices that are to be activated
-                    during boot. NetworkManager extents this to also mean that this profile
+                    during boot. NetworkManager extends this to also mean that this profile
                     can be used for auto-connecting at any time.</para>
                   </listitem>
                   <listitem>

From dbf14dc38caa69c234198c592e39c94616c4c202 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 8 May 2020 10:46:13 +0200
Subject: [PATCH 218/222] shared: add nm_str_is_empty() helper

We have nm_str_not_empty() which is the inverse of that. The purpose
of nm_str_not_empty() is to normalize a string to either return
%NULL or a non-empty string, like

   const char *
   get_name (Object *obj)
   {
        return nm_str_not_empty (obj->name);
   }

Sometimes, we however want to check whether a string is not empty.
So, we previously had two choices:

1) use a temporary variable:

     const char *tmp;

     tmp = get_string ();
     if (tmp && tmp[0])
        ...

The problem with this variant is that it's more verbose (by requiring a
temporary variable). Another downside is that there are multiple ways
how to check for an empty string (!tmp[0], tmp[0] == '\0', !strlen (tmp),
strlen (tmp) == 0), and sure enough they are all in use.

2) use !nm_str_not_empty(). But this double negation looks really odd
and confusing.

Add nm_str_is_empty() instead.
---
 shared/nm-glib-aux/nm-macros-internal.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h
index 637d62bb5d..f56ed85699 100644
--- a/shared/nm-glib-aux/nm-macros-internal.h
+++ b/shared/nm-glib-aux/nm-macros-internal.h
@@ -989,16 +989,23 @@ nm_gstring_add_space_delimiter (GString *str)
 	return str;
 }
 
+static inline gboolean
+nm_str_is_empty (const char *str)
+{
+	/* %NULL is also accepted, and also "empty". */
+	return !str || !str[0];
+}
+
 static inline const char *
 nm_str_not_empty (const char *str)
 {
-	return str && str[0] ? str : NULL;
+	return !nm_str_is_empty (str) ? str : NULL;
 }
 
 static inline char *
 nm_strdup_not_empty (const char *str)
 {
-	return str && str[0] ? g_strdup (str) : NULL;
+	return !nm_str_is_empty (str) ? g_strdup (str) : NULL;
 }
 
 static inline char *

From 4101894466670deb8a72408ffa53098b52d47a98 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 8 May 2020 11:03:43 +0200
Subject: [PATCH 219/222] libnm: use nm_str_is_empty() in "nm-setting-match.c"

---
 libnm-core/nm-setting-match.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libnm-core/nm-setting-match.c b/libnm-core/nm-setting-match.c
index 358f81d853..a784df39bd 100644
--- a/libnm-core/nm-setting-match.c
+++ b/libnm-core/nm-setting-match.c
@@ -573,7 +573,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 
 	if (self->interface_name) {
 		for (i = 0; i < self->interface_name->len; i++) {
-			if (!nm_str_not_empty (g_array_index (self->interface_name, const char *, i))) {
+			if (nm_str_is_empty (g_array_index (self->interface_name, const char *, i))) {
 				g_set_error (error,
 				             NM_CONNECTION_ERROR,
 				             NM_CONNECTION_ERROR_INVALID_PROPERTY,
@@ -587,7 +587,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 
 	if (self->kernel_command_line) {
 		for (i = 0; i < self->kernel_command_line->len; i++) {
-			if (!nm_str_not_empty (g_array_index (self->kernel_command_line, const char *, i))) {
+			if (nm_str_is_empty (g_array_index (self->kernel_command_line, const char *, i))) {
 				g_set_error (error,
 				             NM_CONNECTION_ERROR,
 				             NM_CONNECTION_ERROR_INVALID_PROPERTY,
@@ -601,7 +601,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 
 	if (self->driver) {
 		for (i = 0; i < self->driver->len; i++) {
-			if (!nm_str_not_empty (g_array_index (self->driver, const char *, i))) {
+			if (nm_str_is_empty (g_array_index (self->driver, const char *, i))) {
 				g_set_error (error,
 				             NM_CONNECTION_ERROR,
 				             NM_CONNECTION_ERROR_INVALID_PROPERTY,

From 29293928555b34bd243729710837b6ba780f8120 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 8 May 2020 12:54:17 +0200
Subject: [PATCH 220/222] all: use "int/char" instead of "gint/gchar" typedefs

This is also recommended by our checkpatch.pl script.
---
 libnm-core/nm-setting-sriov.c                       | 2 +-
 shared/nm-test-utils-impl.c                         | 2 +-
 src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libnm-core/nm-setting-sriov.c b/libnm-core/nm-setting-sriov.c
index a679a0bedb..3c52dc6cc8 100644
--- a/libnm-core/nm-setting-sriov.c
+++ b/libnm-core/nm-setting-sriov.c
@@ -856,7 +856,7 @@ nm_setting_sriov_get_autoprobe_drivers (NMSettingSriov *setting)
 	return setting->autoprobe_drivers;
 }
 
-static gint
+static int
 vf_index_compare (gconstpointer a, gconstpointer b)
 {
 	NMSriovVF *vf_a = *(NMSriovVF **) a;
diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c
index 0ef6591f32..ce7cc8d179 100644
--- a/shared/nm-test-utils-impl.c
+++ b/shared/nm-test-utils-impl.c
@@ -454,7 +454,7 @@ _context_object_new_do_cb (GObject *source_object,
 static GObject *
 _context_object_new_do (GType gtype,
                         gboolean sync,
-                        const gchar *first_property_name,
+                        const char *first_property_name,
                         va_list var_args)
 {
 	gs_free_error GError *error = NULL;
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 2b9d5fd528..6b1f169563 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -431,8 +431,8 @@ make_connection_setting (const char *file,
 	              (int) svGetValueInt64 (ifcfg, "AUTOCONNECT_RETRIES", 10,
 	                                      -1, G_MAXINT32, -1),
 	              NM_SETTING_CONNECTION_MULTI_CONNECT,
-	              (gint) svGetValueInt64 (ifcfg, "MULTI_CONNECT", 10,
-	                                      G_MININT32, G_MAXINT32, NM_CONNECTION_MULTI_CONNECT_DEFAULT),
+	              (int) svGetValueInt64 (ifcfg, "MULTI_CONNECT", 10,
+	                                     G_MININT32, G_MAXINT32, NM_CONNECTION_MULTI_CONNECT_DEFAULT),
 	              NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES,
 	              svGetValueBoolean (ifcfg, "AUTOCONNECT_SLAVES", NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT),
 	              NM_SETTING_CONNECTION_LLDP, lldp,

From b533bef8cd768f90a651d176ca59ccc44a408ff6 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 8 May 2020 14:16:53 +0200
Subject: [PATCH 221/222] ovs: enable trace logging not only with
 NM_MORE_LOGGING

The logging is useful. Always compile it in.
---
 src/devices/ovs/nm-ovsdb.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c
index b6550b2531..e1865f9dea 100644
--- a/src/devices/ovs/nm-ovsdb.c
+++ b/src/devices/ovs/nm-ovsdb.c
@@ -131,10 +131,9 @@ typedef struct {
 #define OVSDB_MAX_FAILURES    3
 
 static void
-_call_trace (const char *comment, OvsdbMethodCall *call, json_t *msg)
+_LOGT_call_do (const char *comment, OvsdbMethodCall *call, json_t *msg)
 {
-#if NM_MORE_LOGGING
-	char *str = NULL;
+	gs_free char *str = NULL;
 
 	if (msg)
 		str = json_dumps (msg, 0);
@@ -169,12 +168,14 @@ _call_trace (const char *comment, OvsdbMethodCall *call, json_t *msg)
 		       call->mtu);
 		break;
 	}
-
-	if (msg)
-		g_free (str);
-#endif
 }
 
+#define _LOGT_call(comment, call, message) \
+	G_STMT_START { \
+		if (_LOGT_ENABLED ()) \
+			_LOGT_call_do ((comment), (call), (message)); \
+	} G_STMT_END
+
 /**
  * ovsdb_call_method:
  *
@@ -226,7 +227,7 @@ ovsdb_call_method (NMOvsdb *self, OvsdbCommand command,
 		break;
 	}
 
-	_call_trace ("enqueue", call, NULL);
+	_LOGT_call ("enqueue", call, NULL);
 
 	ovsdb_next_command (self);
 }
@@ -875,7 +876,7 @@ ovsdb_next_command (NMOvsdb *self)
 	}
 
 	g_return_if_fail (msg);
-	_call_trace ("send", call, msg);
+	_LOGT_call ("send", call, msg);
 	cmd = json_dumps (msg, 0);
 
 	g_string_append (priv->output, cmd);
@@ -1247,7 +1248,7 @@ ovsdb_got_msg (NMOvsdb *self, json_t *msg)
 		}
 		/* Cool, we found a corresponding call. Finish it. */
 
-		_call_trace ("response", call, msg);
+		_LOGT_call ("response", call, msg);
 
 		if (!json_is_null (error)) {
 			/* The response contains an error. */

From 3f6f7b06c622145486d15fce177d9de1da2ae5a6 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 8 May 2020 14:42:37 +0200
Subject: [PATCH 222/222] contrib/rpm: log MD5/SHA sums of release tarball
 during build_clean.sh

When doing a release, we should care about the checksum of the tarball.
Log all of them... also, because fedpkg uses sha512, ftpadmin@gnome uses
sha256, etc.
---
 contrib/fedora/rpm/build.sh       | 7 +++++++
 contrib/fedora/rpm/build_clean.sh | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/contrib/fedora/rpm/build.sh b/contrib/fedora/rpm/build.sh
index f2c4cda18d..fa3aec7901 100755
--- a/contrib/fedora/rpm/build.sh
+++ b/contrib/fedora/rpm/build.sh
@@ -226,3 +226,10 @@ else
     LOG
 fi
 
+if [[ "$DO_RELEASE" == 1 ]]; then
+    LOG "RELEASE \"$SOURCE\" :"
+    for c in md5 sha1 sha256 sha512; do
+        LOG "$(printf '%8s: %s' "$c" $("${c}sum" "$SOURCE" | sed 's/ .*//'))"
+    done
+    LOG
+fi
diff --git a/contrib/fedora/rpm/build_clean.sh b/contrib/fedora/rpm/build_clean.sh
index e5eb3ea15e..776e4c4df6 100755
--- a/contrib/fedora/rpm/build_clean.sh
+++ b/contrib/fedora/rpm/build_clean.sh
@@ -44,6 +44,7 @@ NO_DIST=0
 WITH_LIST=()
 SOURCE_FROM_GIT=0
 SNAPSHOT="$NM_BUILD_SNAPSHOT"
+DO_RELEASE=0
 
 ADD_WITH_TEST=1
 
@@ -64,6 +65,7 @@ while [[ $# -gt 0 ]]; do
             [[ $NARGS -eq 1 ]] || die "--release option must be alone"
             export NMTST_CHECK_GTK_DOC=1
             BUILDTYPE=SRPM
+            DO_RELEASE=1
             ;;
         -c|--clean)
             GIT_CLEAN=1
@@ -173,6 +175,7 @@ export SOURCE_FROM_GIT
 export BUILDTYPE
 export NM_RPMBUILD_ARGS="${WITH_LIST[@]}"
 export SNAPSHOT
+export DO_RELEASE
 
 "$SCRIPTDIR"/build.sh