New upstream version 1.45.91 upstream/1.45.91

2 files changed, 18 insertions, 0 deletions

diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.c b/src/libnm-core-aux-intern/nm-libnm-core-utils.c
index 3e317e5b..b38accb2 100644
--- a/src/libnm-core-aux-intern/nm-libnm-core-utils.c
+++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.c
@@ -462,6 +462,23 @@ nm_utils_validate_dhcp4_vendor_class_id(const char *vci, GError **error)
 }
 
 gboolean
+nm_utils_validate_dhcp_dscp(const char *dscp, GError **error)
+{
+    g_return_val_if_fail(!error || !(*error), FALSE);
+    g_return_val_if_fail(dscp, FALSE);
+
+    if (!NM_IN_STRSET(dscp, "CS0", "CS4", "CS6")) {
+        g_set_error_literal(error,
+                            NM_CONNECTION_ERROR,
+                            NM_CONNECTION_ERROR_INVALID_PROPERTY,
+                            _("invalid DSCP value; allowed values are: 'CS0', 'CS4', 'CS6'"));
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+gboolean
 nm_settings_connection_validate_permission_user(const char *item, gssize len)
 {
     gsize l;
diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.h b/src/libnm-core-aux-intern/nm-libnm-core-utils.h
index b1336731..454fe4b3 100644
--- a/src/libnm-core-aux-intern/nm-libnm-core-utils.h
+++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.h
@@ -273,6 +273,7 @@ NMClientPermissionResult nm_client_permission_result_from_string(const char *nm)
 const char              *nm_client_permission_result_to_string(NMClientPermissionResult permission);
 
 gboolean nm_utils_validate_dhcp4_vendor_class_id(const char *vci, GError **error);
+gboolean nm_utils_validate_dhcp_dscp(const char *dscp, GError **error);
 
 /*****************************************************************************/