diff options
| author | Michael Biebl <biebl@debian.org> | 2024-02-13 22:24:20 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-02-13 22:24:20 +0100 |
| commit | 4e0c152343821d62f79db8f047395cabc3005b8e (patch) | |
| tree | 31f8fbf3be8013dc34844ac720eb71dabbf04075 /src/core/settings | |
| parent | 0260b90a50f9c49eb216249afea08ba3f3b8981f (diff) | |
| parent | 6681f77b757bbc42ce5c8868ee9142b7ebc8c059 (diff) | |
Update upstream source from tag 'upstream/1.45.91'
Update to upstream version '1.45.91' with Debian dir bebf00e416cd984203cf3c98296e0b1f3016c889
Diffstat (limited to 'src/core/settings')
| -rw-r--r-- | src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index e703bb73..07e5e64d 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -3360,6 +3360,8 @@ do_write_construct(NMConnection *connection, GError **error) { NMSettingConnection *s_con; + NMSettingIPConfig *s_ip4; + NMSettingIPConfig *s_ip6; nm_auto_shvar_file_close shvarFile *ifcfg = NULL; const char *ifcfg_name; gs_free char *ifcfg_name_free = NULL; @@ -3546,8 +3548,6 @@ do_write_construct(NMConnection *connection, has_complex_routes_v6 = utils_has_complex_routes(ifcfg_name, AF_INET6); if (has_complex_routes_v4 || has_complex_routes_v6) { - NMSettingIPConfig *s_ip4, *s_ip6; - s_ip4 = nm_connection_get_setting_ip4_config(connection); s_ip6 = nm_connection_get_setting_ip6_config(connection); if ((s_ip4 && nm_setting_ip_config_get_num_routes(s_ip4) > 0) @@ -3584,6 +3584,15 @@ do_write_construct(NMConnection *connection, } else route_ignore = FALSE; + if ((s_ip4 = nm_connection_get_setting_ip4_config(connection)) + && nm_setting_ip_config_get_dhcp_dscp(s_ip4)) { + set_error_unsupported(error, + connection, + NM_SETTING_IP4_CONFIG_SETTING_NAME "." NM_SETTING_IP_CONFIG_DHCP_DSCP, + FALSE); + return FALSE; + } + write_ip4_setting(connection, ifcfg, !route_ignore && route_path_is_svformat ? &route_content_svformat : NULL, |