From nobody Tue Jan 27 18:43:51 2026 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 4f0vSR5Mp5z6QFZd for ; Tue, 27 Jan 2026 18:43:51 +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 4f0vSR2pytz3qnR for ; Tue, 27 Jan 2026 18:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539431; 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=B9UbmmgWM8ZeViUdjsoc53ICgpyvxai4Qbp8Ehn5gyE=; b=wNqCwmk3iTlsJcq8CVXcvbLw8Zt4B/UZT0JyKD8B1skB1kUUjy5RVZQIL/9ZOxgt1b7EZ0 Ot3YFvBPAmVHzLAKHfRVheMYjM44BoDJXPFpeQMYZ0EtkF2gqZiBAlrWHi4M2OliP7XFaD 8DDmpQA0mTLVLG0S2i7KWxxTLleYe5HaPAJ+/kcwgcXb4rfoA8iZobkBEp0TcwBstCnL6G udS1Pl0cICsvydeQSpNHmp+MWEj7hzYn7WmDVLsakNSiRTjrQKlyX4uSlSAe4m2BNIP5wB JW9mqVkb7+zvSEf9R6KxIXFg0O0qB459HcLLzTNSqHnCT5MkscmZfEDAcuWZQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539431; 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=B9UbmmgWM8ZeViUdjsoc53ICgpyvxai4Qbp8Ehn5gyE=; b=WUP0+Lkm+9aEldAYYQR8NRbiQNakP6I1IPJH3VTtV8CtHD3HBO2jw/oMwHxvdGeij1HskD upCx/zR93E2CJJXNBAewvllMAWAZpHI9H3Pi+D4DeRK3ps5cfNbD9qRQkgBvaQgS76JwhL CnCErsZaDBv1yDbBJN1+nEPj/Qf/OFoHhQMNgXtEew/tEp2bVZIYklrpvFaJ/EWlEZ0jZx ZhD819etR+XDojXx7MP1XZcUUuGcOxrSjorRbBdFjxLnnPgVVVT02G66DLf47H1iKhTePj ++5aLpg7kBQfUIjUGgbAz+fUhEt+myMiKxRCoGyhHsBfZ87ZTgtt4le2Tajw6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539431; a=rsa-sha256; cv=none; b=BXuwBy84aeNhZOtz29JhJH84YlivfwR3XqksfUXu/pN6+f8ciiEi/3QE6g6OPqPkdjUZZC on65/A/Mwzd2aPk8zF1YdsbD9AE9bBLkbSS1TnEmG8hUMyLTe07lNVR420kM48EME3PFzA 5aLYfXIBdiayHi4fNbUObTamKZgcBa87cnM2Rdmk5twgvwNsA1FTIm6BEP0nUOS3ixEmNk WjKslvcYSFrKWlStSUEwJTKc+loD3x5IrwYEo1X8/Cmh3l1oerGKx6N7UIkpWsbmEVWOGF /fufC3/Hy3X4+jI9halKZRw//Fu6Tuf8uzFOIhnbIj+vBR/AHl8UX/NHrjoOHw== 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 4f0vSR20hwz3YC for ; Tue, 27 Jan 2026 18:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2054f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:43:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 5535f9ea4aec - stable/14 - ctld: Trim trailing whitespace 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5535f9ea4aeca8015fc339e1ee5e3042fd52e816 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:43:51 +0000 Message-Id: <69790767.2054f.4f805122@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5535f9ea4aeca8015fc339e1ee5e3042fd52e816 commit 5535f9ea4aeca8015fc339e1ee5e3042fd52e816 Author: John Baldwin AuthorDate: 2025-01-18 17:19:41 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:55 +0000 ctld: Trim trailing whitespace Sponsored by: Chelsio Communications (cherry picked from commit 237e9b7f5e90debb31ae7fd1e0a288e302659bfd) --- usr.sbin/ctld/ctld.c | 6 +++--- usr.sbin/ctld/parse.y | 2 +- usr.sbin/ctld/uclparse.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index af8874bd00b8..0e9c7366d9ff 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -946,7 +946,7 @@ isns_register(struct isns *isns, struct isns *oldisns) error = gethostname(hostname, sizeof(hostname)); if (error != 0) log_err(1, "gethostname"); - + if (oldisns == NULL || TAILQ_EMPTY(&oldisns->i_conf->conf_targets)) oldisns = isns; isns_do_deregister(oldisns, s, hostname); @@ -974,7 +974,7 @@ isns_check(struct isns *isns) error = gethostname(hostname, sizeof(hostname)); if (error != 0) log_err(1, "gethostname"); - + res = isns_do_check(isns, s, hostname); if (res < 0) { isns_do_deregister(isns, s, hostname); @@ -1001,7 +1001,7 @@ isns_deregister(struct isns *isns) error = gethostname(hostname, sizeof(hostname)); if (error != 0) log_err(1, "gethostname"); - + isns_do_deregister(isns, s, hostname); close(s); set_timeout(0, false); diff --git a/usr.sbin/ctld/parse.y b/usr.sbin/ctld/parse.y index d8274b623d3a..128a5b4ea042 100644 --- a/usr.sbin/ctld/parse.y +++ b/usr.sbin/ctld/parse.y @@ -115,7 +115,7 @@ debug: DEBUG STR free($2); return (1); } - + conf->conf_debug = tmp; } ; diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c index e9e42bdf953e..b93142ede8a4 100644 --- a/usr.sbin/ctld/uclparse.c +++ b/usr.sbin/ctld/uclparse.c @@ -111,7 +111,7 @@ uclparse_chap_mutual(struct auth_group *auth_group, const ucl_object_t *obj) log_warnx("chap-mutual section in auth-group \"%s\" is missing " "\"mutual-user\" string key", auth_group->ag_name); return (1); - } + } mutual_secret = ucl_object_find_key(obj, "mutual-secret"); if (!secret || secret->type != UCL_STRING) { @@ -317,7 +317,7 @@ uclparse_toplevel(const ucl_object_t *top) log_warnx("\"isns-period\" property value is not integer"); return (1); } - } + } if (!strcmp(key, "isns-timeout")) { if (obj->type == UCL_INT) @@ -462,7 +462,7 @@ uclparse_auth_group(const char *name, const ucl_object_t *top) it2 = NULL; while ((tmp = ucl_iterate_object(obj, &it2, true))) { const char *value = ucl_object_tostring(tmp); - + an = auth_name_new(auth_group, value); if (an == NULL) return (1); @@ -547,7 +547,7 @@ uclparse_portal_group(const char *name, const ucl_object_t *top) while ((tmp = ucl_iterate_object(obj, &it2, true))) { if (portal_group_add_listen( - portal_group, + portal_group, ucl_object_tostring(tmp), false) != 0) return (1); @@ -757,7 +757,7 @@ uclparse_target(const char *name, const ucl_object_t *top) target->t_auth_group = auth_group_new(conf, NULL); if (target->t_auth_group == NULL) return (1); - + target->t_auth_group->ag_target = target; } error = auth_group_set_type(target->t_auth_group, @@ -982,7 +982,7 @@ uclparse_conf(struct conf *newconf, const char *path) { struct ucl_parser *parser; ucl_object_t *top; - int error; + int error; conf = newconf; parser = ucl_parser_new(0);