The branch, master has been updated
via 3ce1d2fde5d Fix spelling mistakes.
from dadd3223882 tests/krb5: Add claims tests
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3ce1d2fde5dac8a9da2ff0a91ec104cb52d0c6bd
Author: Michael Tokarev <m...@tls.msk.ru>
Date: Fri Sep 9 13:45:38 2022 -0700
Fix spelling mistakes.
Signed-off-by: Michael Tokarev <m...@tls.msk.ru>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Mon Sep 12 02:29:32 UTC 2022 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
ctdb/common/system.c | 2 +-
docs-xml/manpages/vfs_fruit.8.xml | 2 +-
source3/smbd/msdfs.c | 2 +-
source3/smbd/smbXsrv_client.c | 4 ++--
source3/winbindd/wb_sids2xids.c | 2 +-
source4/torture/smb2/ea.c | 2 +-
source4/torture/smb2/session.c | 26 +++++++++++++-------------
7 files changed, 20 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/common/system.c b/ctdb/common/system.c
index 08dc68284fd..05a95647233 100644
--- a/ctdb/common/system.c
+++ b/ctdb/common/system.c
@@ -157,7 +157,7 @@ bool ctdb_sys_check_iface_exists(const char *iface)
ifnis = if_nameindex();
if (ifnis == NULL) {
- DBG_ERR("Failed to retrieve inteface list\n");
+ DBG_ERR("Failed to retrieve interface list\n");
return false;
}
diff --git a/docs-xml/manpages/vfs_fruit.8.xml
b/docs-xml/manpages/vfs_fruit.8.xml
index 4caf308a612..6950898a7d1 100644
--- a/docs-xml/manpages/vfs_fruit.8.xml
+++ b/docs-xml/manpages/vfs_fruit.8.xml
@@ -399,7 +399,7 @@
on-disk file identifier to have the semantics of HFS+ Catalog Node
Identifier (CNID). Samba provides File-IDs based on a file's inode
number which gets recycled across file creation and deletion and
- can therefor not be used for Mac client. Returning a file
identifier of
+ can therefore not be used for Mac client. Returning a file
identifier of
zero causes the Mac client to stop using and trusting the file id
returned from the server.</para>
<para>The default is <emphasis>yes</emphasis>.</para>
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index ce7d0f7dd56..b5fd7608e07 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -1090,7 +1090,7 @@ static NTSTATUS dfs_path_lookup(TALLOC_CTX *ctx,
}
removed_components--;
if (p == NULL && removed_components != 0) {
- DBG_ERR("Component missmatch. path = %s, "
+ DBG_ERR("Component mismatch. path = %s, "
"%zu components left\n",
canon_dfspath,
removed_components);
diff --git a/source3/smbd/smbXsrv_client.c b/source3/smbd/smbXsrv_client.c
index d7a6fa35bf0..14d00f4aca1 100644
--- a/source3/smbd/smbXsrv_client.c
+++ b/source3/smbd/smbXsrv_client.c
@@ -1242,7 +1242,7 @@ static void smbXsrv_client_connection_drop_loop(struct
tevent_req *subreq)
{
struct GUID_txt_buf buf1, buf2;
- DBG_WARNING("client's client_guid [%s] != droped guid [%s]\n",
+ DBG_WARNING("client's client_guid [%s] != dropped guid [%s]\n",
GUID_buf_string(&client->global->client_guid,
&buf1),
GUID_buf_string(&drop_info0->client_guid,
@@ -1257,7 +1257,7 @@ static void smbXsrv_client_connection_drop_loop(struct
tevent_req *subreq)
drop_info0->client_connect_time)
{
DBG_WARNING("client's initial connect time [%s] (%llu) != "
- "droped initial connect time [%s] (%llu)\n",
+ "dropped initial connect time [%s] (%llu)\n",
nt_time_string(talloc_tos(),
client->global->initial_connect_time),
(unsigned long
long)client->global->initial_connect_time,
diff --git a/source3/winbindd/wb_sids2xids.c b/source3/winbindd/wb_sids2xids.c
index 179a51f81e4..9a3507ba702 100644
--- a/source3/winbindd/wb_sids2xids.c
+++ b/source3/winbindd/wb_sids2xids.c
@@ -233,7 +233,7 @@ static void wb_sids2xids_idmap_setup_done(struct tevent_req
*subreq)
sid_copy(&domain_sid, &state->sids[i]);
sid_split_rid(&domain_sid, &rid);
- D_DEBUG("%"PRIu32": Splitted SID %s into domain SID %s and RID
%"PRIu32"\n",
+ D_DEBUG("%"PRIu32": Split SID %s into domain SID %s and RID
%"PRIu32"\n",
i,
dom_sid_str_buf(&state->sids[i], &buf0),
dom_sid_str_buf(&domain_sid, &buf1),
diff --git a/source4/torture/smb2/ea.c b/source4/torture/smb2/ea.c
index becacaed77e..2467610f688 100644
--- a/source4/torture/smb2/ea.c
+++ b/source4/torture/smb2/ea.c
@@ -91,7 +91,7 @@ static bool torture_smb2_acl_xattr(struct torture_context
*tctx,
status = smb2_setinfo_file(tree, &sfinfo);
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
- "Setting EA should faild\n");
+ "Setting EA should fail\n");
/*
* 2. Verify NT ACL EA is not listed
diff --git a/source4/torture/smb2/session.c b/source4/torture/smb2/session.c
index 92f9e638ff4..fe2beafbe9b 100644
--- a/source4/torture/smb2/session.c
+++ b/source4/torture/smb2/session.c
@@ -2754,7 +2754,7 @@ static bool test_session_bind_negative_smb210s(struct
torture_context *tctx, str
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test SMB 2.10 if encrytion is required");
+ "Can't test SMB 2.10 if encryption is required");
}
options1 = transport0->options;
@@ -2785,7 +2785,7 @@ static bool test_session_bind_negative_smb210d(struct
torture_context *tctx, str
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test SMB 2.10 if encrytion is required");
+ "Can't test SMB 2.10 if encryption is required");
}
options1 = transport0->options;
@@ -2817,7 +2817,7 @@ static bool test_session_bind_negative_smb2to3s(struct
torture_context *tctx, st
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test SMB 2.10 if encrytion is required");
+ "Can't test SMB 2.10 if encryption is required");
}
if (smbXcli_conn_protocol(transport0->conn) < PROTOCOL_SMB3_00) {
@@ -2862,7 +2862,7 @@ static bool test_session_bind_negative_smb2to3d(struct
torture_context *tctx, st
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test SMB 2.10 if encrytion is required");
+ "Can't test SMB 2.10 if encryption is required");
}
if (smbXcli_conn_protocol(transport0->conn) < PROTOCOL_SMB3_00) {
@@ -2908,7 +2908,7 @@ static bool test_session_bind_negative_smb3to2s(struct
torture_context *tctx, st
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test SMB 2.10 if encrytion is required");
+ "Can't test SMB 2.10 if encryption is required");
}
if (smbXcli_conn_protocol(transport0->conn) < PROTOCOL_SMB3_00) {
@@ -2959,7 +2959,7 @@ static bool test_session_bind_negative_smb3to2d(struct
torture_context *tctx, st
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test SMB 2.10 if encrytion is required");
+ "Can't test SMB 2.10 if encryption is required");
}
if (smbXcli_conn_protocol(transport0->conn) < PROTOCOL_SMB3_00) {
@@ -4548,7 +4548,7 @@ static bool
test_session_bind_negative_smb3signH2XtoGs(struct torture_context *t
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test SMB 2.10 if encrytion is required");
+ "Can't test SMB 2.10 if encryption is required");
}
if (smbXcli_conn_protocol(transport0->conn) < PROTOCOL_SMB3_11) {
@@ -4608,7 +4608,7 @@ static bool
test_session_bind_negative_smb3signH2XtoGd(struct torture_context *t
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test SMB 2.10 if encrytion is required");
+ "Can't test SMB 2.10 if encryption is required");
}
if (smbXcli_conn_protocol(transport0->conn) < PROTOCOL_SMB3_11) {
@@ -4788,7 +4788,7 @@ static bool
test_session_bind_negative_smb3signGtoH2Xs(struct torture_context *t
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test SMB 2.10 if encrytion is required");
+ "Can't test SMB 2.10 if encryption is required");
}
if (smbXcli_conn_protocol(transport0->conn) < PROTOCOL_SMB3_11) {
@@ -4854,7 +4854,7 @@ static bool
test_session_bind_negative_smb3signGtoH2Xd(struct torture_context *t
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test SMB 2.10 if encrytion is required");
+ "Can't test SMB 2.10 if encryption is required");
}
if (smbXcli_conn_protocol(transport0->conn) < PROTOCOL_SMB3_11) {
@@ -5066,7 +5066,7 @@ static bool test_session_signing_hmac_sha_256(struct
torture_context *tctx, stru
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test signing only if encrytion is
required");
+ "Can't test signing only if encryption is
required");
}
if (smbXcli_conn_protocol(transport0->conn) < PROTOCOL_SMB3_11) {
@@ -5110,7 +5110,7 @@ static bool test_session_signing_aes_128_cmac(struct
torture_context *tctx, stru
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test signing only if encrytion is
required");
+ "Can't test signing only if encryption is
required");
}
if (smbXcli_conn_protocol(transport0->conn) < PROTOCOL_SMB3_11) {
@@ -5154,7 +5154,7 @@ static bool test_session_signing_aes_128_gmac(struct
torture_context *tctx, stru
encrypted = smb2cli_tcon_is_encryption_on(tree0->smbXcli);
if (encrypted) {
torture_skip(tctx,
- "Can't test signing only if encrytion is
required");
+ "Can't test signing only if encryption is
required");
}
if (smbXcli_conn_protocol(transport0->conn) < PROTOCOL_SMB3_11) {
--
Samba Shared Repository
