From nobody Tue Jan 27 18:44:10 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f0vSq3xmCz6QFF2 for ; Tue, 27 Jan 2026 18:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0vSq141fz3rHm for ; Tue, 27 Jan 2026 18:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cO/751JPHPPsWFe7o5KUk9pTl8beJD1S2ozf+E2AfiM=; b=FHfJi+GQB93j4nHZWzp9+QUZFZyI48Bpk9+1QXVmmQZBRs80eLunFcIbTRF0mWvdHXYDQW ZFdamvOzlMbCamaqd5MM0yq5yhcYADITeQXHRse0u2W9ma3WOM9v5kjL3jqMhL7aebYEAl CXH+PDPB145mAbEt2tZbXA6oo7rIiD/UCorqSoC8LvzZ36o0Qmlc3UI5RDzVJoUYPEqQcS Z68+3Gqy34iID1ZRiGJ3V9KpY9ZGks+cLvgCeoWKhbdIc9XSa3sjz1hlIJSzgF5plMuP8h K52fot0+kZ/+wUEeTyqoOn1cgebsyfbBk2Tlus0YORQHn4G4b1ZSmPmCGywqrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cO/751JPHPPsWFe7o5KUk9pTl8beJD1S2ozf+E2AfiM=; b=tLa6dhhTj03jjUOm4oZ89PUQdUpxOzysDID3yuLpgDhAFL99w9drU72Kz3R1rrqv0p/ooC EqXy5PAsfNQ91lCJ//scvkR2yQG0tV8nvx1xANkq2qZplHC7Fpvrl7cyh5w6woDhB5WM2s Z+tKLj5cSH6ee8GpJ4XIRuWzqzAzoix2xSXZh9lcC+FN+i0NpUgNNkF2piL4W2liEX0hav mz/eaoO8AMeYE19iMhwE5q38EgCKyNw0G6t63IL+ZjKwLQuknrYQ6nowdUnPjKx211o2II bogNdJMKmDVGt+ZDmO0ivrcDzhTZgbVDT95regGBGgVVg9QDrFNnDPJ71A0hPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539451; a=rsa-sha256; cv=none; b=svqPnUMHJh0wWA4VsotFvX/tCMOyIl4VMry8WhdQRmegahiJoQBASD+HwriNgxYb9uf+hc NxT604T2yvw9/PagC703QDJNwsdDwIfrbNweXc3FvlSeGswpkTzAfjQs8P3JH3CgEeSzgZ Aamcvigptrb0gRGNlzUW6iHHiWzW9qiMS8B8haktdBqJvAC+5ckASDUT1hgQquN1Gv9hZB R7a6X4jrBtM4PlGk4bZWl50pggG1+YXtx/Nzl1I3MsnK+7olWAX1f3LPqrXkzLZB1i4hEJ luviPLkfki87abF8tmPk/hNGiyyK2tHc4+//Dk66RF3Mv4mhE8Kl/RW9eXb55g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0vSq00lRz3YT for ; Tue, 27 Jan 2026 18:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20553 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:44:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 1b4e894eaeb1 - stable/14 - ctld: Fix parsing of text values for DSCP in UCL parser List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b4e894eaeb1058dfcdbab5197660573bcf19a46 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:44:10 +0000 Message-Id: <6979077a.20553.26866c51@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1b4e894eaeb1058dfcdbab5197660573bcf19a46 commit 1b4e894eaeb1058dfcdbab5197660573bcf19a46 Author: John Baldwin AuthorDate: 2025-02-12 19:27:53 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:56 +0000 ctld: Fix parsing of text values for DSCP in UCL parser Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48933 (cherry picked from commit 5e6a462277b1e28ea5338a3031c509c829dcf588) --- usr.sbin/ctld/uclparse.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c index b782779f4d0e..fb14a7fe618a 100644 --- a/usr.sbin/ctld/uclparse.c +++ b/usr.sbin/ctld/uclparse.c @@ -505,49 +505,49 @@ uclparse_dscp(const char *group_type, struct portal_group *portal_group, key = ucl_object_tostring(obj); if (strcmp(key, "0x") == 0) portal_group->pg_dscp = strtol(key + 2, NULL, 16); - else if (strcmp(key, "be") || strcmp(key, "cs0")) + else if (strcmp(key, "be") == 0 || strcmp(key, "cs0") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS0 >> 2; - else if (strcmp(key, "ef")) + else if (strcmp(key, "ef") == 0) portal_group->pg_dscp = IPTOS_DSCP_EF >> 2; - else if (strcmp(key, "cs0")) + else if (strcmp(key, "cs0") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS0 >> 2; - else if (strcmp(key, "cs1")) + else if (strcmp(key, "cs1") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS1 >> 2; - else if (strcmp(key, "cs2")) + else if (strcmp(key, "cs2") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS2 >> 2; - else if (strcmp(key, "cs3")) + else if (strcmp(key, "cs3") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS3 >> 2; - else if (strcmp(key, "cs4")) + else if (strcmp(key, "cs4") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS4 >> 2; - else if (strcmp(key, "cs5")) + else if (strcmp(key, "cs5") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS5 >> 2; - else if (strcmp(key, "cs6")) + else if (strcmp(key, "cs6") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS6 >> 2; - else if (strcmp(key, "cs7")) + else if (strcmp(key, "cs7") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS7 >> 2; - else if (strcmp(key, "af11")) + else if (strcmp(key, "af11") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF11 >> 2; - else if (strcmp(key, "af12")) + else if (strcmp(key, "af12") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF12 >> 2; - else if (strcmp(key, "af13")) + else if (strcmp(key, "af13") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF13 >> 2; - else if (strcmp(key, "af21")) + else if (strcmp(key, "af21") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF21 >> 2; - else if (strcmp(key, "af22")) + else if (strcmp(key, "af22") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF22 >> 2; - else if (strcmp(key, "af23")) + else if (strcmp(key, "af23") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF23 >> 2; - else if (strcmp(key, "af31")) + else if (strcmp(key, "af31") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF31 >> 2; - else if (strcmp(key, "af32")) + else if (strcmp(key, "af32") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF32 >> 2; - else if (strcmp(key, "af33")) + else if (strcmp(key, "af33") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF33 >> 2; - else if (strcmp(key, "af41")) + else if (strcmp(key, "af41") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF41 >> 2; - else if (strcmp(key, "af42")) + else if (strcmp(key, "af42") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF42 >> 2; - else if (strcmp(key, "af43")) + else if (strcmp(key, "af43") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF43 >> 2; else { log_warnx("\"dscp\" property value is not a supported textual value");