diff options
| author | Michael Biebl <biebl@debian.org> | 2024-08-09 18:57:26 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-08-09 18:57:26 +0200 |
| commit | 5ebc16389d33662f712e49a8d5f3445f6b34ca05 (patch) | |
| tree | af14aec1d1271903e73ef2b45d6b9c6d6c188f44 /src/libnm-core-impl/tests/test-keyfile.c | |
| parent | f07580d7a481ecbc1e90033b7fa5607e0ab2d051 (diff) | |
| parent | e96d74409128c6a977e31f24fad9b267d2feb9a1 (diff) | |
Update upstream source from tag 'upstream/1.48.8'
Update to upstream version '1.48.8' with Debian dir b9f8c1b806c3088cd4a6040531628e5352ccb2ee
Diffstat (limited to 'src/libnm-core-impl/tests/test-keyfile.c')
| -rw-r--r-- | src/libnm-core-impl/tests/test-keyfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libnm-core-impl/tests/test-keyfile.c b/src/libnm-core-impl/tests/test-keyfile.c index 9f546971..1912782e 100644 --- a/src/libnm-core-impl/tests/test-keyfile.c +++ b/src/libnm-core-impl/tests/test-keyfile.c @@ -196,7 +196,7 @@ _nm_keyfile_read(GKeyFile *keyfile, { NMSettingConnection *s_con; - /* a non-slave connection must have a proxy setting, but + /* a non-port connection must have a proxy setting, but * keyfile reader does not add that (unless a [proxy] section * is present. */ s_con = nm_connection_get_setting_connection(con); @@ -857,8 +857,8 @@ test_bridge_port_vlans(void) "id=t\n" "type=dummy\n" "interface-name=dummy1\n" - "master=br0\n" - "slave-type=bridge\n" + "controller=br0\n" + "port-type=bridge\n" "\n" "[bridge-port]\n" "vlans=4094 pvid , 10-20 untagged\n" |