From owner-dev-commits-src-main@freebsd.org Tue Dec 29 18:32:50 2020 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E79CC4C7779; Tue, 29 Dec 2020 18:32:50 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D531t6DPMz3CYh; Tue, 29 Dec 2020 18:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C8B6F10D0A; Tue, 29 Dec 2020 18:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 0BTIWop1067296; Tue, 29 Dec 2020 18:32:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BTIWouf067295; Tue, 29 Dec 2020 18:32:50 GMT (envelope-from git) Date: Tue, 29 Dec 2020 18:32:50 GMT Message-Id: <202012291832.0BTIWouf067295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: a3434cdc6b01 - main - Fix typo in ap_initator_portal. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3434cdc6b01f23a6a2184923c4367c098ae084d Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the main branch of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2020 18:32:51 -0000 The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=a3434cdc6b01f23a6a2184923c4367c098ae084d commit a3434cdc6b01f23a6a2184923c4367c098ae084d Author: Alexander Motin AuthorDate: 2020-12-29 18:32:05 +0000 Commit: Alexander Motin CommitDate: 2020-12-29 18:32:05 +0000 Fix typo in ap_initator_portal. MFC after: 1 week --- usr.sbin/ctld/ctld.c | 6 +++--- usr.sbin/ctld/ctld.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index 247c8f9759ae..6c294f7c0cd9 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -362,7 +362,7 @@ auth_portal_new(struct auth_group *ag, const char *portal) if (ap == NULL) log_err(1, "calloc"); ap->ap_auth_group = ag; - ap->ap_initator_portal = checked_strdup(portal); + ap->ap_initiator_portal = checked_strdup(portal); mask = str = checked_strdup(portal); net = strsep(&mask, "/"); if (net[0] == '[') @@ -414,7 +414,7 @@ auth_portal_delete(struct auth_portal *ap) { TAILQ_REMOVE(&ap->ap_auth_group->ag_portals, ap, ap_next); - free(ap->ap_initator_portal); + free(ap->ap_initiator_portal); free(ap); } @@ -1683,7 +1683,7 @@ conf_print(struct conf *conf) auth_name->an_initator_name); TAILQ_FOREACH(auth_portal, &ag->ag_portals, ap_next) fprintf(stderr, "\t initiator-portal %s\n", - auth_portal->ap_initator_portal); + auth_portal->ap_initiator_portal); fprintf(stderr, "}\n"); } TAILQ_FOREACH(pg, &conf->conf_portal_groups, pg_next) { diff --git a/usr.sbin/ctld/ctld.h b/usr.sbin/ctld/ctld.h index fec7fb7c937d..2b485496d013 100644 --- a/usr.sbin/ctld/ctld.h +++ b/usr.sbin/ctld/ctld.h @@ -69,7 +69,7 @@ struct auth_name { struct auth_portal { TAILQ_ENTRY(auth_portal) ap_next; struct auth_group *ap_auth_group; - char *ap_initator_portal; + char *ap_initiator_portal; struct sockaddr_storage ap_sa; int ap_mask; };