From nobody Tue Jan 27 18:44:28 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 4f0vT94PWRz6QFxC for ; Tue, 27 Jan 2026 18:44:29 +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 4f0vT84CtSz3rgM for ; Tue, 27 Jan 2026 18:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539468; 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=imRStSnhfb/uAkZiIZgmxEyi0eeN0UotMYGcQVpF8o4=; b=sqCzuZlKJOqUz1otzsy6SwCVf+FCtnUFPObYViC1KZH/mppFSYHrBi5Fs0nYdbKwJdLQLs FS0ePuYWxFjqb+HZxZEO73LcW4IJGHPkgtoP7QS9cWkPsmQsLXbOYsRbiGaq3tFmiFeSMe r4t0Bp/IN1qL2h1fQDmPpfczTC5XgKrpFaGEL7tHtEVM93kRb6qQAqILsolmgzbx/rlrMh QoGz21a950G9xrXE3CaC5bMuOO+U//MS+zznaTUh1y+T2QAuYxjUWCTMEeapaxglTwqcu/ ZRoU3cNqRJ6q4t4AEV5Uo/T6+/xj33T0AjAEqeAltNIl33Udt+m0jc0nCC+0WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539468; 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=imRStSnhfb/uAkZiIZgmxEyi0eeN0UotMYGcQVpF8o4=; b=BF6igBQFJk+MVEHjS8FVOW1lObli74uo8BlLNuL958SLoAHF/4Fe9AimbcJG88puOPe1Es 1LHG9PuaT9WRphaqJHZSMZmKFLW+wF50GoM4CbC5JWBynFjK4WPxxGltgf8N+SWwHs6OBh KRwwxtsHnaSdDE0/ttbLo9A2SbjRxQNzxtBlMwGiHKw2hLmTR6soRQ/yi8zIen/L57ybc4 O2tuSbAxMchEvqYs20h2TTV+niWzj6hHQ4oEkc177S6CkOLOyFZTGfNIj2J2qY/8sK5fuL trdNvQiOCKDBtlOQOcMkdSJAkDR72ChkR50t4ajyjFYDoSqGmD9cEWkQKSjCcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539468; a=rsa-sha256; cv=none; b=DEg3h4l58vyyQT2MyfDEezgYk7Y/qbxIHymW0CjFx325v1CI0UftlMBJ4i0i7Tv65vXdFM InAtg9+LKUqTvLhCEwCmEjUReQfitG47bbsfAhn1EhkWKQXKHsYqqkezmTHCopmSK68DH9 zBNjO99STh/H7xXPIFJYhg+DIM4IoNvKIofT7QEUc0o0PzqLHzn3zyplK8z5VOG/3mNtXI ncP/5JdAwZcXkDpfhG9mMXPbbKM1dGR2bJVtwxy+S/1ZGJJVIe7OIuPv7Zd2rgwWs0JI5o 3dPZr63iNznSIs7FCvDYFCm7yQE3VtyrpBQ8RM+vBK0HgxEjVzusYJJ9bRu/2Q== 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 4f0vT83m8Fz39h for ; Tue, 27 Jan 2026 18:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id faff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:44:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a8ab78a0785f - stable/14 - ctld: Remove dead code in UCL parsing of hex DSCP values 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: a8ab78a0785f5e988179a6f15c1eecff7086d9b3 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:44:28 +0000 Message-Id: <6979078c.faff.39b965e1@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a8ab78a0785f5e988179a6f15c1eecff7086d9b3 commit a8ab78a0785f5e988179a6f15c1eecff7086d9b3 Author: John Baldwin AuthorDate: 2025-04-11 14:00:39 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:58 +0000 ctld: Remove dead code in UCL parsing of hex DSCP values libucl treats strings starting with "0x" as an integer if they do not contain invalid characters. The code also looks broken as it only calls strtol if the string exactly matches "0x" without any trailing characters. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D49644 (cherry picked from commit 251439f1a06867a6baccb274c671b2169c9959fd) --- usr.sbin/ctld/uclparse.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/usr.sbin/ctld/uclparse.cc b/usr.sbin/ctld/uclparse.cc index 05cfcc8df7e7..ccb0b45a5ab1 100644 --- a/usr.sbin/ctld/uclparse.cc +++ b/usr.sbin/ctld/uclparse.cc @@ -570,9 +570,6 @@ uclparse_dscp(const char *group_type, const char *pg_name, return (portal_group_set_dscp(ucl_object_toint(obj))); key = ucl_object_tostring(obj); - if (strcmp(key, "0x") == 0) - return (portal_group_set_dscp(strtol(key + 2, NULL, 16))); - if (strcmp(key, "be") == 0 || strcmp(key, "cs0") == 0) portal_group_set_dscp(IPTOS_DSCP_CS0 >> 2); else if (strcmp(key, "ef") == 0)