From nobody Tue Jan 27 18:44:30 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 4f0vTC30hBz6QG1y for ; Tue, 27 Jan 2026 18:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0vTB5KSCz3rgj for ; Tue, 27 Jan 2026 18:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539470; 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=iZAa5EZJ4yjWLuzjX5r/DBzyiMp/YBL+73nKAvZTDsE=; b=xgTuJ10xyEuz8iypsZ+Ojxi/ZEpdo36SV5gTW4K/g8oXzQ8mLA0u7+yCvQSMvMMbC0vr7l U9ElIgbF70YU/94Zlh0mxJPVWfHjWHnXYZ6HBnDfkQLX5MmZKQNkgJxbLrdNBm4CyxuMZF TS8lPpJL40eum4B4IewELEdZk27ayJr7OKFF1b+xj+PgVar9+eFT1+LFnF0SH1znzuWDI+ uxWalk7snOpwbUzCuHSszpElMZ/xrx0de7RGz13xsP3FVh4D234zsDWto+qDC9Fomzo9Xz W6W/FS21Kr+9qOj7Ka0nAHPCug0Cu7MLyA6u+EMocIh+QXcJe+9W6GeUKKe+/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539470; 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=iZAa5EZJ4yjWLuzjX5r/DBzyiMp/YBL+73nKAvZTDsE=; b=DE0I4QPNZHJoJdXejPqKqR86byo04mCNbS8WxIvDiXjOc+caA9QcZbabI7f5PFrkD6qfF0 2wFp0+aQCcQxSKJ4Smqjveg6pj3DUfHJhTV47ceZAyDGnWqF2y9EyZPv+TZg4GkTH5BZhi ZbXuZV75CmsFor+T4INrrC3g3T3HpAyBV4rxuImhcFLcLNIq1K0J/XxDnTVJcxot6EnTl3 0bcD9kpRJ/Jer55kiIJNGYk6wjNdTBxy9t5ciH113kNC+0lMTjknG4ER8ZJbzZEdSJzVJ/ 55jnKC6euW3d47rWGM9h2BOZ6wZ5rmTO8gFi3wVmrirJHSAJAZAIT2anTgi/XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539470; a=rsa-sha256; cv=none; b=Nyjw4A/9yKfCxWVDJc1vVoq5KBqCSNbDcQGBzE2Yvc9SZaxru6oiHRUXnC1cske164R4uG nMYwqXODSaz+gMTTA+y1XSH07W2fXYyfIlcs3USxghxToU6/CaBr6eZzkURKk50BGe5+0P 2CefVWIwPf1Fu7igux4t7M/W0deHUCh6Ul/RHLe+TwhZ5CIZSM+S/z/GCYO8clh4J2x7Me xKayr6XpcepCuaqSXiua84EJJ/tRs9RjVMfsP7DqRxMSyzai7Z8Jm2QmPG9V7OqDWrfW4M 7C826B/qiqeL87KGH+2C+X7ClmRo1krqhS8EllHXGpwSppXYlX2W3GZsW2tXbw== 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 4f0vTB4whwz3tc for ; Tue, 27 Jan 2026 18:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f5be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:44:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8f799d4b1c71 - stable/14 - ctld: Drop commented-out code to print the configuration 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: 8f799d4b1c7185d4b63310e86312c1867a8d7cb2 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:44:30 +0000 Message-Id: <6979078e.f5be.5f2cba15@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8f799d4b1c7185d4b63310e86312c1867a8d7cb2 commit 8f799d4b1c7185d4b63310e86312c1867a8d7cb2 Author: John Baldwin AuthorDate: 2025-04-11 14:01:29 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:58 +0000 ctld: Drop commented-out code to print the configuration This code is incomplete (it does not handle some of the options that can be set) and easily rots since it is not enabled by default or hooked up to anything that calls it. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D49646 (cherry picked from commit 0708eb01f28040a50693f40833562ab14fbfe2ad) --- usr.sbin/ctld/ctld.cc | 62 --------------------------------------------------- 1 file changed, 62 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 8172e36e97f9..8a7a3c8b5a81 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -1348,68 +1348,6 @@ connection_new(struct portal *portal, int fd, const char *host, return (conn); } -#if 0 -static void -options_print(const char *prefix, nvlist_t *nvl) -{ - const char *name; - void *cookie; - - cookie = NULL; - while ((name = nvlist_next(nvl, NULL, &cookie)) != NULL) { - fprintf(stderr, "%soption %s %s\n", prefix, name, - nvlist_get_string(nvl, name)); - } -} - -static void -conf_print(struct conf *conf) -{ - struct auth_group *ag; - struct auth *auth; - struct auth_name *auth_name; - struct auth_portal *auth_portal; - struct portal_group *pg; - struct portal *portal; - struct target *targ; - struct lun *lun; - - TAILQ_FOREACH(ag, &conf->conf_auth_groups, ag_next) { - fprintf(stderr, "auth-group %s {\n", ag->ag_name); - TAILQ_FOREACH(auth, &ag->ag_auths, a_next) - fprintf(stderr, "\t chap-mutual %s %s %s %s\n", - auth->a_user, auth->a_secret, - auth->a_mutual_user, auth->a_mutual_secret); - TAILQ_FOREACH(auth_name, &ag->ag_names, an_next) - fprintf(stderr, "\t initiator-name %s\n", - auth_name->an_initiator_name); - TAILQ_FOREACH(auth_portal, &ag->ag_portals, ap_next) - fprintf(stderr, "\t initiator-portal %s\n", - auth_portal->ap_initiator_portal); - fprintf(stderr, "}\n"); - } - TAILQ_FOREACH(pg, &conf->conf_portal_groups, pg_next) { - fprintf(stderr, "portal-group %s {\n", pg->pg_name); - TAILQ_FOREACH(portal, &pg->pg_portals, p_next) - fprintf(stderr, "\t listen %s\n", portal->p_listen); - options_print("\t", pg->pg_options); - fprintf(stderr, "}\n"); - } - TAILQ_FOREACH(lun, &conf->conf_luns, l_next) { - fprintf(stderr, "\tlun %s {\n", lun->l_name); - fprintf(stderr, "\t\tpath %s\n", lun->l_path); - options_print("\t\t", lun->l_options); - fprintf(stderr, "\t}\n"); - } - TAILQ_FOREACH(targ, &conf->conf_targets, t_next) { - fprintf(stderr, "target %s {\n", targ->t_name); - if (targ->t_alias != NULL) - fprintf(stderr, "\t alias %s\n", targ->t_alias); - fprintf(stderr, "}\n"); - } -} -#endif - static bool conf_verify_lun(struct lun *lun) {