Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Feb 2025 19:34:30 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 64905b38b1ae - main - ctld: Fix the isns-period and isns-timeout keywords in the UCL parser
Message-ID:  <202502121934.51CJYUw2059793@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=64905b38b1aeeaa9faeb90192b762efc1c2216ee

commit 64905b38b1aeeaa9faeb90192b762efc1c2216ee
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2025-02-12 19:26:43 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502121934.51CJYUw2059793>