From d205609d41e8663c76ecbf1ffbee018bf491d961 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 04 2020 18:27:12 +0000 Subject: import NetworkManager-1.26.0-7.el8 --- diff --git a/SOURCES/1016-dhcp-implement-dhcp-vendor-class-identifier-option-rh1871042.patch b/SOURCES/1016-dhcp-implement-dhcp-vendor-class-identifier-option-rh1871042.patch new file mode 100644 index 0000000..bf03a32 --- /dev/null +++ b/SOURCES/1016-dhcp-implement-dhcp-vendor-class-identifier-option-rh1871042.patch @@ -0,0 +1,5502 @@ +From e5009c6ec65ec6ef41d76c2df85dc85409d817d1 Mon Sep 17 00:00:00 2001 +From: Antonio Cardace +Date: Wed, 26 Aug 2020 11:24:45 +0200 +Subject: [PATCH 1/7] version: add NM_VERSION_1_26_4/NM_AVAILABLE_IN_1_26_4 + macros + +Signed-off-by: Antonio Cardace +(cherry picked from commit 00132cecb59f4931b4c5a86e23b979d0a0dc7e51) +--- + libnm-core/nm-version.h | 6 ++++++ + shared/nm-version-macros.h.in | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h +index 203840376..b96066fbe 100644 +--- a/libnm-core/nm-version.h ++++ b/libnm-core/nm-version.h +@@ -243,6 +243,12 @@ + # define NM_AVAILABLE_IN_1_26 + #endif + ++#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_26_4 ++# define NM_AVAILABLE_IN_1_26_4 G_UNAVAILABLE(1,26.4) ++#else ++# define NM_AVAILABLE_IN_1_26_4 ++#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/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in +index 83da86ce1..858b70832 100644 +--- a/shared/nm-version-macros.h.in ++++ b/shared/nm-version-macros.h.in +@@ -65,6 +65,7 @@ + #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)) ++#define NM_VERSION_1_26_4 (NM_ENCODE_VERSION (1, 26, 4)) + + /* For releases, NM_API_VERSION is equal to NM_VERSION. + * +-- +2.26.2 + + +From 409d04a8fee63a2a133d41639785ed60ed5b4548 Mon Sep 17 00:00:00 2001 +From: Antonio Cardace +Date: Mon, 24 Aug 2020 18:01:42 +0200 +Subject: [PATCH 2/7] libnm-core,clients: add support for + ipv4.dhcp-vendor-class-identifier option + +https://bugzilla.redhat.com/show_bug.cgi?id=1871042 +Signed-off-by: Antonio Cardace +(cherry picked from commit d7235394b2f2ace930d0ebcdb68d5fc0fc9938a2) +(cherry picked from commit 555f2bfc61553dc63709b7be076eecf42aadb5ba) +--- + clients/common/nm-meta-setting-desc.c | 3 + + clients/common/settings-docs.h.in | 1 + + .../test_003.expected | 482 +++++++------ + .../test_004.expected | 678 ++++++++++-------- + libnm-core/nm-setting-ip4-config.c | 101 +++ + libnm-core/nm-setting-ip4-config.h | 8 +- + libnm-core/tests/test-general.c | 47 +- + libnm/libnm.ver | 5 + + man/NetworkManager.conf.xml | 4 + + 9 files changed, 792 insertions(+), 537 deletions(-) + +diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c +index 2ac91b415..3519df488 100644 +--- a/clients/common/nm-meta-setting-desc.c ++++ b/clients/common/nm-meta-setting-desc.c +@@ -5834,6 +5834,9 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = { + ), + ), + ), ++ PROPERTY_INFO_WITH_DESC (NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, ++ .property_type = &_pt_gobject_string, ++ ), + NULL + }; + +diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in +index 7b891500d..b694eade3 100644 +--- a/clients/common/settings-docs.h.in ++++ b/clients/common/settings-docs.h.in +@@ -229,6 +229,7 @@ + #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.") + #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_DHCP_VENDOR_CLASS_IDENTIFIER N_("The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server. Since 1.28, 1.26.4") + #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\". 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.") +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 74a434769..50d02d815 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 +@@ -204,6 +204,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -308,6 +309,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -558,6 +560,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -657,6 +660,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -776,6 +780,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -888,6 +893,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -1406,12 +1412,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 +@@ -1474,6 +1480,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -1505,12 +1512,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 +@@ -1573,6 +1580,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -1628,12 +1636,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 +@@ -1696,6 +1704,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -1754,12 +1763,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 +@@ -1822,6 +1831,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -2272,12 +2282,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 +@@ -2340,6 +2350,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -2398,12 +2409,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 +@@ -2466,6 +2477,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -2524,12 +2536,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 +@@ -2592,6 +2604,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -2636,12 +2649,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 +@@ -2704,6 +2717,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -2948,12 +2962,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 +@@ -3016,6 +3030,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -3074,12 +3089,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 +@@ -3142,6 +3157,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -3200,12 +3216,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 +@@ -3268,6 +3284,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -3312,12 +3329,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 +@@ -3380,6 +3397,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -3640,12 +3658,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) +@@ -3713,6 +3731,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -3782,12 +3801,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) +@@ -3855,6 +3874,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -3924,12 +3944,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) +@@ -3997,6 +4017,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -4048,12 +4069,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) +@@ -4121,6 +4142,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -4412,12 +4434,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) +@@ -4485,6 +4507,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -4554,12 +4577,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) +@@ -4627,6 +4650,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -4696,12 +4720,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) +@@ -4769,6 +4793,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -4820,12 +4845,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) +@@ -4893,6 +4918,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -5164,12 +5190,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm + UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + + <<< +-size: 3001 ++size: 3036 + location: clients/tests/test-client.py:test_003()/108 + cmd: $NMCLI --terse con s ethernet + lang: C + returncode: 0 +-stdout: 2862 bytes ++stdout: 2897 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -5232,6 +5258,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -5290,12 +5317,12 @@ GENERAL.ZONE: + GENERAL.MASTER-PATH: + + <<< +-size: 3011 ++size: 3046 + 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: 2897 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -5358,6 +5385,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -5416,12 +5444,12 @@ GENERAL.ZONE: + GENERAL.MASTER-PATH: + + <<< +-size: 2655 ++size: 2690 + 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: 2511 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -5484,6 +5512,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -5528,12 +5557,12 @@ GENERAL.ZONE: + GENERAL.MASTER-PATH: + + <<< +-size: 2665 ++size: 2700 + 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: 2511 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -5596,6 +5625,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -5836,12 +5866,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm + UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + + <<< +-size: 3013 ++size: 3048 + 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: 2897 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -5904,6 +5934,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -5962,12 +5993,12 @@ GENERAL.ZONE: + GENERAL.MASTER-PATH: + + <<< +-size: 3023 ++size: 3058 + 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: 2897 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -6030,6 +6061,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -6088,12 +6120,12 @@ GENERAL.ZONE: + GENERAL.MASTER-PATH: + + <<< +-size: 2667 ++size: 2702 + 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: 2511 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -6156,6 +6188,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -6200,12 +6233,12 @@ GENERAL.ZONE: + GENERAL.MASTER-PATH: + + <<< +-size: 2677 ++size: 2712 + 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: 2511 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -6268,6 +6301,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -6512,12 +6546,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm + UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + + <<< +-size: 3736 ++size: 3796 + location: clients/tests/test-client.py:test_003()/128 + cmd: $NMCLI --mode tabular con s ethernet + lang: C + returncode: 0 +-stdout: 3590 bytes ++stdout: 3650 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 +@@ -6525,8 +6559,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth + 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 -- + +-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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) -- +@@ -6543,12 +6577,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac + + + <<< +-size: 3770 ++size: 3830 + 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: 3674 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 +@@ -6556,8 +6590,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth + 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 -- + +-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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) -- +@@ -6574,12 +6608,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza + + + <<< +-size: 3274 ++size: 3334 + 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: 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 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 +@@ -6587,8 +6621,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth + 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 -- + +-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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) -- +@@ -6601,12 +6635,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac + + + <<< +-size: 3306 ++size: 3366 + 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: 3170 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 +@@ -6614,8 +6648,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth + 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 -- + +-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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) -- +@@ -6756,12 +6790,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm + UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + + <<< +-size: 3748 ++size: 3808 + 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: 3650 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 +@@ -6769,8 +6803,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth + 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 -- + +-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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) -- +@@ -6787,12 +6821,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac + + + <<< +-size: 3782 ++size: 3842 + 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: 3674 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 +@@ -6800,8 +6834,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth + 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 -- + +-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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) -- +@@ -6818,12 +6852,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza + + + <<< +-size: 3286 ++size: 3346 + 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: 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 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 +@@ -6831,8 +6865,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth + 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 -- + +-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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) -- +@@ -6845,12 +6879,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac + + + <<< +-size: 3318 ++size: 3378 + 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: 3170 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 +@@ -6858,8 +6892,8 @@ connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-eth + 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 -- + +-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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) -- +@@ -7016,12 +7050,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm + UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + + <<< +-size: 6089 ++size: 6179 + 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: 6024 bytes + >>> + ========================================= + Connection profile details (ethernet) +@@ -7034,9 +7068,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add + ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- + +-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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -7063,12 +7097,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac + + + <<< +-size: 6183 ++size: 6273 + 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: 6108 bytes + >>> + =========================================== + Szczegóły profilu połączenia (ethernet) +@@ -7081,9 +7115,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- + +-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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -7110,12 +7144,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza + + + <<< +-size: 5165 ++size: 5255 + 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: 5060 bytes + >>> + ========================================= + Connection profile details (ethernet) +@@ -7128,9 +7162,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add + ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- + +-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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -7149,12 +7183,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac + + + <<< +-size: 5237 ++size: 5327 + 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: 5122 bytes + >>> + =========================================== + Szczegóły profilu połączenia (ethernet) +@@ -7167,9 +7201,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- + +-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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -7356,12 +7390,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm + UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + + <<< +-size: 6101 ++size: 6191 + 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: 6024 bytes + >>> + ========================================= + Connection profile details (ethernet) +@@ -7374,9 +7408,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add + ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- + +-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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -7403,12 +7437,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac + + + <<< +-size: 6195 ++size: 6285 + 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: 6108 bytes + >>> + =========================================== + Szczegóły profilu połączenia (ethernet) +@@ -7421,9 +7455,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- + +-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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -7450,12 +7484,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza + + + <<< +-size: 5177 ++size: 5267 + 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: 5060 bytes + >>> + ========================================= + Connection profile details (ethernet) +@@ -7468,9 +7502,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add + ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- + +-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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -7489,12 +7523,12 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac + + + <<< +-size: 5249 ++size: 5339 + 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: 5122 bytes + >>> + =========================================== + Szczegóły profilu połączenia (ethernet) +@@ -7507,9 +7541,9 @@ name port speed duplex auto-negotiate mac-address cloned-mac-add + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- + +-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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -7676,16 +7710,16 @@ 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 + 802-3-ethernet::0::no:::::auto::::default: +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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: + proxy:none:no:: + GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4:: +@@ -7693,16 +7727,16 @@ 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 + 802-3-ethernet::0::no:::::auto::::default: +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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: + proxy:none:no:: + GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4:: +@@ -7710,31 +7744,31 @@ 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 + 802-3-ethernet::0::no:::::auto::::default: +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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: + 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 + 802-3-ethernet::0::no:::::auto::::default: +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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: + 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:: +@@ -7830,16 +7864,16 @@ 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 + 802-3-ethernet::0::no:::::auto::::default: +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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: + proxy:none:no:: + GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4:: +@@ -7847,16 +7881,16 @@ 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 + 802-3-ethernet::0::no:::::auto::::default: +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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: + proxy:none:no:: + GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4:: +@@ -7864,31 +7898,31 @@ 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 + 802-3-ethernet::0::no:::::auto::::default: +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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: + 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 + 802-3-ethernet::0::no:::::auto::::default: +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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: + 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:: +@@ -8132,12 +8166,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 +@@ -8200,6 +8234,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -8258,12 +8293,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 +@@ -8326,6 +8361,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -8384,12 +8420,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 +@@ -8452,6 +8488,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -8496,12 +8533,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 +@@ -8564,6 +8601,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -8952,12 +8990,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 +@@ -9020,6 +9058,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -9078,12 +9117,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 +@@ -9146,6 +9185,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -9204,12 +9244,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 +@@ -9272,6 +9312,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -9316,12 +9357,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 +@@ -9384,6 +9425,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -9802,12 +9844,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) +@@ -9875,6 +9917,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -9944,12 +9987,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) +@@ -10017,6 +10060,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -10086,12 +10130,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) +@@ -10159,6 +10203,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -10210,12 +10255,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) +@@ -10283,6 +10328,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -10732,12 +10778,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) +@@ -10805,6 +10851,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -10874,12 +10921,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) +@@ -10947,6 +10994,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -11016,12 +11064,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) +@@ -11089,6 +11137,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -11140,12 +11189,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) +@@ -11213,6 +11262,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -11632,12 +11682,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA + TYPE:802-3-ethernet + + <<< +-size: 3018 ++size: 3053 + 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: 2897 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -11700,6 +11750,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -11758,12 +11809,12 @@ GENERAL.ZONE: + GENERAL.MASTER-PATH: + + <<< +-size: 3028 ++size: 3063 + 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: 2897 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -11826,6 +11877,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -11884,12 +11936,12 @@ GENERAL.ZONE: + GENERAL.MASTER-PATH: + + <<< +-size: 2672 ++size: 2707 + 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: 2511 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -11952,6 +12004,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -11996,12 +12049,12 @@ GENERAL.ZONE: + GENERAL.MASTER-PATH: + + <<< +-size: 2682 ++size: 2717 + 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: 2511 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -12064,6 +12117,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -12452,12 +12506,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA + TYPE:802-3-ethernet + + <<< +-size: 3030 ++size: 3065 + 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: 2897 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -12520,6 +12574,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -12578,12 +12633,12 @@ GENERAL.ZONE: + GENERAL.MASTER-PATH: + + <<< +-size: 3040 ++size: 3075 + 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: 2897 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -12646,6 +12701,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -12704,12 +12760,12 @@ GENERAL.ZONE: + GENERAL.MASTER-PATH: + + <<< +-size: 2684 ++size: 2719 + 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: 2511 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -12772,6 +12828,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -12816,12 +12873,12 @@ GENERAL.ZONE: + GENERAL.MASTER-PATH: + + <<< +-size: 2694 ++size: 2729 + 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: 2511 bytes + >>> + connection.id:ethernet + connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL +@@ -12884,6 +12941,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +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 5ee00fc9e..8274bf9e6 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 +@@ -129,6 +129,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -231,6 +232,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -352,6 +354,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -443,6 +446,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -606,6 +610,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -718,6 +723,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -830,6 +836,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -942,6 +949,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -1054,6 +1062,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -1166,6 +1175,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -1278,6 +1288,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -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 +@@ -1369,6 +1380,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -3986,12 +3998,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 +@@ -4040,6 +4052,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -4098,12 +4111,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 +@@ -4152,6 +4165,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -4210,12 +4224,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 +@@ -4264,6 +4278,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -4322,12 +4337,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 +@@ -4376,6 +4391,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -4434,12 +4450,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 +@@ -4488,6 +4504,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -4525,12 +4542,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 +@@ -4579,6 +4596,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -7196,12 +7214,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) +@@ -7254,6 +7272,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -7321,12 +7340,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) +@@ -7379,6 +7398,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -7446,12 +7466,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) +@@ -7504,6 +7524,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -7571,12 +7592,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) +@@ -7629,6 +7650,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -7696,12 +7718,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) +@@ -7754,6 +7776,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -7795,12 +7818,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) +@@ -7853,6 +7876,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -11078,12 +11102,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) +@@ -11136,6 +11160,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -11203,12 +11228,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) +@@ -11261,6 +11286,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -11328,12 +11354,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) +@@ -11386,6 +11412,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -11453,12 +11480,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) +@@ -11511,6 +11538,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -11578,12 +11606,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) +@@ -11636,6 +11664,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -11677,12 +11706,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) +@@ -11735,6 +11764,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -14960,12 +14990,12 @@ connection.interface-name: -- + ------------------------------------------------------------------------------- + + <<< +-size: 2536 ++size: 2571 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -15014,6 +15044,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -15072,12 +15103,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 2546 ++size: 2581 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -15126,6 +15157,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -15184,12 +15216,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 2536 ++size: 2571 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -15238,6 +15270,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -15296,12 +15329,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 2546 ++size: 2581 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -15350,6 +15383,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -15408,12 +15442,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 1966 ++size: 2001 + 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: 1854 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -15462,6 +15496,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -15499,12 +15534,12 @@ proxy.pac-url: + proxy.pac-script: + + <<< +-size: 1976 ++size: 2011 + 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: 1854 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -15553,6 +15588,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -18140,12 +18176,12 @@ connection.type:802-11-wireless + connection.interface-name: + + <<< +-size: 2548 ++size: 2583 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -18194,6 +18230,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -18252,12 +18289,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 2558 ++size: 2593 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -18306,6 +18343,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -18364,12 +18402,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 2548 ++size: 2583 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -18418,6 +18456,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -18476,12 +18515,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 2558 ++size: 2593 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -18530,6 +18569,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -18588,12 +18628,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 1978 ++size: 2013 + 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: 1854 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -18642,6 +18682,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -18679,12 +18720,12 @@ proxy.pac-url: + proxy.pac-script: + + <<< +-size: 1988 ++size: 2023 + 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: 1854 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -18733,6 +18774,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -21320,18 +21362,18 @@ connection.type:802-11-wireless + connection.interface-name: + + <<< +-size: 3277 ++size: 3337 + 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: 3190 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 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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) -- +@@ -21349,18 +21391,18 @@ 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: 3360 + 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: 3203 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 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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) -- +@@ -21378,18 +21420,18 @@ 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: 3337 + 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: 3190 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 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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) -- +@@ -21407,18 +21449,18 @@ 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: 3360 + 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: 3203 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 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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) -- +@@ -21436,18 +21478,18 @@ 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: 2585 + 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: 2431 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 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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) -- +@@ -21460,18 +21502,18 @@ proxy none no -- -- + + + <<< +-size: 2537 ++size: 2597 + 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: 2433 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 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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) -- +@@ -22974,18 +23016,18 @@ interface-name + + + <<< +-size: 3289 ++size: 3349 + 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: 3190 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 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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) -- +@@ -23003,18 +23045,18 @@ 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: 3372 + 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: 3203 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 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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) -- +@@ -23032,18 +23074,18 @@ 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: 3349 + 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: 3190 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 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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) -- +@@ -23061,18 +23103,18 @@ 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: 3372 + 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: 3203 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 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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) -- +@@ -23090,18 +23132,18 @@ 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: 2597 + 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: 2431 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 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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no no yes -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) yes -- 0x0 (none) -- +@@ -23114,18 +23156,18 @@ proxy none no -- -- + + + <<< +-size: 2549 ++size: 2609 + 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: 2433 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 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) ++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 dhcp-vendor-class-identifier ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + ipv6 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie nie tak -1 (unknown) stable-privacy 0 (default) -- -- 0 (default) tak -- 0x0 (none) -- +@@ -24628,12 +24670,12 @@ interface-name + + + <<< +-size: 5193 ++size: 5283 + 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: 5127 bytes + >>> + ========================================== + Connection profile details (con-vpn-1) +@@ -24642,9 +24684,9 @@ name id uuid stable-id type in + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -24670,12 +24712,12 @@ 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: 5339 + 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: 5173 bytes + >>> + ============================================ + Szczegóły profilu połączenia (con-vpn-1) +@@ -24684,9 +24726,9 @@ name id uuid stable-id type in + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -24712,12 +24754,12 @@ 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: 5283 + 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: 5127 bytes + >>> + ========================================== + Connection profile details (con-vpn-1) +@@ -24726,9 +24768,9 @@ name id uuid stable-id type in + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -24754,12 +24796,12 @@ 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: 5339 + 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: 5173 bytes + >>> + ============================================ + Szczegóły profilu połączenia (con-vpn-1) +@@ -24768,9 +24810,9 @@ name id uuid stable-id type in + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -24796,12 +24838,12 @@ 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: 3939 + 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: 3776 bytes + >>> + ========================================== + Connection profile details (con-vpn-1) +@@ -24810,9 +24852,9 @@ name id uuid stable-id type in + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -24828,12 +24870,12 @@ proxy none no -- -- + + + <<< +-size: 3872 ++size: 3962 + 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: 3789 bytes + >>> + ============================================ + Szczegóły profilu połączenia (con-vpn-1) +@@ -24842,9 +24884,9 @@ name id uuid stable-id type in + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -26936,12 +26978,12 @@ interface-name + + + <<< +-size: 5205 ++size: 5295 + 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: 5127 bytes + >>> + ========================================== + Connection profile details (con-vpn-1) +@@ -26950,9 +26992,9 @@ name id uuid stable-id type in + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -26978,12 +27020,12 @@ 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: 5351 + 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: 5173 bytes + >>> + ============================================ + Szczegóły profilu połączenia (con-vpn-1) +@@ -26992,9 +27034,9 @@ name id uuid stable-id type in + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -27020,12 +27062,12 @@ 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: 5295 + 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: 5127 bytes + >>> + ========================================== + Connection profile details (con-vpn-1) +@@ -27034,9 +27076,9 @@ name id uuid stable-id type in + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -27062,12 +27104,12 @@ 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: 5351 + 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: 5173 bytes + >>> + ============================================ + Szczegóły profilu połączenia (con-vpn-1) +@@ -27076,9 +27118,9 @@ name id uuid stable-id type in + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -27104,12 +27146,12 @@ 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: 3951 + 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: 3776 bytes + >>> + ========================================== + Connection profile details (con-vpn-1) +@@ -27118,9 +27160,9 @@ name id uuid stable-id type in + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -27136,12 +27178,12 @@ proxy none no -- -- + + + <<< +-size: 3884 ++size: 3974 + 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: 3789 bytes + >>> + ============================================ + Szczegóły profilu połączenia (con-vpn-1) +@@ -27150,9 +27192,9 @@ name id uuid stable-id type in + --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 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) ++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 dhcp-vendor-class-identifier ++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ++ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) -- + + name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode ra-timeout dhcp-duid dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-hostname-flags token + -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +@@ -29244,15 +29286,15 @@ 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 +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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::no:0 + proxy:none:no:: +@@ -29260,15 +29302,15 @@ 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 +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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::no:0 + proxy:none:no:: +@@ -29276,15 +29318,15 @@ 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 +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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::no:0 + proxy:none:no:: +@@ -29292,15 +29334,15 @@ 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 +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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::no:0 + proxy:none:no:: +@@ -29308,29 +29350,29 @@ 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 +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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::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 +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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::no:0 + proxy:none:no:: +@@ -30182,15 +30224,15 @@ 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 +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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::no:0 + proxy:none:no:: +@@ -30198,15 +30240,15 @@ 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 +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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::no:0 + proxy:none:no:: +@@ -30214,15 +30256,15 @@ 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 +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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::no:0 + proxy:none:no:: +@@ -30230,15 +30272,15 @@ 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 +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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::no:0 + proxy:none:no:: +@@ -30246,29 +30288,29 @@ 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 +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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::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 +-ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-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::no:0 + proxy:none:no:: +@@ -31120,12 +31162,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 +@@ -31174,6 +31216,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -31232,12 +31275,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 +@@ -31286,6 +31329,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -31344,12 +31388,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 +@@ -31398,6 +31442,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -31456,12 +31501,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 +@@ -31510,6 +31555,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -31568,12 +31614,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 +@@ -31622,6 +31668,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -31659,12 +31706,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 +@@ -31713,6 +31760,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -34830,12 +34878,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 +@@ -34884,6 +34932,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -34942,12 +34991,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 +@@ -34996,6 +35045,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -35054,12 +35104,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 +@@ -35108,6 +35158,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -35166,12 +35217,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 +@@ -35220,6 +35271,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -35278,12 +35330,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 +@@ -35332,6 +35384,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -35369,12 +35422,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 +@@ -35423,6 +35476,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ipv6.method: auto + ipv6.dns: -- + ipv6.dns-search: -- +@@ -38540,12 +38594,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) +@@ -38598,6 +38652,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -38665,12 +38720,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) +@@ -38723,6 +38778,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -38790,12 +38846,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) +@@ -38848,6 +38904,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -38915,12 +38972,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) +@@ -38973,6 +39030,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -39040,12 +39098,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) +@@ -39098,6 +39156,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -39139,12 +39198,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) +@@ -39197,6 +39256,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -42952,12 +43012,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) +@@ -43010,6 +43070,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -43077,12 +43138,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) +@@ -43135,6 +43196,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -43202,12 +43264,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) +@@ -43260,6 +43322,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -43327,12 +43390,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) +@@ -43385,6 +43448,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -43452,12 +43516,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) +@@ -43510,6 +43574,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: no + ipv4.may-fail: yes + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -43551,12 +43616,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) +@@ -43609,6 +43674,7 @@ ipv4.dhcp-hostname-flags: 0x0 (none) + ipv4.never-default: nie + ipv4.may-fail: tak + ipv4.dad-timeout: -1 (default) ++ipv4.dhcp-vendor-class-identifier: -- + ------------------------------------------------------------------------------- + ipv6.method: auto + ipv6.dns: -- +@@ -47364,12 +47430,12 @@ connection.interface-name: -- + ------------------------------------------------------------------------------- + + <<< +-size: 2553 ++size: 2588 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -47418,6 +47484,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -47476,12 +47543,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 2563 ++size: 2598 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -47530,6 +47597,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -47588,12 +47656,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 2553 ++size: 2588 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -47642,6 +47710,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -47700,12 +47769,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 2563 ++size: 2598 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -47754,6 +47823,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -47812,12 +47882,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 1983 ++size: 2018 + 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: 1854 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -47866,6 +47936,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -47903,12 +47974,12 @@ proxy.pac-url: + proxy.pac-script: + + <<< +-size: 1993 ++size: 2028 + 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: 1854 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -47957,6 +48028,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -51074,12 +51146,12 @@ connection.type:802-11-wireless + connection.interface-name: + + <<< +-size: 2565 ++size: 2600 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -51128,6 +51200,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -51186,12 +51259,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 2575 ++size: 2610 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -51240,6 +51313,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -51298,12 +51372,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 2565 ++size: 2600 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -51352,6 +51426,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -51410,12 +51485,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 2575 ++size: 2610 + 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: 2431 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -51464,6 +51539,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -51522,12 +51598,12 @@ VPN.CFG[2]:key2 = val2 + VPN.CFG[3]:key3 = val3 + + <<< +-size: 1995 ++size: 2030 + 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: 1854 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -51576,6 +51652,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +@@ -51613,12 +51690,12 @@ proxy.pac-url: + proxy.pac-script: + + <<< +-size: 2005 ++size: 2040 + 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: 1854 bytes + >>> + connection.id:con-vpn-1 + connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +@@ -51667,6 +51744,7 @@ ipv4.dhcp-hostname-flags:0x0 + ipv4.never-default:no + ipv4.may-fail:yes + ipv4.dad-timeout:-1 ++ipv4.dhcp-vendor-class-identifier: + ipv6.method:auto + ipv6.dns: + ipv6.dns-search: +diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c +index 31c822202..d351b2984 100644 +--- a/libnm-core/nm-setting-ip4-config.c ++++ b/libnm-core/nm-setting-ip4-config.c +@@ -38,11 +38,13 @@ + NM_GOBJECT_PROPERTIES_DEFINE_BASE ( + PROP_DHCP_CLIENT_ID, + PROP_DHCP_FQDN, ++ PROP_DHCP_VENDOR_CLASS_IDENTIFIER, + ); + + typedef struct { + char *dhcp_client_id; + char *dhcp_fqdn; ++ char *dhcp_vendor_class_identifier; + } NMSettingIP4ConfigPrivate; + + G_DEFINE_TYPE (NMSettingIP4Config, nm_setting_ip4_config, NM_TYPE_SETTING_IP_CONFIG) +@@ -88,6 +90,25 @@ nm_setting_ip4_config_get_dhcp_fqdn (NMSettingIP4Config *setting) + return NM_SETTING_IP4_CONFIG_GET_PRIVATE (setting)->dhcp_fqdn; + } + ++/** ++ * nm_setting_ip4_config_get_dhcp_vendor_class_identifier: ++ * @setting: the #NMSettingIP4Config ++ * ++ * Returns the value contained in the #NMSettingIP4Config:dhcp_vendor_class_identifier ++ * property. ++ * ++ * Returns: the vendor class identifier option to send to the DHCP server ++ * ++ * Since: 1.28, 1.26.4 ++ **/ ++const char * ++nm_setting_ip4_config_get_dhcp_vendor_class_identifier (NMSettingIP4Config *setting) ++{ ++ g_return_val_if_fail (NM_IS_SETTING_IP4_CONFIG (setting), NULL); ++ ++ return NM_SETTING_IP4_CONFIG_GET_PRIVATE (setting)->dhcp_vendor_class_identifier; ++} ++ + static gboolean + verify (NMSetting *setting, NMConnection *connection, GError **error) + { +@@ -206,6 +227,52 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) + return FALSE; + } + ++ if (priv->dhcp_vendor_class_identifier) { ++ const char * bin; ++ gsize unescaped_len; ++ gs_free char *to_free = NULL; ++ ++ if (priv->dhcp_vendor_class_identifier[0] == '\0') { ++ g_set_error_literal (error, ++ NM_CONNECTION_ERROR, ++ NM_CONNECTION_ERROR_INVALID_PROPERTY, ++ _ ("property cannot be an empty string")); ++ g_prefix_error (error, ++ "%s.%s: ", ++ NM_SETTING_IP4_CONFIG_SETTING_NAME, ++ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER); ++ return FALSE; ++ } ++ ++ bin = nm_utils_buf_utf8safe_unescape (priv->dhcp_vendor_class_identifier, ++ NM_UTILS_STR_UTF8_SAFE_FLAG_NONE, ++ &unescaped_len, ++ (gpointer *) &to_free); ++ /* a DHCP option cannot be longer than 255 bytes */ ++ if (unescaped_len > 255) { ++ g_set_error_literal (error, ++ NM_CONNECTION_ERROR, ++ NM_CONNECTION_ERROR_INVALID_PROPERTY, ++ _ ("property cannot be longer than 255 bytes")); ++ g_prefix_error (error, ++ "%s.%s: ", ++ NM_SETTING_IP4_CONFIG_SETTING_NAME, ++ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER); ++ return FALSE; ++ } ++ if (strlen (bin) != unescaped_len) { ++ g_set_error_literal (error, ++ NM_CONNECTION_ERROR, ++ NM_CONNECTION_ERROR_INVALID_PROPERTY, ++ _ ("property cannot contain any nul bytes")); ++ g_prefix_error (error, ++ "%s.%s: ", ++ NM_SETTING_IP4_CONFIG_SETTING_NAME, ++ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER); ++ return FALSE; ++ } ++ } ++ + /* Failures from here on are NORMALIZABLE_ERROR... */ + + if ( nm_streq (method, NM_SETTING_IP4_CONFIG_METHOD_SHARED) +@@ -474,6 +541,9 @@ get_property (GObject *object, guint prop_id, + case PROP_DHCP_FQDN: + g_value_set_string (value, nm_setting_ip4_config_get_dhcp_fqdn (s_ip4)); + break; ++ case PROP_DHCP_VENDOR_CLASS_IDENTIFIER: ++ g_value_set_string (value, nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4)); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -495,6 +565,10 @@ set_property (GObject *object, guint prop_id, + g_free (priv->dhcp_fqdn); + priv->dhcp_fqdn = g_value_dup_string (value); + break; ++ case PROP_DHCP_VENDOR_CLASS_IDENTIFIER: ++ g_free (priv->dhcp_vendor_class_identifier); ++ priv->dhcp_vendor_class_identifier = g_value_dup_string (value); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -528,6 +602,7 @@ finalize (GObject *object) + + g_free (priv->dhcp_client_id); + g_free (priv->dhcp_fqdn); ++ g_free (priv->dhcp_vendor_class_identifier); + + G_OBJECT_CLASS (nm_setting_ip4_config_parent_class)->finalize (object); + } +@@ -806,6 +881,32 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass) + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); + ++ /** ++ * NMSettingIP4Config:dhcp-vendor-class-identifier: ++ * ++ * The Vendor Class Identifier DHCP option (60). ++ * Special characters in the data string may be escaped using C-style escapes, ++ * nevertheless this property cannot contain nul bytes. ++ * If the per-profile value is unspecified (the default), ++ * a global connection default gets consulted. ++ * If still unspecified, the DHCP option is not sent to the server. ++ * ++ * Since 1.28, 1.26.4 ++ */ ++ /* ---ifcfg-rh--- ++ * property: dhcp-vendor-class-identifier ++ * variable: DHCP_VENDOR_CLASS_IDENTIFIER(+) ++ * description: The Vendor Class Identifier DHCP option (60). ++ * example: DHCP_VENDOR_CLASS_IDENTIFIER=foo ++ * ---end--- ++ */ ++ obj_properties[PROP_DHCP_VENDOR_CLASS_IDENTIFIER] ++ = g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, ++ "", ++ "", ++ NULL, ++ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); ++ + /* IP4-specific property overrides */ + + /* ---dbus--- +diff --git a/libnm-core/nm-setting-ip4-config.h b/libnm-core/nm-setting-ip4-config.h +index fedec334a..a89fd43cf 100644 +--- a/libnm-core/nm-setting-ip4-config.h ++++ b/libnm-core/nm-setting-ip4-config.h +@@ -24,8 +24,9 @@ G_BEGIN_DECLS + + #define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4" + +-#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID "dhcp-client-id" +-#define NM_SETTING_IP4_CONFIG_DHCP_FQDN "dhcp-fqdn" ++#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID "dhcp-client-id" ++#define NM_SETTING_IP4_CONFIG_DHCP_FQDN "dhcp-fqdn" ++#define NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER "dhcp-vendor-class-identifier" + + /** + * NM_SETTING_IP4_CONFIG_METHOD_AUTO: +@@ -95,6 +96,9 @@ const char *nm_setting_ip4_config_get_dhcp_client_id (NMSettingIP4Config *se + NM_AVAILABLE_IN_1_2 + const char *nm_setting_ip4_config_get_dhcp_fqdn (NMSettingIP4Config *setting); + ++NM_AVAILABLE_IN_1_26_4 ++const char *nm_setting_ip4_config_get_dhcp_vendor_class_identifier (NMSettingIP4Config *setting); ++ + G_END_DECLS + + #endif /* __NM_SETTING_IP4_CONFIG_H__ */ +diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c +index f70a7d5a6..a968609d3 100644 +--- a/libnm-core/tests/test-general.c ++++ b/libnm-core/tests/test-general.c +@@ -3363,29 +3363,30 @@ test_connection_diff_a_only (void) + { NULL, NM_SETTING_DIFF_RESULT_UNKNOWN }, + } }, + { NM_SETTING_IP4_CONFIG_SETTING_NAME, { +- { NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_DNS, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_DNS_SEARCH, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_DNS_OPTIONS, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_ADDRESSES, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_GATEWAY, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_ROUTES, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_ROUTE_METRIC, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_ROUTE_TABLE, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_ROUTING_RULES, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_DHCP_HOSTNAME_FLAGS,NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP4_CONFIG_DHCP_FQDN, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_NEVER_DEFAULT, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_MAY_FAIL, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_DAD_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_DNS_PRIORITY, NM_SETTING_DIFF_RESULT_IN_A }, +- { NM_SETTING_IP_CONFIG_DHCP_IAID, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_DNS, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_DNS_SEARCH, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_DNS_OPTIONS, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_ADDRESSES, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_GATEWAY, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_ROUTES, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_ROUTE_METRIC, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_ROUTE_TABLE, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_ROUTING_RULES, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_DHCP_HOSTNAME_FLAGS, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP4_CONFIG_DHCP_FQDN, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_NEVER_DEFAULT, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_MAY_FAIL, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_DAD_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_DNS_PRIORITY, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP_CONFIG_DHCP_IAID, NM_SETTING_DIFF_RESULT_IN_A }, ++ { NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, NM_SETTING_DIFF_RESULT_IN_A }, + { NULL, NM_SETTING_DIFF_RESULT_UNKNOWN }, + } }, + }; +diff --git a/libnm/libnm.ver b/libnm/libnm.ver +index 44437435d..55af13a6f 100644 +--- a/libnm/libnm.ver ++++ b/libnm/libnm.ver +@@ -1741,3 +1741,8 @@ global: + nm_setting_option_set_boolean; + nm_setting_option_set_uint32; + } libnm_1_24_0; ++ ++libnm_1_26_4 { ++global: ++ nm_setting_ip4_config_get_dhcp_vendor_class_identifier; ++} libnm_1_26_0; +diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml +index 76a535fb5..91fb06bd9 100644 +--- a/man/NetworkManager.conf.xml ++++ b/man/NetworkManager.conf.xml +@@ -740,6 +740,10 @@ ipv6.ip6-privacy=0 + If left unspecified, the default value for + the interface type is used. + ++ ++ ipv4.dhcp-vendor-class-identifier ++ If left unspecified, the default is to not send the DHCP option to the server. ++ + + ipv4.dns-priority + If unspecified or zero, use 50 for VPN profiles +-- +2.26.2 + + +From 654a617bd6fcf32c035f502c5b06202984148d21 Mon Sep 17 00:00:00 2001 +From: Antonio Cardace +Date: Mon, 24 Aug 2020 18:15:57 +0200 +Subject: [PATCH 3/7] ifcfg-rh: add support for the + DHCP_VENDOR_CLASS_IDENTIFIER option + +https://bugzilla.redhat.com/show_bug.cgi?id=1871042 +Signed-off-by: Antonio Cardace +(cherry picked from commit e9ed5f02ba5723e1a93120359dd96190b564cc23) +(cherry picked from commit 8b791c98372c58537c546f3ed39a1f06c1f96816) +--- + src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 5 +++++ + src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c | 1 + + src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h | 2 +- + src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 5 +++++ + 4 files changed, 12 insertions(+), 1 deletion(-) + +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 1a9df92ce..82733895b 100644 +--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c ++++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +@@ -1803,6 +1803,11 @@ make_ip4_setting (shvarFile *ifcfg, + if (v) + g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, v, NULL); + ++ nm_clear_g_free (&value); ++ v = svGetValueStr (ifcfg, "DHCP_VENDOR_CLASS_IDENTIFIER", &value); ++ if (v) ++ g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, v, NULL); ++ + nm_clear_g_free (&value); + v = svGetValueStr (ifcfg, "DHCP_IAID", &value); + if (v) +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 d1500dbdb..975b65b02 100644 +--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c ++++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c +@@ -872,6 +872,7 @@ const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[] = { + _KEY_TYPE ("DHCP_HOSTNAME_FLAGS", NMS_IFCFG_KEY_TYPE_IS_PLAIN ), + _KEY_TYPE ("DHCP_IAID", NMS_IFCFG_KEY_TYPE_IS_PLAIN ), + _KEY_TYPE ("DHCP_SEND_HOSTNAME", NMS_IFCFG_KEY_TYPE_IS_PLAIN ), ++ _KEY_TYPE ("DHCP_VENDOR_CLASS_IDENTIFIER", NMS_IFCFG_KEY_TYPE_IS_PLAIN ), + _KEY_TYPE ("DHCPv6_DUID", NMS_IFCFG_KEY_TYPE_IS_PLAIN ), + _KEY_TYPE ("DHCPv6_IAID", NMS_IFCFG_KEY_TYPE_IS_PLAIN ), + _KEY_TYPE ("DNS", NMS_IFCFG_KEY_TYPE_IS_NUMBERED ), +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 459c5ae95..a864137ec 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[240]; ++extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[241]; + + 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 e6526944c..a75f595ae 100644 +--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c ++++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +@@ -2668,6 +2668,11 @@ write_ip4_setting (NMConnection *connection, + value = nm_setting_ip4_config_get_dhcp_client_id (NM_SETTING_IP4_CONFIG (s_ip4)); + svSetValueStr (ifcfg, "DHCP_CLIENT_ID", value); + ++ svSetValue ( ++ ifcfg, ++ "DHCP_VENDOR_CLASS_IDENTIFIER", ++ nm_setting_ip4_config_get_dhcp_vendor_class_identifier (NM_SETTING_IP4_CONFIG (s_ip4))); ++ + value = nm_setting_ip_config_get_dhcp_iaid (s_ip4); + svSetValueStr (ifcfg, "DHCP_IAID", value); + +-- +2.26.2 + + +From c03dcd27122f0489b86b1dd78bb594e66ea0500b Mon Sep 17 00:00:00 2001 +From: Antonio Cardace +Date: Mon, 24 Aug 2020 18:08:09 +0200 +Subject: [PATCH 4/7] core: add support for dhcpv4 vendor class identifier + option + +https://bugzilla.redhat.com/show_bug.cgi?id=1871042 +Signed-off-by: Antonio Cardace +(cherry picked from commit f71f40bc20ea085bf49f2a31fed5476bce0eee91) +(cherry picked from commit c7c5b88a833736d62c391baf0f5f9e2969440cba) +--- + src/devices/nm-device.c | 45 ++++++++++++++++++++++++++++++++++++++ + src/dhcp/nm-dhcp-client.c | 21 ++++++++++++++++++ + src/dhcp/nm-dhcp-client.h | 35 +++++++++++++++-------------- + src/dhcp/nm-dhcp-manager.c | 8 +++++++ + src/dhcp/nm-dhcp-manager.h | 1 + + src/dhcp/nm-dhcp-options.h | 1 + + src/nm-iface-helper.c | 1 + + 7 files changed, 96 insertions(+), 16 deletions(-) + +diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c +index 24209c861..f2887267d 100644 +--- a/src/devices/nm-device.c ++++ b/src/devices/nm-device.c +@@ -8749,11 +8749,53 @@ out_good: + return result; + } + ++static GBytes * ++dhcp4_get_vendor_class_identifier (NMDevice *self, NMSettingIP4Config *s_ip4) ++{ ++ gs_free char *config_data_prop = NULL; ++ gs_free char *to_free = NULL; ++ gboolean validate = FALSE; ++ const char *conn_prop; ++ GBytes *bytes = NULL; ++ const char *bin; ++ gsize len; ++ ++ conn_prop = nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4); ++ ++ if (!conn_prop) { ++ /* set in NetworkManager.conf ? */ ++ validate = TRUE; ++ config_data_prop = nm_config_data_get_connection_default ( ++ NM_CONFIG_GET_DATA, ++ NM_CON_DEFAULT ("ipv4.dhcp-vendor-class-identifier"), ++ self); ++ conn_prop = config_data_prop; ++ } ++ ++ if (conn_prop) { ++ bin = nm_utils_buf_utf8safe_unescape (conn_prop, ++ NM_UTILS_STR_UTF8_SAFE_FLAG_NONE, ++ &len, ++ (gpointer *) &to_free); ++ ++ if (validate && (bin[0] == '\0' || len > 255 || strlen (bin) != len)) ++ return NULL; ++ ++ if (to_free) ++ bytes = g_bytes_new_take (g_steal_pointer (&to_free), len); ++ else ++ bytes = g_bytes_new (bin, len); ++ } ++ ++ return bytes; ++} ++ + static NMActStageReturn + dhcp4_start (NMDevice *self) + { + NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); + NMSettingIPConfig *s_ip4; ++ gs_unref_bytes GBytes *vendor_class_identifier = NULL; + gs_unref_bytes GBytes *hwaddr = NULL; + gs_unref_bytes GBytes *bcast_hwaddr = NULL; + gs_unref_bytes GBytes *client_id = NULL; +@@ -8782,6 +8824,8 @@ dhcp4_start (NMDevice *self) + } + + client_id = dhcp4_get_client_id (self, connection, hwaddr); ++ vendor_class_identifier ++ = dhcp4_get_vendor_class_identifier (self, NM_SETTING_IP4_CONFIG (s_ip4)); + + g_warn_if_fail (priv->dhcp_data_4.client == NULL); + priv->dhcp_data_4.client = nm_dhcp_manager_start_ip4 (nm_dhcp_manager_get (), +@@ -8802,6 +8846,7 @@ dhcp4_start (NMDevice *self) + get_dhcp_timeout (self, AF_INET), + priv->dhcp_anycast_address, + NULL, ++ vendor_class_identifier, + &error); + if (!priv->dhcp_data_4.client) { + _LOGW (LOGD_DHCP4, "failure to start DHCP: %s", error->message); +diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c +index f7324baf6..0cc357ebb 100644 +--- a/src/dhcp/nm-dhcp-client.c ++++ b/src/dhcp/nm-dhcp-client.c +@@ -51,6 +51,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDhcpClient, + PROP_HOSTNAME, + PROP_HOSTNAME_FLAGS, + PROP_MUD_URL, ++ PROP_VENDOR_CLASS_IDENTIFIER, + ); + + typedef struct _NMDhcpClientPrivate { +@@ -62,6 +63,7 @@ typedef struct _NMDhcpClientPrivate { + GBytes * client_id; + char * hostname; + char * mud_url; ++ GBytes * vendor_class_identifier; + pid_t pid; + guint timeout_id; + guint watch_id; +@@ -322,6 +324,14 @@ nm_dhcp_client_get_mud_url (NMDhcpClient *self) + return NM_DHCP_CLIENT_GET_PRIVATE (self)->mud_url; + } + ++GBytes * ++nm_dhcp_client_get_vendor_class_identifier (NMDhcpClient *self) ++{ ++ g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); ++ ++ return NM_DHCP_CLIENT_GET_PRIVATE (self)->vendor_class_identifier; ++} ++ + /*****************************************************************************/ + + static const char *state_table[NM_DHCP_STATE_MAX + 1] = { +@@ -1076,6 +1086,10 @@ set_property (GObject *object, guint prop_id, + /* construct-only */ + priv->timeout = g_value_get_uint (value); + break; ++ case PROP_VENDOR_CLASS_IDENTIFIER: ++ /* construct-only */ ++ priv->vendor_class_identifier = g_value_dup_boxed (value); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -1120,6 +1134,7 @@ dispose (GObject *object) + 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); ++ nm_clear_pointer (&priv->vendor_class_identifier, g_bytes_unref); + + G_OBJECT_CLASS (nm_dhcp_client_parent_class)->dispose (object); + +@@ -1237,6 +1252,12 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class) + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); + ++ obj_properties[PROP_VENDOR_CLASS_IDENTIFIER] = ++ g_param_spec_boxed (NM_DHCP_CLIENT_VENDOR_CLASS_IDENTIFIER, "", "", ++ G_TYPE_BYTES, ++ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | ++ G_PARAM_STATIC_STRINGS); ++ + g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); + + signals[SIGNAL_STATE_CHANGED] = +diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h +index 479ea000a..11e531999 100644 +--- a/src/dhcp/nm-dhcp-client.h ++++ b/src/dhcp/nm-dhcp-client.h +@@ -22,22 +22,23 @@ + #define NM_IS_DHCP_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_CLIENT)) + #define NM_DHCP_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_CLIENT, NMDhcpClientClass)) + +-#define NM_DHCP_CLIENT_ADDR_FAMILY "addr-family" +-#define NM_DHCP_CLIENT_FLAGS "flags" +-#define NM_DHCP_CLIENT_HWADDR "hwaddr" +-#define NM_DHCP_CLIENT_BROADCAST_HWADDR "broadcast-hwaddr" +-#define NM_DHCP_CLIENT_IFINDEX "ifindex" +-#define NM_DHCP_CLIENT_INTERFACE "iface" +-#define NM_DHCP_CLIENT_MULTI_IDX "multi-idx" +-#define NM_DHCP_CLIENT_HOSTNAME "hostname" +-#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" +-#define NM_DHCP_CLIENT_UUID "uuid" +-#define NM_DHCP_CLIENT_IAID "iaid" +-#define NM_DHCP_CLIENT_IAID_EXPLICIT "iaid-explicit" +-#define NM_DHCP_CLIENT_HOSTNAME_FLAGS "hostname-flags" ++#define NM_DHCP_CLIENT_ADDR_FAMILY "addr-family" ++#define NM_DHCP_CLIENT_FLAGS "flags" ++#define NM_DHCP_CLIENT_HWADDR "hwaddr" ++#define NM_DHCP_CLIENT_BROADCAST_HWADDR "broadcast-hwaddr" ++#define NM_DHCP_CLIENT_IFINDEX "ifindex" ++#define NM_DHCP_CLIENT_INTERFACE "iface" ++#define NM_DHCP_CLIENT_MULTI_IDX "multi-idx" ++#define NM_DHCP_CLIENT_HOSTNAME "hostname" ++#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" ++#define NM_DHCP_CLIENT_UUID "uuid" ++#define NM_DHCP_CLIENT_IAID "iaid" ++#define NM_DHCP_CLIENT_IAID_EXPLICIT "iaid-explicit" ++#define NM_DHCP_CLIENT_HOSTNAME_FLAGS "hostname-flags" ++#define NM_DHCP_CLIENT_VENDOR_CLASS_IDENTIFIER "vendor-class-identifier" + + #define NM_DHCP_CLIENT_SIGNAL_STATE_CHANGED "state-changed" + #define NM_DHCP_CLIENT_SIGNAL_PREFIX_DELEGATED "prefix-delegated" +@@ -150,6 +151,8 @@ gboolean nm_dhcp_client_get_info_only (NMDhcpClient *self); + + gboolean nm_dhcp_client_get_use_fqdn (NMDhcpClient *self); + ++GBytes *nm_dhcp_client_get_vendor_class_identifier (NMDhcpClient *self); ++ + gboolean nm_dhcp_client_start_ip4 (NMDhcpClient *self, + GBytes *client_id, + const char *dhcp_anycast_addr, +diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c +index 7565bfc8c..00e70da53 100644 +--- a/src/dhcp/nm-dhcp-manager.c ++++ b/src/dhcp/nm-dhcp-manager.c +@@ -225,6 +225,7 @@ client_start (NMDhcpManager *self, + NMSettingIP6ConfigPrivacy privacy, + const char *last_ip4_address, + guint needed_prefixes, ++ GBytes *vendor_class_identifier, + GError **error) + { + NMDhcpManagerPrivate *priv; +@@ -238,6 +239,9 @@ client_start (NMDhcpManager *self, + g_return_val_if_fail (ifindex > 0, NULL); + g_return_val_if_fail (uuid != NULL, NULL); + g_return_val_if_fail (!dhcp_client_id || g_bytes_get_size (dhcp_client_id) >= 2, NULL); ++ g_return_val_if_fail ( !vendor_class_identifier ++ || g_bytes_get_size (vendor_class_identifier) <= 255, ++ NULL); + g_return_val_if_fail (!error || !*error, NULL); + + if (!hwaddr || !bcast_hwaddr) { +@@ -309,6 +313,7 @@ client_start (NMDhcpManager *self, + NM_DHCP_CLIENT_ROUTE_METRIC, (guint) route_metric, + NM_DHCP_CLIENT_TIMEOUT, (guint) timeout, + NM_DHCP_CLIENT_HOSTNAME_FLAGS, (guint) hostname_flags, ++ NM_DHCP_CLIENT_VENDOR_CLASS_IDENTIFIER, vendor_class_identifier, + NM_DHCP_CLIENT_FLAGS, (guint) (0 + | (hostname_use_fqdn ? NM_DHCP_CLIENT_FLAGS_USE_FQDN : 0) + | (info_only ? NM_DHCP_CLIENT_FLAGS_INFO_ONLY : 0) +@@ -389,6 +394,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self, + guint32 timeout, + const char *dhcp_anycast_addr, + const char *last_ip_address, ++ GBytes *vendor_class_identifier, + GError **error) + { + NMDhcpManagerPrivate *priv; +@@ -448,6 +454,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self, + 0, + last_ip_address, + 0, ++ vendor_class_identifier, + error); + } + +@@ -513,6 +520,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self, + privacy, + NULL, + needed_prefixes, ++ NULL, + error); + } + +diff --git a/src/dhcp/nm-dhcp-manager.h b/src/dhcp/nm-dhcp-manager.h +index 88435282e..34993784b 100644 +--- a/src/dhcp/nm-dhcp-manager.h ++++ b/src/dhcp/nm-dhcp-manager.h +@@ -48,6 +48,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip4 (NMDhcpManager *manager, + guint32 timeout, + const char *dhcp_anycast_addr, + const char *last_ip_address, ++ GBytes *vendor_class_identifier, + GError **error); + + NMDhcpClient * nm_dhcp_manager_start_ip6 (NMDhcpManager *manager, +diff --git a/src/dhcp/nm-dhcp-options.h b/src/dhcp/nm-dhcp-options.h +index bc3df5acd..118ae4707 100644 +--- a/src/dhcp/nm-dhcp-options.h ++++ b/src/dhcp/nm-dhcp-options.h +@@ -59,6 +59,7 @@ typedef enum { + NM_DHCP_OPTION_DHCP4_SERVER_ID = 54, + NM_DHCP_OPTION_DHCP4_RENEWAL_T1_TIME = 58, + NM_DHCP_OPTION_DHCP4_REBINDING_T2_TIME = 59, ++ NM_DHCP_OPTION_DHCP4_VENDOR_CLASS_IDENTIFIER = 60, + NM_DHCP_OPTION_DHCP4_CLIENT_ID = 61, + NM_DHCP_OPTION_DHCP4_NWIP_DOMAIN = 62, + NM_DHCP_OPTION_DHCP4_NWIP_SUBOPTIONS = 63, +diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c +index c7d65d2a6..da84640d2 100644 +--- a/src/nm-iface-helper.c ++++ b/src/nm-iface-helper.c +@@ -538,6 +538,7 @@ main (int argc, char *argv[]) + NM_DHCP_TIMEOUT_DEFAULT, + NULL, + global_opt.dhcp4_address, ++ NULL, + &error); + if (!dhcp4_client) + g_error ("failure to start DHCP: %s", error->message); +-- +2.26.2 + + +From 23863fa81661f0d4a5da19ea44cf005e5878b2b5 Mon Sep 17 00:00:00 2001 +From: Antonio Cardace +Date: Mon, 24 Aug 2020 18:14:04 +0200 +Subject: [PATCH 5/7] dhcp: implement dhcp-vendor-class-identifier option for + internal DHCP client + +https://bugzilla.redhat.com/show_bug.cgi?id=1871042 +Signed-off-by: Antonio Cardace +(cherry picked from commit f8a729015380b367bd2ecff66f31cb6253793e50) +(cherry picked from commit 18ff5984f76fbebe12178ba301129221fc18c782) +--- + src/dhcp/nm-dhcp-nettools.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c +index fe6a4582b..56f7b6ce3 100644 +--- a/src/dhcp/nm-dhcp-nettools.c ++++ b/src/dhcp/nm-dhcp-nettools.c +@@ -1289,6 +1289,7 @@ ip4_start (NMDhcpClient *client, + struct in_addr last_addr = { 0 }; + const char *hostname; + const char *mud_url; ++ GBytes *vendor_class_identifier; + int r, i; + + g_return_val_if_fail (!priv->probe, FALSE); +@@ -1410,6 +1411,25 @@ ip4_start (NMDhcpClient *client, + } + } + ++ vendor_class_identifier = nm_dhcp_client_get_vendor_class_identifier (client); ++ if (vendor_class_identifier) { ++ const void *option_data; ++ gsize option_size; ++ ++ option_data = g_bytes_get_data (vendor_class_identifier, &option_size); ++ nm_assert (option_data); ++ nm_assert (option_size <= 255); ++ ++ r = n_dhcp4_client_probe_config_append_option (config, ++ NM_DHCP_OPTION_DHCP4_VENDOR_CLASS_IDENTIFIER, ++ option_data, ++ option_size); ++ if (r) { ++ set_error_nettools (error, r, "failed to set vendor class identifier"); ++ return FALSE; ++ } ++ } ++ + g_free (priv->lease_file); + priv->lease_file = g_steal_pointer (&lease_file); + +-- +2.26.2 + + +From 628fc722759d9872eec7589c8adcaaa4cca500cb Mon Sep 17 00:00:00 2001 +From: Antonio Cardace +Date: Mon, 24 Aug 2020 18:15:01 +0200 +Subject: [PATCH 6/7] dhcp: implement dhcp-vendor-class-identifier option for + systemd's DHCP client + +https://bugzilla.redhat.com/show_bug.cgi?id=1871042 +Signed-off-by: Antonio Cardace +(cherry picked from commit 5da0939a3f73aa002cb3d19e7d56087efec5d196) +(cherry picked from commit 76820f04c761abb0d49512e5b2d2078471193843) +--- + src/dhcp/nm-dhcp-systemd.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c +index 7ee101128..48b4dd7a1 100644 +--- a/src/dhcp/nm-dhcp-systemd.c ++++ b/src/dhcp/nm-dhcp-systemd.c +@@ -569,6 +569,7 @@ ip4_start (NMDhcpClient *client, + int arp_type; + GBytes *client_id; + gs_unref_bytes GBytes *client_id_new = NULL; ++ GBytes *vendor_class_identifier; + const uint8_t *client_id_arr; + size_t client_id_len; + struct in_addr last_addr = { 0 }; +@@ -698,6 +699,24 @@ ip4_start (NMDhcpClient *client, + } + } + ++ vendor_class_identifier = nm_dhcp_client_get_vendor_class_identifier (client); ++ if (vendor_class_identifier) { ++ const char *option_data; ++ gsize len; ++ ++ option_data = g_bytes_get_data (vendor_class_identifier, &len); ++ nm_assert (option_data); ++ nm_assert (len <= 255); ++ ++ option_data = nm_strndup_a (300, option_data, len, NULL); ++ ++ r = sd_dhcp_client_set_vendor_class_identifier (sd_client, option_data); ++ if (r < 0) { ++ nm_utils_error_set_errno (error, r, "failed to set DHCP vendor class identifier: %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"); +-- +2.26.2 + + +From 3566ab23a67197af1c84392c2ede9b17fbc791f7 Mon Sep 17 00:00:00 2001 +From: Antonio Cardace +Date: Wed, 26 Aug 2020 15:41:33 +0200 +Subject: [PATCH 7/7] downstream: patch to add + nm_setting_ip4_config_get_dhcp_vendor_class_identifier() API to RHEL 8.3 + +This patch makes the symbol available on NM 1.26.0 + +Signed-off-by: Antonio Cardace +--- + libnm-core/nm-core-internal.h | 8 ++++++++ + libnm-core/nm-setting-ip4-config.c | 2 +- + src/devices/nm-device.c | 2 +- + src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 2 +- + 4 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h +index 3a15d2e95..81417c4a4 100644 +--- a/libnm-core/nm-core-internal.h ++++ b/libnm-core/nm-core-internal.h +@@ -906,4 +906,12 @@ const NMVariantAttributeSpec *_nm_variant_attribute_spec_find_binary_search (con + + gboolean _nm_ip_tunnel_mode_is_layer2 (NMIPTunnelMode mode); + ++static inline const char * ++_nm_setting_ip4_config_get_dhcp_vendor_class_identifier (NMSettingIP4Config *setting) ++{ ++G_GNUC_BEGIN_IGNORE_DEPRECATIONS ++ return nm_setting_ip4_config_get_dhcp_vendor_class_identifier (setting); ++G_GNUC_END_IGNORE_DEPRECATIONS ++} ++ + #endif +diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c +index d351b2984..0b8dc89b3 100644 +--- a/libnm-core/nm-setting-ip4-config.c ++++ b/libnm-core/nm-setting-ip4-config.c +@@ -542,7 +542,7 @@ get_property (GObject *object, guint prop_id, + g_value_set_string (value, nm_setting_ip4_config_get_dhcp_fqdn (s_ip4)); + break; + case PROP_DHCP_VENDOR_CLASS_IDENTIFIER: +- g_value_set_string (value, nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4)); ++ g_value_set_string (value, _nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c +index f2887267d..72a2b1008 100644 +--- a/src/devices/nm-device.c ++++ b/src/devices/nm-device.c +@@ -8760,7 +8760,7 @@ dhcp4_get_vendor_class_identifier (NMDevice *self, NMSettingIP4Config *s_ip4) + const char *bin; + gsize len; + +- conn_prop = nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4); ++ conn_prop = _nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4); + + if (!conn_prop) { + /* set in NetworkManager.conf ? */ +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 a75f595ae..17c261bdc 100644 +--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c ++++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +@@ -2671,7 +2671,7 @@ write_ip4_setting (NMConnection *connection, + svSetValue ( + ifcfg, + "DHCP_VENDOR_CLASS_IDENTIFIER", +- nm_setting_ip4_config_get_dhcp_vendor_class_identifier (NM_SETTING_IP4_CONFIG (s_ip4))); ++ _nm_setting_ip4_config_get_dhcp_vendor_class_identifier (NM_SETTING_IP4_CONFIG (s_ip4))); + + value = nm_setting_ip_config_get_dhcp_iaid (s_ip4); + svSetValueStr (ifcfg, "DHCP_IAID", value); +-- +2.26.2 + diff --git a/SOURCES/1017-initrd-parse-rd.net.dhcp.vendor-class-rh1870692.patch b/SOURCES/1017-initrd-parse-rd.net.dhcp.vendor-class-rh1870692.patch new file mode 100644 index 0000000..177b3ec --- /dev/null +++ b/SOURCES/1017-initrd-parse-rd.net.dhcp.vendor-class-rh1870692.patch @@ -0,0 +1,432 @@ +From d15b8c6c561258eb0e0b92d6176a16ccc8c23be3 Mon Sep 17 00:00:00 2001 +From: Antonio Cardace +Date: Thu, 27 Aug 2020 18:18:31 +0200 +Subject: [PATCH 1/4] core: add 'dhcp-vendor-class-identifier' validation + function + +So that it can be reused. + +Signed-off-by: Antonio Cardace +(cherry picked from commit 5cca669ff39c6909be906e8974e424ffd2ea42c2) +(cherry picked from commit 847488cb2f9f0ba8017938e0876677180c0c91a0) +--- + .../nm-libnm-core-utils.c | 55 +++++++++++++++++++ + .../nm-libnm-core-utils.h | 2 + + libnm-core/nm-setting-ip4-config.c | 48 +--------------- + po/POTFILES.in | 1 + + src/devices/nm-device.c | 11 ++-- + 5 files changed, 65 insertions(+), 52 deletions(-) + +diff --git a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c +index f2c85cc60..8be7d913f 100644 +--- a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c ++++ b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c +@@ -6,6 +6,8 @@ + + #include "nm-common-macros.h" + ++#include "nm-errors.h" ++ + #include + + /*****************************************************************************/ +@@ -257,3 +259,56 @@ NM_UTILS_ENUM2STR_DEFINE (nm_utils_route_type2str, guint8, + NM_UTILS_ENUM2STR (RTN_UNREACHABLE, "unreachable"), + NM_UTILS_ENUM2STR (RTN_UNSPEC, "unspecified"), + ); ++ ++gboolean ++nm_utils_validate_dhcp4_vendor_class_id (const char *vci, GError **error) ++{ ++ const char * bin; ++ gsize unescaped_len; ++ gs_free char *to_free = NULL; ++ ++ g_return_val_if_fail (!error || !(*error), FALSE); ++ g_return_val_if_fail (vci, FALSE); ++ ++ if (vci[0] == '\0') { ++ g_set_error_literal (error, ++ NM_CONNECTION_ERROR, ++ NM_CONNECTION_ERROR_INVALID_PROPERTY, ++ _ ("property cannot be an empty string")); ++ g_prefix_error (error, ++ "%s.%s: ", ++ NM_SETTING_IP4_CONFIG_SETTING_NAME, ++ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER); ++ return FALSE; ++ } ++ ++ bin = nm_utils_buf_utf8safe_unescape (vci, ++ NM_UTILS_STR_UTF8_SAFE_FLAG_NONE, ++ &unescaped_len, ++ (gpointer *) &to_free); ++ /* a DHCP option cannot be longer than 255 bytes */ ++ if (unescaped_len > 255) { ++ g_set_error_literal (error, ++ NM_CONNECTION_ERROR, ++ NM_CONNECTION_ERROR_INVALID_PROPERTY, ++ _ ("property cannot be longer than 255 bytes")); ++ g_prefix_error (error, ++ "%s.%s: ", ++ NM_SETTING_IP4_CONFIG_SETTING_NAME, ++ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER); ++ return FALSE; ++ } ++ if (strlen (bin) != unescaped_len) { ++ g_set_error_literal (error, ++ NM_CONNECTION_ERROR, ++ NM_CONNECTION_ERROR_INVALID_PROPERTY, ++ _ ("property cannot contain any nul bytes")); ++ g_prefix_error (error, ++ "%s.%s: ", ++ NM_SETTING_IP4_CONFIG_SETTING_NAME, ++ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER); ++ return FALSE; ++ } ++ ++ return TRUE; ++} +diff --git a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h +index bb3fa5fcf..6c1337d88 100644 +--- a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h ++++ b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h +@@ -140,4 +140,6 @@ guint8 nm_utils_route_type_by_name (const char *name); + + const char *nm_utils_route_type2str (guint8 val, char *buf, gsize len); + ++gboolean nm_utils_validate_dhcp4_vendor_class_id (const char *vci, GError **error); ++ + #endif /* __NM_LIBNM_SHARED_UTILS_H__ */ +diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c +index 0b8dc89b3..7ffefc25b 100644 +--- a/libnm-core/nm-setting-ip4-config.c ++++ b/libnm-core/nm-setting-ip4-config.c +@@ -227,51 +227,9 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) + return FALSE; + } + +- if (priv->dhcp_vendor_class_identifier) { +- const char * bin; +- gsize unescaped_len; +- gs_free char *to_free = NULL; +- +- if (priv->dhcp_vendor_class_identifier[0] == '\0') { +- g_set_error_literal (error, +- NM_CONNECTION_ERROR, +- NM_CONNECTION_ERROR_INVALID_PROPERTY, +- _ ("property cannot be an empty string")); +- g_prefix_error (error, +- "%s.%s: ", +- NM_SETTING_IP4_CONFIG_SETTING_NAME, +- NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER); +- return FALSE; +- } +- +- bin = nm_utils_buf_utf8safe_unescape (priv->dhcp_vendor_class_identifier, +- NM_UTILS_STR_UTF8_SAFE_FLAG_NONE, +- &unescaped_len, +- (gpointer *) &to_free); +- /* a DHCP option cannot be longer than 255 bytes */ +- if (unescaped_len > 255) { +- g_set_error_literal (error, +- NM_CONNECTION_ERROR, +- NM_CONNECTION_ERROR_INVALID_PROPERTY, +- _ ("property cannot be longer than 255 bytes")); +- g_prefix_error (error, +- "%s.%s: ", +- NM_SETTING_IP4_CONFIG_SETTING_NAME, +- NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER); +- return FALSE; +- } +- if (strlen (bin) != unescaped_len) { +- g_set_error_literal (error, +- NM_CONNECTION_ERROR, +- NM_CONNECTION_ERROR_INVALID_PROPERTY, +- _ ("property cannot contain any nul bytes")); +- g_prefix_error (error, +- "%s.%s: ", +- NM_SETTING_IP4_CONFIG_SETTING_NAME, +- NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER); +- return FALSE; +- } +- } ++ if ( priv->dhcp_vendor_class_identifier ++ && !nm_utils_validate_dhcp4_vendor_class_id (priv->dhcp_vendor_class_identifier, error)) ++ return FALSE; + + /* Failures from here on are NORMALIZABLE_ERROR... */ + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 25cb5c4a6..ea2eafa3f 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -59,6 +59,7 @@ libnm-core/nm-dbus-utils.c + libnm-core/nm-keyfile/nm-keyfile-utils.c + libnm-core/nm-keyfile/nm-keyfile.c + libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c ++libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c + libnm-core/nm-setting-6lowpan.c + libnm-core/nm-setting-8021x.c + libnm-core/nm-setting-adsl.c +diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c +index 72a2b1008..012af4d9a 100644 +--- a/src/devices/nm-device.c ++++ b/src/devices/nm-device.c +@@ -8754,7 +8754,6 @@ dhcp4_get_vendor_class_identifier (NMDevice *self, NMSettingIP4Config *s_ip4) + { + gs_free char *config_data_prop = NULL; + gs_free char *to_free = NULL; +- gboolean validate = FALSE; + const char *conn_prop; + GBytes *bytes = NULL; + const char *bin; +@@ -8764,12 +8763,14 @@ dhcp4_get_vendor_class_identifier (NMDevice *self, NMSettingIP4Config *s_ip4) + + if (!conn_prop) { + /* set in NetworkManager.conf ? */ +- validate = TRUE; + config_data_prop = nm_config_data_get_connection_default ( + NM_CONFIG_GET_DATA, + NM_CON_DEFAULT ("ipv4.dhcp-vendor-class-identifier"), + self); +- conn_prop = config_data_prop; ++ ++ if ( config_data_prop ++ && nm_utils_validate_dhcp4_vendor_class_id (config_data_prop, NULL)) ++ conn_prop = config_data_prop; + } + + if (conn_prop) { +@@ -8777,10 +8778,6 @@ dhcp4_get_vendor_class_identifier (NMDevice *self, NMSettingIP4Config *s_ip4) + NM_UTILS_STR_UTF8_SAFE_FLAG_NONE, + &len, + (gpointer *) &to_free); +- +- if (validate && (bin[0] == '\0' || len > 255 || strlen (bin) != len)) +- return NULL; +- + if (to_free) + bytes = g_bytes_new_take (g_steal_pointer (&to_free), len); + else +-- +2.26.2 + + +From a491bad06f7c29b257fd948f2149ef80b179da22 Mon Sep 17 00:00:00 2001 +From: Antonio Cardace +Date: Thu, 27 Aug 2020 17:43:54 +0200 +Subject: [PATCH 2/4] initrd: parse 'rd.net.dhcp.vendor-class' kernel cmdline + arg + +This arguments makes NM set the ipv4.dhcp-vendor-class-identifier +property for all connections. + +https://bugzilla.redhat.com/show_bug.cgi?id=1872299 + +Signed-off-by: Antonio Cardace +(cherry picked from commit c056cb9306be29a2c194a308b3b6cc639980abe2) +(cherry picked from commit 15856a4fa20feaae6bd073fc2874180b2a1a335d) +--- + src/initrd/nmi-cmdline-reader.c | 6 ++++ + src/initrd/tests/test-cmdline-reader.c | 47 ++++++++++++++++++++++++++ + 2 files changed, 53 insertions(+) + +diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c +index be39ef896..ba747b30a 100644 +--- a/src/initrd/nmi-cmdline-reader.c ++++ b/src/initrd/nmi-cmdline-reader.c +@@ -28,6 +28,7 @@ typedef struct { + /* Parameters to be set for all connections */ + gboolean ignore_auto_dns; + int dhcp_timeout; ++ char *dhcp4_vci; + } Reader; + + static Reader * +@@ -52,6 +53,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_clear_g_free (&reader->dhcp4_vci); + nm_g_slice_free (reader); + if (!free_hash) + return g_steal_pointer (&hash); +@@ -95,6 +97,7 @@ reader_create_connection (Reader *reader, + 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, ++ NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, reader->dhcp4_vci, + NULL); + + setting = nm_setting_ip6_config_new (); +@@ -927,6 +930,9 @@ nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv, char ** + else if (nm_streq (tag, "rd.net.timeout.dhcp")) { + reader->dhcp_timeout = _nm_utils_ascii_str_to_int64 (argument, + 10, 0, G_MAXINT32, 0); ++ } else if (nm_streq (tag, "rd.net.dhcp.vendor-class")) { ++ if (nm_utils_validate_dhcp4_vendor_class_id (argument, NULL)) ++ nm_utils_strdup_reset (&reader->dhcp4_vci, argument); + } + } + +diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c +index 7787cf5ea..a909bc380 100644 +--- a/src/initrd/tests/test-cmdline-reader.c ++++ b/src/initrd/tests/test-cmdline-reader.c +@@ -1485,6 +1485,52 @@ test_bootif_off (void) + g_assert_cmpstr (hostname, ==, NULL); + } + ++static void ++test_dhcp_vendor_class_id (void) ++{ ++ gs_unref_hashtable GHashTable *connections = NULL; ++ const char *const*ARGV = NM_MAKE_STRV ("rd.net.dhcp.vendor-class=testvci", ++ "ip=eno1:dhcp"); ++ NMConnection *connection; ++ NMSettingIP4Config *s_ip4; ++ gs_free char *hostname = NULL; ++ gs_free char *vci_long = NULL; ++ char vci_arg_long[512] = {0}; ++ ++ 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, "eno1"); ++ g_assert (connection); ++ nmtst_assert_connection_verifies_without_normalization (connection); ++ s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting_ip4_config (connection)); ++ g_assert_cmpstr (nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4), ==, "testvci"); ++ ++ ARGV = NM_MAKE_STRV ("rd.net.dhcp.vendor-class", ++ "ip=eno1:dhcp"); ++ connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname); ++ connection = g_hash_table_lookup (connections, "eno1"); ++ g_assert (connection); ++ nmtst_assert_connection_verifies_without_normalization (connection); ++ s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting_ip4_config (connection)); ++ g_assert (nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4) == NULL); ++ ++ ++ ++ memset (vci_arg_long, 'A', 400); ++ vci_long = g_strdup_printf ("rd.net.dhcp.vendor-class=%s", vci_arg_long); ++ ARGV = NM_MAKE_STRV (vci_long, ++ "ip=eno1:dhcp"); ++ connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname); ++ connection = g_hash_table_lookup (connections, "eno1"); ++ g_assert (connection); ++ nmtst_assert_connection_verifies_without_normalization (connection); ++ s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting_ip4_config (connection)); ++ g_assert (nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4) == NULL); ++} ++ + NMTST_DEFINE (); + + int main (int argc, char **argv) +@@ -1521,6 +1567,7 @@ int main (int argc, char **argv) + g_test_add_func ("/initrd/cmdline/bootif/hwtype", test_bootif_hwtype); + g_test_add_func ("/initrd/cmdline/bootif/off", test_bootif_off); + g_test_add_func ("/initrd/cmdline/neednet", test_neednet); ++ g_test_add_func ("/initrd/cmdline/dhcp/vendor_class_id", test_dhcp_vendor_class_id); + + return g_test_run (); + } +-- +2.26.2 + + +From bbd77df8ae1cc2510b1ff2c1c27ddf3d907faec3 Mon Sep 17 00:00:00 2001 +From: Antonio Cardace +Date: Tue, 1 Sep 2020 18:38:45 +0200 +Subject: [PATCH 3/4] initrd: fix memory leak + +Signed-off-by: Antonio Cardace +Fixes: 9f9609555d1c ('initrd: add configuration generator') +(cherry picked from commit d5c05d07c7aff317284d2d5197d75e0f605b4364) +(cherry picked from commit bba54613eb4255166c921844e8b6d2a2bd0000a1) +--- + shared/nm-glib-aux/nm-macros-internal.h | 8 ++++++++ + src/initrd/nm-initrd-generator.c | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h +index 15bcd7e58..57ddee050 100644 +--- a/shared/nm-glib-aux/nm-macros-internal.h ++++ b/shared/nm-glib-aux/nm-macros-internal.h +@@ -216,6 +216,14 @@ NM_AUTO_DEFINE_FCN0 (GError *, gs_local_free_error, g_error_free) + #define gs_unref_keyfile nm_auto(gs_local_keyfile_unref) + NM_AUTO_DEFINE_FCN0 (GKeyFile *, gs_local_keyfile_unref, g_key_file_unref) + ++/** ++ * gs_free_option_context: ++ * ++ * Call g_option_context_free() on a variable location when it goes out of scope. ++ */ ++#define gs_free_option_context nm_auto(gs_local_option_context) ++NM_AUTO_DEFINE_FCN0 (GOptionContext *, gs_local_option_context, g_option_context_free); ++ + /*****************************************************************************/ + + #include "nm-glib.h" +diff --git a/src/initrd/nm-initrd-generator.c b/src/initrd/nm-initrd-generator.c +index f984ed739..5a93480bf 100644 +--- a/src/initrd/nm-initrd-generator.c ++++ b/src/initrd/nm-initrd-generator.c +@@ -83,7 +83,7 @@ main (int argc, char *argv[]) + { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &remaining, NULL, NULL }, + { NULL } + }; +- GOptionContext *option_context; ++ gs_free_option_context GOptionContext *option_context = NULL; + gs_free_error GError *error = NULL; + gs_free char *hostname = NULL; + int errsv; +-- +2.26.2 + + +From 3dec958f413a4566e97183a522afb27b47a9146e Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Thu, 3 Sep 2020 11:35:40 +0200 +Subject: [PATCH 4/4] initrd/tests: fix memleak in test_dhcp_vendor_class_id() + +Having leaks in the tests, breaks running the test under valgrind. There +must be no leaks. + +Fixes: c056cb9306be ('initrd: parse 'rd.net.dhcp.vendor-class' kernel cmdline arg') +(cherry picked from commit bff23d15d41a42c7b5f43cb3d18d66e7cd289823) +(cherry picked from commit 5bea8db7ca8fd7520fe605b59e29b974e04b4721) +Signed-off-by: Antonio Cardace +--- + src/initrd/tests/test-cmdline-reader.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c +index a909bc380..a11b76e01 100644 +--- a/src/initrd/tests/test-cmdline-reader.c ++++ b/src/initrd/tests/test-cmdline-reader.c +@@ -1508,6 +1508,8 @@ test_dhcp_vendor_class_id (void) + s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting_ip4_config (connection)); + g_assert_cmpstr (nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4), ==, "testvci"); + ++ nm_clear_pointer (&connections, g_hash_table_unref); ++ + ARGV = NM_MAKE_STRV ("rd.net.dhcp.vendor-class", + "ip=eno1:dhcp"); + connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname); +@@ -1517,7 +1519,7 @@ test_dhcp_vendor_class_id (void) + s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting_ip4_config (connection)); + g_assert (nm_setting_ip4_config_get_dhcp_vendor_class_identifier (s_ip4) == NULL); + +- ++ nm_clear_pointer (&connections, g_hash_table_unref); + + memset (vci_arg_long, 'A', 400); + vci_long = g_strdup_printf ("rd.net.dhcp.vendor-class=%s", vci_arg_long); +-- +2.26.2 + diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec index 047f931..94379be 100644 --- a/SPECS/NetworkManager.spec +++ b/SPECS/NetworkManager.spec @@ -7,7 +7,7 @@ %global epoch_version 1 %global rpm_version 1.26.0 %global real_version 1.26.0 -%global release_version 6 +%global release_version 7 %global snapshot %{nil} %global git_sha %{nil} @@ -165,6 +165,8 @@ Patch1012: 1012-bond-let-reapply-reapply-rh1847814.patch Patch1013: 1013-dhcp6-hostname-rh1858344.patch Patch1014: 1014-settings-fix-wait-device-timeout-rh1853348.patch Patch1015: 1015-local-route-fixes-rh1868982.patch +Patch1016: 1016-dhcp-implement-dhcp-vendor-class-identifier-option-rh1871042.patch +Patch1017: 1017-initrd-parse-rd.net.dhcp.vendor-class-rh1870692.patch # The pregenerated docs contain default values and paths that depend # on the configure options when creating the source tarball. @@ -1112,6 +1114,10 @@ fi %changelog +* Tue Sep 1 2020 Antonio Cardace - 1:1.26.0-7 +- dhcp: add dhcp-vendor-class-identifier option (rh #1871042) +- initrd: parse 'rd.net.dhcp.vendor-class' kernel cmdline arg (rh #1872299) + * Mon Aug 17 2020 Thomas Haller - 1:1.26.0-6 - core: fix handling of local routes as default route and on D-Bus (rh #1868982)