From owner-dev-commits-src-main@freebsd.org Wed Dec 30 18:07:04 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 07E034CA4DE; Wed, 30 Dec 2020 18:07:04 +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 4D5fPg6nYwz4Sp2; Wed, 30 Dec 2020 18:07:03 +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 D761522685; Wed, 30 Dec 2020 18:07:03 +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 0BUI73Ra090329; Wed, 30 Dec 2020 18:07:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BUI73B0090328; Wed, 30 Dec 2020 18:07:03 GMT (envelope-from git) Date: Wed, 30 Dec 2020 18:07:03 GMT Message-Id: <202012301807.0BUI73B0090328@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: bdbc2a6fc2d8 - main - Fix typo in an_initator_name. 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: bdbc2a6fc2d8c524d2059e3124f81be08f025a65 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: Wed, 30 Dec 2020 18:07:04 -0000 The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=bdbc2a6fc2d8c524d2059e3124f81be08f025a65 commit bdbc2a6fc2d8c524d2059e3124f81be08f025a65 Author: Alexander Motin AuthorDate: 2020-12-29 18:41:56 +0000 Commit: Alexander Motin CommitDate: 2020-12-30 18:05:41 +0000 Fix typo in an_initator_name. MFC after: 1 week --- usr.sbin/ctld/ctld.c | 8 ++++---- usr.sbin/ctld/ctld.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index 6c294f7c0cd9..7af1d88da44a 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -304,7 +304,7 @@ auth_name_new(struct auth_group *ag, const char *name) if (an == NULL) log_err(1, "calloc"); an->an_auth_group = ag; - an->an_initator_name = checked_strdup(name); + an->an_initiator_name = checked_strdup(name); TAILQ_INSERT_TAIL(&ag->ag_names, an, an_next); return (an); } @@ -314,7 +314,7 @@ auth_name_delete(struct auth_name *an) { TAILQ_REMOVE(&an->an_auth_group->ag_names, an, an_next); - free(an->an_initator_name); + free(an->an_initiator_name); free(an); } @@ -332,7 +332,7 @@ auth_name_find(const struct auth_group *ag, const char *name) const struct auth_name *auth_name; TAILQ_FOREACH(auth_name, &ag->ag_names, an_next) { - if (strcmp(auth_name->an_initator_name, name) == 0) + if (strcmp(auth_name->an_initiator_name, name) == 0) return (auth_name); } @@ -1680,7 +1680,7 @@ conf_print(struct conf *conf) 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_initator_name); + 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); diff --git a/usr.sbin/ctld/ctld.h b/usr.sbin/ctld/ctld.h index 2b485496d013..4ff8f0e638ac 100644 --- a/usr.sbin/ctld/ctld.h +++ b/usr.sbin/ctld/ctld.h @@ -63,7 +63,7 @@ struct auth { struct auth_name { TAILQ_ENTRY(auth_name) an_next; struct auth_group *an_auth_group; - char *an_initator_name; + char *an_initiator_name; }; struct auth_portal {