From nobody Fri Apr 11 14:03:59 2025 X-Original-To: dev-commits-src-main@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 4ZYz1r0z9Wz5s4F4; Fri, 11 Apr 2025 14:04:00 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZYz1q6N8qz43FT; Fri, 11 Apr 2025 14:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744380239; 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=BjbR8XSaG0zHjtHIjQ3ZdgJsMLzhOrDGwr/ld8UHuzM=; b=WD4pvMCPUEblC29JMuBI4vd6wkKF+1sqtQc2mAgWlxQboZm67d9qAfF3PRxM56YVoqVwD8 /zTbyizzTFwPiqjk/RvvzTgrohCrEz2mFKgdlmOCRbbnHhzE4hx5S0ZKcIs2eoz2FZ0LH5 5gQWaTp5ABwPGOZWmkwgvO/IpMv0xa4+y8Fnn+/6UO0kqrAHoPXQUG/CBTRXjHEOq2Cx7V zfWaVakQ0bXz06NG4E3LEstHkezoVW4JPs8N7wTh+e2yOOEZpmjFN6RoJi9Zesm+o3X9ae TVT0YWIuZOkmZGMfmX4e/p1g7mbVbTCxAaN2BSeTMXu3widBAlLgoyAcCOc+fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744380239; a=rsa-sha256; cv=none; b=V974jTMpCkflYIpDxzmHZqRkKCLuyTF4x5XRgxeeA70YkiV+YSs/rC5cexBTMK/A3SChZL eL+zYpmGpKb1Xp+9rZoYqJsb6C7wHEnDdnWfAZFL72p2kzfJVlgGzly+a+rctvnCQEAc0X 2kMuTJsrfzJewihw9zAfLhmRP37WB4fJV/kW1DfN4ypCziW4KpJRKgTPiyfSHX8rC8YOiw dz6k6xRXCQCJnrGxP6kTWS1fhjzhrzoIkN6m1ZTBMjDF2joVijHVQGFuSTlxfbmc3I3Z8r wOtu9nNxEhyHePSpeICKysqTH8uyZ53oS8nxdVzMWi6ANX3QjqeQp2YjxhpgMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744380239; 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=BjbR8XSaG0zHjtHIjQ3ZdgJsMLzhOrDGwr/ld8UHuzM=; b=Uvc7hF6LUbsPRzhYUW31YJopgc5kx5nj5dv9846P2ExZJBFHLht8VW84GI+gLtGy7x0qUi njf6IGk+Sokzn5NiDwmuzE4CYz1jcHnei++YB29AB2jveHdRp1/0gUWH/As2we6ra6WCE2 e7HAFjddftHy2W+b+uCAVmXdigQLc9x9IBFyCltkpOXrH1r7vZTtOGEKKvaGxJJhq0sISl RLywo/Clo57/y3oUCVjkYNqxQ6FkxSd1cmYCaVi0SID+E8fPHPQMAohQTjYkfRQ3Km279W cvTsmW+HCrwPLRqU3tuFHy/1EYaOzUommOLei0zfBj8e8IzwK9uF22LuHYV9AQ== 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 4ZYz1q5hDNzc7m; Fri, 11 Apr 2025 14:03:59 +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 53BE3xTw053685; Fri, 11 Apr 2025 14:03:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53BE3xlb053682; Fri, 11 Apr 2025 14:03:59 GMT (envelope-from git) Date: Fri, 11 Apr 2025 14:03:59 GMT Message-Id: <202504111403.53BE3xlb053682@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: 0708eb01f280 - main - ctld: Drop commented-out code to print the configuration List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 0708eb01f28040a50693f40833562ab14fbfe2ad Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0708eb01f28040a50693f40833562ab14fbfe2ad commit 0708eb01f28040a50693f40833562ab14fbfe2ad Author: John Baldwin AuthorDate: 2025-04-11 14:01:29 +0000 Commit: John Baldwin CommitDate: 2025-04-11 14:01:29 +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 --- 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 6360a88e5c97..08ac91a75c21 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -1347,68 +1347,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) {