From nobody Wed Feb 12 19:34:30 2025 X-Original-To: dev-commits-src-all@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 4YtT5z2jK3z5nG7h; Wed, 12 Feb 2025 19:34:31 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtT5z0pNLz3SqJ; Wed, 12 Feb 2025 19:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739388871; 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=LCGDLmbdNPyi3FcYZGEmtU+B+DRRhz4OjA69hqIu3jI=; b=ImhudcWTzau5HqiVNotOeU+6botnm2sRRU1Ik5XdYarnEMNObMtCBP90S6LgWVtD283HGk 9ixzeiL2W+1mO5n2yT7/KHf4RXn1yM98eB0s+G/FrwOAtRcWNfdx5npwn6bm6qjCupFKqT mtiRKnbPdlBu4+j6sNRcm9WFZYw8I5Hsc/t2jszt/o112+c6tLsIrT2eelDgUl9IZYqOTJ KGX+QekGcFeMH/UODWrY+NK9N8C0BF7pXIxqFLM6L5vsvDSr0oiTNx0efMc21yKv/d8DCQ gIOb5u/AXktt7SZc3OAlstEP7afsA7zXJu2ZbIH2vJR25P+gKD7XpsHT5+ikPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739388871; 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=LCGDLmbdNPyi3FcYZGEmtU+B+DRRhz4OjA69hqIu3jI=; b=yfvivFqlfva/DBgB9p1eDuANtf/J74CbQsdq2usJbMWt5VNEiJtPCie3JyWABrRXIaYLeR c5SvqRqahjnI8rprw5Cd4GAPIqPBxH8W9wdM0eHZAGjHQh67NdSgtQB3vNjFbJanWT1MCv DlAv/qD4/sIH8SM0OL0KzE4ARU3Kqs+/g4tOwko+jkmoSNPdyRFMbZdrE06il4jc7uMlBB hyArNbe+GUYdQrK2tptZLnaZe/g5n1uRnSIQcTv8oPDdvuWA+81kKJA3QWOsWNlzEa2Ilm +jhbBOxqSsK4qQG5OMbmQ/cM96OldVaaWGYFvq9A4NueTfsMjEHypr3cmXjS8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739388871; a=rsa-sha256; cv=none; b=e1xM1csLD3Rymq1VL9EgauCjTLBOgJadmEv1N7BN7u/1p6SYgoaQaUVpark9UcaSEVzFPp XvE2XBWiWXhUz7xSySikocNXBY3btVvopwG6d7mO5Wy22/Lp6RYULV0LHkZSk/Ch97Kdfk fFaPwirnVVAdQVEA9PELzZ7OZfGZAaw0zLfL9ESXh6qD9rTZaQoXCRubwt3PFkdpgljaeB ZlOQ7k/bJoYyKrAm6ZVdpbq0auZznC0qJ2uRAF/Riw5uAxpP3g05kiQMRAQ2qwpJImn++V f7GQYivLG7BNKdGOLIBzxthphGNs39P3sGCCBmqK6OgKLR5SpwCrwBy10qxfVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtT5z0BXHz1BlB; Wed, 12 Feb 2025 19:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CJYU4X059796; Wed, 12 Feb 2025 19:34:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CJYUw2059793; Wed, 12 Feb 2025 19:34:30 GMT (envelope-from git) Date: Wed, 12 Feb 2025 19:34:30 GMT Message-Id: <202502121934.51CJYUw2059793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 64905b38b1ae - main - ctld: Fix the isns-period and isns-timeout keywords in the UCL parser List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 64905b38b1aeeaa9faeb90192b762efc1c2216ee Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=64905b38b1aeeaa9faeb90192b762efc1c2216ee commit 64905b38b1aeeaa9faeb90192b762efc1c2216ee Author: John Baldwin AuthorDate: 2025-02-12 19:26:43 +0000 Commit: John Baldwin CommitDate: 2025-02-12 19:26:43 +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 --- 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);