From 39a88a83f3dc887d23b773ee02e9c8714c084b27 Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Wed, 6 Sep 2023 11:33:59 +1200 Subject: [PATCH] s4:torture: Fix code spelling Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- source4/torture/nbt/winsreplication.c | 6 +++--- source4/torture/ndr/lsa.c | 2 +- source4/torture/raw/lock.c | 10 +++++----- source4/torture/rpc/drsuapi_cracknames.c | 2 +- source4/torture/rpc/netlogon.c | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c index fd4ca13634f..e1c9a4dea11 100644 --- a/source4/torture/nbt/winsreplication.c +++ b/source4/torture/nbt/winsreplication.c @@ -645,7 +645,7 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx( nbt_srv_addr = socket_address_from_strings(tctx, ctx->nbtsock_srv->sock->backend_name, ctx->myaddr->addr, lpcfg_nbt_port(tctx->lp_ctx)); if (!nbt_srv_addr) return NULL; - /* And if possible, bind to it. This won't work unless we are root or in sockewrapper */ + /* And if possible, bind to it. This won't work unless we are root or in socketwrapper */ status = socket_listen(ctx->nbtsock_srv->sock, nbt_srv_addr, 0, 0); talloc_free(nbt_srv_addr); if (!NT_STATUS_IS_OK(status)) { @@ -671,7 +671,7 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx( lpcfg_nbt_port(tctx->lp_ctx)); if (!nbt_srv_addr) return NULL; - /* And if possible, bind to it. This won't work unless we are root or in sockewrapper */ + /* And if possible, bind to it. This won't work unless we are root or in socketwrapper */ status = socket_listen(ctx->nbtsock_srv2->sock, ctx->myaddr2, 0, 0); talloc_free(nbt_srv_addr); if (!NT_STATUS_IS_OK(status)) { @@ -1167,7 +1167,7 @@ static bool test_conflict_same_owner(struct torture_context *tctx, .num_ips = ARRAY_SIZE(addresses_B_3_4), .ips = addresses_B_3_4, },{ - /* the last one should always be a unique,tomstone record! */ + /* the last one should always be a unique,tombstone record! */ .type = WREPL_TYPE_UNIQUE, .state = WREPL_STATE_TOMBSTONE, .node = WREPL_NODE_B, diff --git a/source4/torture/ndr/lsa.c b/source4/torture/ndr/lsa.c index 6b9a5bcc53d..2f8f47cda3b 100644 --- a/source4/torture/ndr/lsa.c +++ b/source4/torture/ndr/lsa.c @@ -2014,7 +2014,7 @@ static bool lsarsetforesttrustsinformation_in_check(struct torture_context *tctx torture_assert_str_equal(tctx, r->in.trusted_domain_name->string, "f1.test", "trusted domain name"); torture_assert_int_equal(tctx, r->in.highest_record_type, 2, "highest record type"); torture_assert(tctx, r->in.forest_trust_info != NULL, "forest trust info"); - torture_assert_int_equal(tctx, r->in.forest_trust_info->count, 2, "number fo forest trust records"); + torture_assert_int_equal(tctx, r->in.forest_trust_info->count, 2, "number of forest trust records"); torture_assert_int_equal(tctx, r->in.forest_trust_info->entries[0]->flags, 0, "first entry flags"); torture_assert_int_equal(tctx, r->in.forest_trust_info->entries[0]->type, 0, "first entry type"); torture_assert_int_equal(tctx, r->in.forest_trust_info->entries[0]->time, 0, "first entry time"); diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c index b9cd726e862..6dbc9e932d0 100644 --- a/source4/torture/raw/lock.c +++ b/source4/torture/raw/lock.c @@ -1108,7 +1108,7 @@ next_run: lock[0].pid--; /* - * demonstrate the a successful lock with count = 0 and the same offset, + * demonstrate that a successful lock with count = 0 and the same offset, * doesn't reset the error cache */ lock[0].offset = 100; @@ -1132,7 +1132,7 @@ next_run: CHECK_STATUS(status, NT_STATUS_FILE_LOCK_CONFLICT); /* - * demonstrate the a successful lock with count = 0 and outside the locked range, + * demonstrate that a successful lock with count = 0 and outside the locked range, * doesn't reset the error cache */ lock[0].offset = 110; @@ -1197,7 +1197,7 @@ next_run: CHECK_STATUS(status, NT_STATUS_FILE_LOCK_CONFLICT); /* - * demonstrate the a lock with count = 0 and inside the locked range, + * demonstrate that a lock with count = 0 and inside the locked range, * fails and resets the error cache */ lock[0].offset = 101; @@ -1228,7 +1228,7 @@ next_run: status = smb_raw_lock(cli->tree, &io); CHECK_STATUS(status, NT_STATUS_FILE_LOCK_CONFLICT); - /* demonstrate the a changing offset, resets the error cache */ + /* demonstrate that a changing offset resets the error cache */ lock[0].offset = 105; lock[0].count = 10; io.lockx.in.file.fnum = fnum; @@ -1286,7 +1286,7 @@ next_run: CHECK_STATUS(status, NT_STATUS_FILE_LOCK_CONFLICT); /* - * demonstrate the a successful lock in a different range, + * demonstrate that a successful lock in a different range * doesn't reset the cache, the failing lock on the 2nd handle * resets the cache */ diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c index 511309f17da..0cbccda45fa 100644 --- a/source4/torture/rpc/drsuapi_cracknames.c +++ b/source4/torture/rpc/drsuapi_cracknames.c @@ -472,7 +472,7 @@ bool test_DsCrackNames(struct torture_context *tctx, /* form up a user@DOMAIN */ user_principal_name_short = talloc_asprintf(mem_ctx, "%s$@%s", test_dc, nt4_domain); - /* variable nt4_domain includs a trailing \ */ + /* variable nt4_domain includes a trailing \ */ user_principal_name_short[strlen(user_principal_name_short) - 1] = '\0'; service_principal_name = talloc_asprintf(mem_ctx, "HOST/%s", test_dc); diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index dbfca5fe1c8..07e63612e81 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -2066,7 +2066,7 @@ bool test_netlogon_capabilities(struct dcerpc_pipe *p, struct torture_context *t * because dcerpc_netr_LogonGetCapabilities with * an unknown query level returns DCERPC_NCA_S_FAULT_INVALID_TAG * => NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE - * without looking a the authenticator. + * without looking at the authenticator. */ tmp_creds = *creds; netlogon_creds_client_authenticator(&tmp_creds, &auth); @@ -2085,7 +2085,7 @@ bool test_netlogon_capabilities(struct dcerpc_pipe *p, struct torture_context *t * because dcerpc_netr_LogonGetCapabilities with * an unknown query level returns DCERPC_NCA_S_FAULT_INVALID_TAG * => NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE - * without looking a the authenticator. + * without looking at the authenticator. */ tmp_creds = *creds; netlogon_creds_client_authenticator(&tmp_creds, &auth); @@ -2103,7 +2103,7 @@ bool test_netlogon_capabilities(struct dcerpc_pipe *p, struct torture_context *t * we need to operate on a temporary copy of creds * because dcerpc_netr_LogonGetCapabilities was * dcerpc_netr_DummyFunction and returns NT_STATUS_NOT_IMPLEMENTED - * without looking a the authenticator. + * without looking at the authenticator. */ tmp_creds = *creds; netlogon_creds_client_authenticator(&tmp_creds, &auth); @@ -2134,7 +2134,7 @@ bool test_netlogon_capabilities(struct dcerpc_pipe *p, struct torture_context *t * because dcerpc_netr_LogonGetCapabilities with * an query level 2 may returns DCERPC_NCA_S_FAULT_INVALID_TAG * => NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE - * without looking a the authenticator. + * without looking at the authenticator. */ tmp_creds = *creds; netlogon_creds_client_authenticator(&tmp_creds, &auth);