1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
|
From: Michael Tokarev <mjt@tls.msk.ru>
Subject: Various spelling fixes
Various spelling fixes in the code which sneaks into binaries.
diff --git a/bootstrap/config.py b/bootstrap/config.py
index a00b253ae77..84330a2106a 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -127,5 +127,5 @@ PKGS = [
('pkg-config', 'pkgconfig'),
('procps', 'procps-ng'), # required for the free cmd in tests
- ('lsb-release', 'lsb-release'), # we need lsb_relase to show info
+ ('lsb-release', 'lsb-release'), # we need lsb_release to show info
('', 'rpcgen'), # required for test
# refer: https://fedoraproject.org/wiki/Changes/SunRPCRemoval
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
@@ -158,5 +158,5 @@ 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/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 4819df35837..c30326234ae 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -950,5 +950,5 @@ 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,
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
@@ -1243,5 +1243,5 @@ 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),
@@ -1258,5 +1258,5 @@ static void smbXsrv_client_connection_drop_loop(struct tevent_req *subreq)
{
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),
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
@@ -234,5 +234,5 @@ 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),
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
@@ -92,5 +92,5 @@ 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");
/*
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
@@ -2755,5 +2755,5 @@ static bool test_session_bind_negative_smb210s(struct torture_context *tctx, str
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");
}
@@ -2786,5 +2786,5 @@ static bool test_session_bind_negative_smb210d(struct torture_context *tctx, str
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");
}
@@ -2818,5 +2818,5 @@ static bool test_session_bind_negative_smb2to3s(struct torture_context *tctx, st
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");
}
@@ -2863,5 +2863,5 @@ static bool test_session_bind_negative_smb2to3d(struct torture_context *tctx, st
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");
}
@@ -2909,5 +2909,5 @@ static bool test_session_bind_negative_smb3to2s(struct torture_context *tctx, st
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");
}
@@ -2960,5 +2960,5 @@ static bool test_session_bind_negative_smb3to2d(struct torture_context *tctx, st
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");
}
@@ -4549,5 +4549,5 @@ static bool test_session_bind_negative_smb3signH2XtoGs(struct torture_context *t
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");
}
@@ -4609,5 +4609,5 @@ static bool test_session_bind_negative_smb3signH2XtoGd(struct torture_context *t
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");
}
@@ -4789,5 +4789,5 @@ static bool test_session_bind_negative_smb3signGtoH2Xs(struct torture_context *t
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");
}
@@ -4855,5 +4855,5 @@ static bool test_session_bind_negative_smb3signGtoH2Xd(struct torture_context *t
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");
}
@@ -5067,5 +5067,5 @@ static bool test_session_signing_hmac_sha_256(struct torture_context *tctx, stru
if (encrypted) {
torture_skip(tctx,
- "Can't test signing only if encrytion is required");
+ "Can't test signing only if encryption is required");
}
@@ -5111,5 +5111,5 @@ static bool test_session_signing_aes_128_cmac(struct torture_context *tctx, stru
if (encrypted) {
torture_skip(tctx,
- "Can't test signing only if encrytion is required");
+ "Can't test signing only if encryption is required");
}
@@ -5155,5 +5155,5 @@ static bool test_session_signing_aes_128_gmac(struct torture_context *tctx, stru
if (encrypted) {
torture_skip(tctx,
- "Can't test signing only if encrytion is required");
+ "Can't test signing only if encryption is required");
}
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/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index bf3a66b0aaf..9d2cb6af9c9 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -395,7 +395,7 @@ static void ctdb_set_culprit_count(struct ctdb_recoverd *rec,
struct ctdb_banning_state,
len);
if (t == NULL) {
- DBG_WARNING("Memory allocation errror");
+ DBG_WARNING("Memory allocation error");
return;
}
rec->banning_state = t;
diff --git a/lib/smbconf/pysmbconf.c b/lib/smbconf/pysmbconf.c
index 1b3c101005a..465876684ca 100644
--- a/lib/smbconf/pysmbconf.c
+++ b/lib/smbconf/pysmbconf.c
@@ -747,7 +747,7 @@ PyDoc_STRVAR(py_smbconf_doc,
"types. Future, write based functions need a writable backend (registry).\n"
"\n"
"Note that the registry backend will be provided by a different\n"
-"library module from the source3 tree (implemenation TBD).\n");
+"library module from the source3 tree (implementation TBD).\n");
static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
|
