From nobody Tue Jan 27 18:44:07 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 4f0vSm1Flmz6QFvY for ; Tue, 27 Jan 2026 18:44:08 +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 4f0vSl5zRTz3rBZ for ; Tue, 27 Jan 2026 18:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539447; 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=qVyH2thfxTZ/PVewIw5QUQuvs3o8YZj3dVuhkE1kBtE=; b=lg48LYGIH6MPAmHEms9c0c8QNODmpj2lzCSVpN8Oqz1KdFtamHSHdlYZEyIHnBIczJyUZx r5SLjF+HHjUmpWeBP7Rw1Dur8p88py119fLCoIr5hVUHSt4VXWItgTLYUXtHwXroJZAzbg w6i8+VwdWPM5YqWvUxKZEE5R5FfscrrW6vGDkX0oEQK6RS+BWdL9NEARYHQwJBljiQy0PD +beUObU22Plzfs3s1l8hmrvQUtm9pBAItHhod47ZlCdpDJHURForTGUR8jOLt7VbtFxsXl YZ6WMzhKwlQtQ0BOQ5e0T1yGQnw/5VRJxEILuHdDsMNE+GRkj3VtFjkbDf5IIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539447; 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=qVyH2thfxTZ/PVewIw5QUQuvs3o8YZj3dVuhkE1kBtE=; b=eK9o5TAEZrp+g/sbrGDb30JRvZdjU2Xj68k7iLCgCKPO6dRQtqI5Gr7TRrxaZYpclTheYk tzbHLtejHma+W38RCmzBOG5RXpX8cqv1ll8tn4Ii6jRYhpX4nPah/VvPvIhoSc9TnKUcm1 Oq2MSCx8ZHIqEdSKru7V6FcqPUaf3y7mf0VRTwqD1+yaZSWR4vdYeOHvvWOe06KUl+OaMr FaoVmiQZhrueg7Px7uhw4SuCgpwFMDADGTJFps8fEOwx9WJ5EfnGKaTi2KDCxU19wYXPoD kNm84t9uj0AxkASLYBJHgotlgQveMY7qrev4qWcHxep8kfSC221q5pU1HjN9nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539447; a=rsa-sha256; cv=none; b=dioxll30NeBIMsEsKTYYDsMfpbbAvOmgDzDlp5kK2GrXPy7wiXR/72gbprF5w2NbN7R2TO itMsb3pOSscrj2KvL0MqivTFlbK3dlpBtztPy/6cj33ISfuWc9fWha9L+bJE96cRcGPeXA nKU9tpKDa3Sb2n0aiDt2YGGIKW5zzgjBwX9isdYQwWMEhc2iRiUeZQ7gkfB9mbjdPytg6Y Lm2+RpDXlve9XT5uua+cn41zcYyt3ecWhqdtO8eRxOBLNihHD3HoVvCa+cEwUgqxpPc5Ja 9/0Cotk3j6xFM3UmPGI+5DM1p3A3ABIKWHH759tRY5K5+Y1ucIvUEJQwPjWplg== 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 4f0vSl5Wlfz3Wg for ; Tue, 27 Jan 2026 18:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20251 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:44:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 67f12d18252a - stable/14 - ctld: Fix the isns-period and isns-timeout keywords in the 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: 67f12d18252a146439df723e5feb9ed3356f095b Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:44:07 +0000 Message-Id: <69790777.20251.2d4d0ee9@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=67f12d18252a146439df723e5feb9ed3356f095b commit 67f12d18252a146439df723e5feb9ed3356f095b Author: John Baldwin AuthorDate: 2025-02-12 19:26:43 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:56 +0000 ctld: Fix the isns-period and isns-timeout keywords in the UCL parser These keywords were setting the wrong configuration value (connection timeout). Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48930 (cherry picked from commit 64905b38b1aeeaa9faeb90192b762efc1c2216ee) --- usr.sbin/ctld/uclparse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c index ab34096699c8..bd3c90283f6d 100644 --- a/usr.sbin/ctld/uclparse.c +++ b/usr.sbin/ctld/uclparse.c @@ -310,7 +310,7 @@ uclparse_toplevel(const ucl_object_t *top) if (!strcmp(key, "isns-period")) { if (obj->type == UCL_INT) - conf->conf_timeout = ucl_object_toint(obj); + conf->conf_isns_period = ucl_object_toint(obj); else { log_warnx("\"isns-period\" property value is not integer"); return (false); @@ -319,7 +319,7 @@ uclparse_toplevel(const ucl_object_t *top) if (!strcmp(key, "isns-timeout")) { if (obj->type == UCL_INT) - conf->conf_timeout = ucl_object_toint(obj); + conf->conf_isns_timeout = ucl_object_toint(obj); else { log_warnx("\"isns-timeout\" property value is not integer"); return (false);