diff options
| author | Michael Biebl <biebl@debian.org> | 2022-12-03 22:59:09 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-12-03 22:59:09 +0100 |
| commit | 06356c8ac470c1fa46f881b0598ec48a653e69ae (patch) | |
| tree | 42e7714b4caedf4d23ebefd42d8d0afebc6f3569 /src/libnm-core-impl/nm-setting-bond-port.c | |
| parent | 78ecd0c8a4a337e38470f3fae5db74daf61ba86a (diff) | |
| parent | 372b62c2c25eb1f2e811f84849e9b69c40ae6245 (diff) | |
Merge branch 'debian/master' into debian/bullseye-backports
Diffstat (limited to 'src/libnm-core-impl/nm-setting-bond-port.c')
| -rw-r--r-- | src/libnm-core-impl/nm-setting-bond-port.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libnm-core-impl/nm-setting-bond-port.c b/src/libnm-core-impl/nm-setting-bond-port.c index 9b41a74f..7ea82a76 100644 --- a/src/libnm-core-impl/nm-setting-bond-port.c +++ b/src/libnm-core-impl/nm-setting-bond-port.c @@ -85,13 +85,15 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } slave_type = nm_setting_connection_get_slave_type(s_con); - if (!nm_streq0(slave_type, NM_SETTING_BOND_SETTING_NAME)) { + if (slave_type && !nm_streq(slave_type, NM_SETTING_BOND_SETTING_NAME)) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("A connection with a '%s' setting must have the slave-type set to '%s'"), + _("A connection with a '%s' setting must have the slave-type set to '%s'. " + "Instead it is '%s'"), NM_SETTING_BOND_PORT_SETTING_NAME, - NM_SETTING_BOND_SETTING_NAME); + NM_SETTING_BOND_SETTING_NAME, + slave_type); g_prefix_error(error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, |