From nobody Wed Jan 22 19:58:27 2025 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 4YdZdJ02J1z5kyVP; Wed, 22 Jan 2025 19:58:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YdZdH6WsWz3CPH; Wed, 22 Jan 2025 19:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737575907; 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=McfUsPJsLpYBQKi4myEfqQ1sRv6eOWyMRce2ZRTXzok=; b=nbytcHBkBqtHu+e4sICmsWJ27694mSRf5ROYadt9DcSzQgM1/Mgll9w1429MQGlMsTTlJ2 iR0CTuNYdnXpgg1MfUJAwrEqKs8mi5AULYeM712LoTFJbRMJQslKS6TVb+ETFlNurk+4Tz MGlPq3FVvGYaj0bVIcq6xtJsb8tz/4oH9huLJCXd4wiq88x2izfc6M07xw4PiaFeHuvkvZ ky2Vxf/1saCfouSn0yywa9Hu5XViLx6gJMMTMh3kon90CprIdFfK4hw97PV4yqXj94RTPi 7buOvPpIl7XgzfP03L8sUFpLzDP/nNMa//1iwzgo1X6Fg8dJiHDlrZPMG14Wjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737575907; 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=McfUsPJsLpYBQKi4myEfqQ1sRv6eOWyMRce2ZRTXzok=; b=rzJdLZT4sH3DYqnfwsGpfxow9ZlubVhRxmYbAGwik8Q9kXLYIHFmPQRI7Hfwz3l+16dn8L 2C6TzDgU+j9Jig1iJu87i8sVbADQeDnKsHv7WH/HstUsQfKX+HzDRdGzJo1jQUsxl3l6YV ti7W1ZUWxYDxr9nLKQRcYQGZe2pL68aj4g7JYSAwYZfbjMOSndsC9B7Yq6Z3Dt/3IQX61y EkD8nfIE/fFPsdzkfKL7F1pEjoQObI/n0jKtSvB34ZotpgtlZI827SE5rh9db14UCaaTGi 1F3R+EDhUFCRmmkvTGKCT62yZ0vv85rj2WuYB/qQMCVs3e/9RYlqFsl4mO/VIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737575907; a=rsa-sha256; cv=none; b=G1xra2iylhMZOD86CYWZI3Pq+70bJvi8Ov6MTRlBZIGpQqpzL8wI92m5/Ctw/76kzUwql8 3UIZ2nccwzM2o5YTlxdRmbGhz4YN9eUuUXZLiIqz/Ba/lvV3xaULJzqozEyioVGmEMCvtU /GRwEOsuHfQU4YaLXaSksJim7qrObgyxEXFjK/CTxq29EED2X+Md/IbkQ6/7w3zptJ1q5J ZxzrefblwaHUyssyvjk+/onCwqak9rDActf2HYCn23XYCZ71MsdwsEABtPoHj0sLY5h0T+ gxJsqb25aNn5kyM/3db02YsbvBknI6wT5chOg+HXRm9oAVdNZSw0GLx/eXLgVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YdZdH5mTkz15W0; Wed, 22 Jan 2025 19:58:27 +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 50MJwRck002082; Wed, 22 Jan 2025 19:58:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50MJwRHi002079; Wed, 22 Jan 2025 19:58:27 GMT (envelope-from git) Date: Wed, 22 Jan 2025 19:58:27 GMT Message-Id: <202501221958.50MJwRHi002079@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: 237e9b7f5e90 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 237e9b7f5e90debb31ae7fd1e0a288e302659bfd Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=237e9b7f5e90debb31ae7fd1e0a288e302659bfd commit 237e9b7f5e90debb31ae7fd1e0a288e302659bfd Author: John Baldwin AuthorDate: 2025-01-18 17:19:41 +0000 Commit: John Baldwin CommitDate: 2025-01-22 19:57:46 +0000 ctld: Trim trailing whitespace Sponsored by: Chelsio Communications --- 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 497e0f6e7600..3136a5d4b7cb 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -945,7 +945,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); @@ -973,7 +973,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); @@ -1000,7 +1000,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);