The branch, master has been updated
via 982042115b1 libndr: specialise ndr_token_find() for key pointer
comparison
via a909db027ff ldb:test:lmdb_free_list: s/the the/to the/ in comment
via 2b05eb22ba5 s4:reg: s/the there/there/ in comments
via 26dd542928c s4: s/the the/the/ in miscellaneous comments
via 770df620beb s4:ldb_mods:group_audit: s/the the/the/ in comments
via 9ef582d0e9f s3:smbd:posix_acls: s/the the/that the/ in comment
via 367e58c321b s3:printing and spoolss: s/the the/the/ in comments
via eaff8d28f09 s3:headers: s/the the/the/ in comments
via 33c966c3bc4 s3:client:clitar: s/the the/to the/ in comment
via 4b84821749a pytest: s/the the/the/ in comments
via a42bff66d1a samba-tool:: s/the the/the/ in docstring
via a784444c778 nsswitch:: s/the the/the/ in comments
via e4027089215 libcli:auth:msrpc_parse: s/the the/is the/ in comments
via f914f539130 util:charset: s/the the/the/ in comments
via 153a14776d1 tevent docs: s/the the/the/
via 0bb729d6139 pyldb: s/the the/the/ in comments
via 296456407e4 ldb:pack: s/the the/in the/ in comments
via 3c1e99f5d34 lib/afs: s/the the/the/ in comments
via 076c284d6f9 ctdb:tests: s/the the/the/ in comments
from 6f09b61f0b9 WHATSNEW: SMB3 Directory Leases
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 982042115b1709b914fd0325f764edca0857d84b
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Thu Oct 17 15:54:22 2024 +1300
libndr: specialise ndr_token_find() for key pointer comparison
Usually we are doing a pointer comparison. Because we are doing it
in a tight loop, the cost of the comparison function call can be
noticeable.
There is a fuzz case that before f43ae1ab1a8803d8c5ad4e5f3dad63ccbe91aa54
took 3.957s, after that took 6.438s, and now again takes 3.960s.
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
Autobuild-User(master): Volker Lendecke <v...@samba.org>
Autobuild-Date(master): Wed Nov 6 12:06:04 UTC 2024 on atb-devel-224
commit a909db027ff17d5feb8e071cca5e0b7a7440514b
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:31:54 2024 +1200
ldb:test:lmdb_free_list: s/the the/to the/ in comment
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 2b05eb22ba599032d27d212909b1425fb8f606d5
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:31:09 2024 +1200
s4:reg: s/the there/there/ in comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 26dd542928ce8e26cd47439564db891810c5f058
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:30:42 2024 +1200
s4: s/the the\b/the/ in miscellaneous comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 770df620beb7b6c3e7a2c80d5fa2d21df505a027
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:28:52 2024 +1200
s4:ldb_mods:group_audit: s/the the/the/ in comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 9ef582d0e9f149fb7f96ca3356c0eae8331f0864
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:27:57 2024 +1200
s3:smbd:posix_acls: s/the the/that the/ in comment
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 367e58c321b062b31a059793da16c0d127eb5ec7
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:27:05 2024 +1200
s3:printing and spoolss: s/the the\b/the/ in comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit eaff8d28f09bb4ddae27c8398611fdf122c06061
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:26:35 2024 +1200
s3:headers: s/the the\b/the/ in comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 33c966c3bc4a8b7ef5f66087f27a5ad84d148eb1
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:25:36 2024 +1200
s3:client:clitar: s/the the/to the/ in comment
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 4b84821749a298646fc590559bb2fcb370c98108
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:24:55 2024 +1200
pytest: s/the the\b/the/ in comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit a42bff66d1a0ca1f7f0995e286245546afaa5bd4
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:24:20 2024 +1200
samba-tool:: s/the the\b/the/ in docstring
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit a784444c77888c44cba3c0a4c81440671f6cc880
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:23:47 2024 +1200
nsswitch:: s/the the\b/the/ in comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit e4027089215b884f907a2aa80a06c714167e4a57
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:22:30 2024 +1200
libcli:auth:msrpc_parse: s/the the/is the/ in comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit f914f53913019c89cef8e4388127513f68c324fe
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:21:33 2024 +1200
util:charset: s/the the\b/the/ in comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 153a14776d1a85bac875eac785edb93e14a0e247
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:21:12 2024 +1200
tevent docs: s/the the\b/the/
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 0bb729d61398f41dcec3dc0785815bf4919868c8
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:19:41 2024 +1200
pyldb: s/the the\b/the/ in comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 296456407e40dabe997c6f30c11610da4dd72aad
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:19:23 2024 +1200
ldb:pack: s/the the/in the/ in comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 3c1e99f5d3420db7231d10cd05e484f873c29e75
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:18:00 2024 +1200
lib/afs: s/the the\b/the/ in comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 076c284d6f97572be570e9745785ca3edb9c67e7
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Sep 13 14:17:30 2024 +1200
ctdb:tests: s/the the\b/the/ in comments
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
.../cluster.008.capability_leader_yield_no_lock.sh | 2 +-
ctdb/tests/UNIT/takeover/lcp2.010.sh | 2 +-
lib/afs/afs_funcs.c | 2 +-
lib/ldb/common/ldb_pack.c | 4 +--
lib/ldb/pyldb.c | 2 +-
lib/ldb/tests/ldb_lmdb_free_list_test.c | 2 +-
lib/tevent/doc/tevent_request.dox | 2 +-
lib/util/charset/util_unistr.c | 2 +-
libcli/auth/msrpc_parse.c | 2 +-
libcli/auth/msrpc_parse.h | 2 +-
librpc/ndr/ndr.c | 30 +++++++++++++++++-----
nsswitch/libwbclient/wbc_sid.c | 2 +-
nsswitch/pam_winbind.c | 2 +-
python/samba/netcmd/domain/kds/root_key.py | 2 +-
python/samba/tests/gkdi.py | 2 +-
python/samba/tests/samba_tool/contact.py | 2 +-
source3/client/clitar.c | 2 +-
source3/include/libsmbclient.h | 4 +--
source3/lib/netapi/netapi.h | 2 +-
source3/printing/printing.c | 2 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 2 +-
source3/smbd/posix_acls.c | 2 +-
source4/dsdb/samdb/ldb_modules/group_audit.c | 2 +-
source4/lib/registry/regf.c | 6 ++---
source4/libnet/libnet_passwd.c | 2 +-
source4/rpc_server/drsuapi/getncchanges.c | 2 +-
source4/torture/drs/python/repl_rodc.py | 2 +-
testprogs/win32/prepare_dcpromo/prepare_dcpromo.c | 2 +-
28 files changed, 54 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git
a/ctdb/tests/INTEGRATION/simple/cluster.008.capability_leader_yield_no_lock.sh
b/ctdb/tests/INTEGRATION/simple/cluster.008.capability_leader_yield_no_lock.sh
index 4489bc580c6..40e079199d2 100755
---
a/ctdb/tests/INTEGRATION/simple/cluster.008.capability_leader_yield_no_lock.sh
+++
b/ctdb/tests/INTEGRATION/simple/cluster.008.capability_leader_yield_no_lock.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Verify that removing the the leader capability causes a node to
+# Verify that removing the leader capability causes a node to
# yield the leader role
. "${TEST_SCRIPTS_DIR}/integration.bash"
diff --git a/ctdb/tests/UNIT/takeover/lcp2.010.sh
b/ctdb/tests/UNIT/takeover/lcp2.010.sh
index f7dabdd03e9..7e4df03f3e1 100755
--- a/ctdb/tests/UNIT/takeover/lcp2.010.sh
+++ b/ctdb/tests/UNIT/takeover/lcp2.010.sh
@@ -4,7 +4,7 @@
define_test "2 disjoint groups of nodes/addresses, a node becomes healthy"
-# This illustrates a bug in LCP2 when the the only candidate for a
+# This illustrates a bug in LCP2 when the only candidate for a
# source node is chosen to be the "most imbalanced" node. This means
# that nodes in the smaller group aren't necessarily (depends on sort
# order and addresses used) considered as candidates. If the larger
diff --git a/lib/afs/afs_funcs.c b/lib/afs/afs_funcs.c
index 4360f54827a..6385e35dfe5 100644
--- a/lib/afs/afs_funcs.c
+++ b/lib/afs/afs_funcs.c
@@ -129,7 +129,7 @@ static bool afs_createtoken(const char *username, const
char *cell,
/* We need to create a session key */
generate_random_buffer((uint8_t *)p, 8);
- /* Our client code needs the the key in the clear, it does not
+ /* Our client code needs the key in the clear, it does not
know the server-key ... */
memcpy(ct->HandShakeKey, p, 8);
diff --git a/lib/ldb/common/ldb_pack.c b/lib/ldb/common/ldb_pack.c
index b06a6e2b84b..4c2052372be 100644
--- a/lib/ldb/common/ldb_pack.c
+++ b/lib/ldb/common/ldb_pack.c
@@ -636,7 +636,7 @@ static int ldb_unpack_data_flags_v1(struct ldb_context *ldb,
* of these, just to then hold the pointer to the data buffer
* So with LDB_UNPACK_DATA_FLAG_NO_VALUES_ALLOC we allocate this
* ahead of time and use it for the single values where possible.
- * (This is used the the normal search case, but not in the
+ * (This is used in the normal search case, but not in the
* index case because of caller requirements).
*/
if (flags & LDB_UNPACK_DATA_FLAG_NO_VALUES_ALLOC) {
@@ -869,7 +869,7 @@ static int ldb_unpack_data_flags_v2(struct ldb_context *ldb,
* of these, just to then hold the pointer to the data buffer.
* So with LDB_UNPACK_DATA_FLAG_NO_VALUES_ALLOC we allocate this
* ahead of time and use it for the single values where possible.
- * (This is used the the normal search case, but not in the
+ * (This is used in the normal search case, but not in the
* index case because of caller requirements).
*/
if (flags & LDB_UNPACK_DATA_FLAG_NO_VALUES_ALLOC) {
diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index bf433288206..8acb51705f1 100644
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -440,7 +440,7 @@ static PyObject *PyLdbResult_FromResult(struct ldb_result
*result, PyLdbObject *
/*
* PyErr_interal_LDB_DN_OR_RAISE does exactly what
* PyErr__LDB_DN_OR_RAISE does, but rather than going through the
- * Python layer to import the Dn object, it directly uses the the
+ * Python layer to import the Dn object, it directly uses the
* address of the PyTypeObject. This is faster, but can only be done
* in pyldb.c.
*/
diff --git a/lib/ldb/tests/ldb_lmdb_free_list_test.c
b/lib/ldb/tests/ldb_lmdb_free_list_test.c
index 99505ce7b55..87451837583 100644
--- a/lib/ldb/tests/ldb_lmdb_free_list_test.c
+++ b/lib/ldb/tests/ldb_lmdb_free_list_test.c
@@ -455,7 +455,7 @@ static void test_free_list_read_lock(void **state)
assert_int_equal(ret, LDB_SUCCESS);
/*
- * Signal the the parent that we've done the update
+ * Signal to the parent that we've done the update
*/
ret = write(to_parent[1], "GO", 2);
assert_int_equal(ret, 2);
diff --git a/lib/tevent/doc/tevent_request.dox
b/lib/tevent/doc/tevent_request.dox
index bda6f766c93..50152626e9f 100644
--- a/lib/tevent/doc/tevent_request.dox
+++ b/lib/tevent/doc/tevent_request.dox
@@ -90,7 +90,7 @@ other requests. Stopping one request would stop the others,
memory resources
would not be freed, file descriptors might remain open, communication via
socket could be interrupted, and so on. Therefore it is important to think
about finishing requests, either successfully or not, and also to prepare
-functions for all possible scenarios, so that the the callbacks do not process
+functions for all possible scenarios, so that the callbacks do not process
data that are actually invalid or, even worse, in fact non-existent meaning
that a segmentation fault may arise.
diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c
index c042bead4ed..8812011050b 100644
--- a/lib/util/charset/util_unistr.c
+++ b/lib/util/charset/util_unistr.c
@@ -187,7 +187,7 @@ _PUBLIC_ char *talloc_strdup_upper(TALLOC_CTX *ctx, const
char *src)
* 4. If two strings become invalid on the same character, the rest
* of the string is compared via ldb ASCII case fold rules.
*
- * For example, "hellō\xC2\xFFworld" < " hElLŌ\xFE ", because the the
+ * For example, "hellō\xC2\xFFworld" < " hElLŌ\xFE ", because the
* strings are equal up to 'ō' by utf-8 casefold, but the "\xc2\xff" and
* "\xfe" are invalid sequences. At that point, we skip to the byte-by-byte
* (but space-eating, casefolding) comparison, and 0xc2 < 0xff.
diff --git a/libcli/auth/msrpc_parse.c b/libcli/auth/msrpc_parse.c
index d5661983a31..bdabcaff735 100644
--- a/libcli/auth/msrpc_parse.c
+++ b/libcli/auth/msrpc_parse.c
@@ -219,7 +219,7 @@ if ((head_ofs + amount) > blob->length) { \
}
/**
- this is a tiny msrpc packet parser. This the the partner of msrpc_gen
+ this is a tiny msrpc packet parser. This is the partner of msrpc_gen
format specifiers are:
diff --git a/libcli/auth/msrpc_parse.h b/libcli/auth/msrpc_parse.h
index 717dec9eb7c..488e8ffc464 100644
--- a/libcli/auth/msrpc_parse.h
+++ b/libcli/auth/msrpc_parse.h
@@ -37,7 +37,7 @@ NTSTATUS msrpc_gen(TALLOC_CTX *mem_ctx,
const char *format, ...);
/**
- this is a tiny msrpc packet parser. This the the partner of msrpc_gen
+ this is a tiny msrpc packet parser. This is the partner of msrpc_gen
format specifiers are:
diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index 1916b6db7b8..e552ccba20f 100644
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -1062,6 +1062,27 @@ static enum ndr_err_code ndr_token_find(struct
ndr_token_list *list,
return NDR_ERR_TOKEN;
}
+/*
+ * retrieve a token from a ndr context, matching by key address.
+ */
+static enum ndr_err_code ndr_token_find_by_key_address(struct ndr_token_list
*list,
+ const void *key,
+ uint32_t *v,
+ unsigned *_i)
+{
+ struct ndr_token *tokens = list->tokens;
+ unsigned i;
+ for (i = list->count - 1; i < list->count; i--) {
+ if (tokens[i].key == key) {
+ *_i = i;
+ *v = tokens[i].value;
+ return NDR_ERR_SUCCESS;
+ }
+ }
+ return NDR_ERR_TOKEN;
+}
+
+
_PUBLIC_ enum ndr_err_code ndr_token_peek_cmp_fn(struct ndr_token_list *list,
const void *key,
uint32_t *v,
@@ -1071,11 +1092,6 @@ _PUBLIC_ enum ndr_err_code ndr_token_peek_cmp_fn(struct
ndr_token_list *list,
return ndr_token_find(list, key, v, _cmp_fn, &i);
}
-static int token_cmp_ptr(const void *a, const void *b)
-{
- return (a == b) ? 0 : 1;
-}
-
/*
retrieve a token from a ndr context
*/
@@ -1086,7 +1102,7 @@ _PUBLIC_ enum ndr_err_code ndr_token_retrieve(struct
ndr_token_list *list,
uint32_t last;
unsigned i;
- err = ndr_token_find(list, key, v, token_cmp_ptr, &i);
+ err = ndr_token_find_by_key_address(list, key, v, &i);
if (!NDR_ERR_CODE_IS_SUCCESS(err)) {
return err;
}
@@ -1107,7 +1123,7 @@ _PUBLIC_ enum ndr_err_code ndr_token_peek(struct
ndr_token_list *list,
const void *key, uint32_t *v)
{
unsigned i;
- return ndr_token_find(list, key, v, token_cmp_ptr, &i);
+ return ndr_token_find_by_key_address(list, key, v, &i);
}
/*
diff --git a/nsswitch/libwbclient/wbc_sid.c b/nsswitch/libwbclient/wbc_sid.c
index 747addb1f5b..72173cfbb64 100644
--- a/nsswitch/libwbclient/wbc_sid.c
+++ b/nsswitch/libwbclient/wbc_sid.c
@@ -150,7 +150,7 @@ wbcErr wbcStringToSid(const char *str,
sid->id_auth[1] = (x & 0x00ff00000000ULL) >> 32;
sid->id_auth[0] = (x & 0xff0000000000ULL) >> 40;
- /* now read the the subauthorities */
+ /* now read the subauthorities */
p = q +1;
sid->num_auths = 0;
while (sid->num_auths < WBC_MAXSUBAUTHS) {
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 968a72bccc0..67f351c056f 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -2531,7 +2531,7 @@ static char* winbind_upn_to_username(struct pwb_context
*ctx,
return NULL;
}
- /* Convert the the SID back to the sAMAccountName */
+ /* Convert the SID back to the sAMAccountName */
wbc_status = wbcCtxLookupSid(ctx->wbc_ctx, &sid, &domain, &name, &type);
if (!WBC_ERROR_IS_OK(wbc_status)) {
diff --git a/python/samba/netcmd/domain/kds/root_key.py
b/python/samba/netcmd/domain/kds/root_key.py
index dcbdec27399..61237ff9c2b 100644
--- a/python/samba/netcmd/domain/kds/root_key.py
+++ b/python/samba/netcmd/domain/kds/root_key.py
@@ -136,7 +136,7 @@ ENCODERS = {
def encode_by_key(k, v):
- """Convert an attribute into a printable form, using the the attribute
+ """Convert an attribute into a printable form, using the attribute
name to guess the best format."""
fn = ENCODERS.get(k, lambda x: str(x))
diff --git a/python/samba/tests/gkdi.py b/python/samba/tests/gkdi.py
index 1fec624248b..3916c76d53e 100644
--- a/python/samba/tests/gkdi.py
+++ b/python/samba/tests/gkdi.py
@@ -574,7 +574,7 @@ def create_root_key(
) -> Tuple[misc.GUID, ldb.Dn]:
# [MS-GKDI] 3.1.4.1.1, “Creating a New Root Key”, states that if the
# server receives a GetKey request and the root keys container in Active
- # Directory is empty, the the server must create a new root key object
+ # Directory is empty, the server must create a new root key object
# based on the default Server Configuration object. Additional root keys
# are to be created based on either the default Server Configuration
# object or an updated one specifying optional configuration values.
diff --git a/python/samba/tests/samba_tool/contact.py
b/python/samba/tests/samba_tool/contact.py
index 2bec8135f87..39e96231692 100644
--- a/python/samba/tests/samba_tool/contact.py
+++ b/python/samba/tests/samba_tool/contact.py
@@ -55,7 +55,7 @@ class ContactCmdTestCase(SambaToolCmdTest):
"mobile": "12345"})
self.contacts.append(contact)
- # No 'name' is given here, so the name will be made from the the
+ # No 'name' is given here, so the name will be made from the
# sn, initials and givenName attributes.
contact = self._randomContact({"expectedname": "James T. Kirk",
"sn": "Kirk",
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index e034a4cb261..2a1efdaf37b 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -54,7 +54,7 @@
* and attributes. The tar callback function is get_file_callback().
*
* The callback function checks whether the file should be skipped
- * according the the configuration via tar_create_skip_path(). If it's
+ * according to the configuration via tar_create_skip_path(). If it's
* not skipped it's downloaded and written to the archive in
* tar_get_file().
*
diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
index 619feab6392..85fa5d1b7b7 100644
--- a/source3/include/libsmbclient.h
+++ b/source3/include/libsmbclient.h
@@ -333,7 +333,7 @@ typedef struct _SMBCCTX SMBCCTX;
/**@ingroup callback
* Authentication callback function type (traditional method)
*
- * Type for the the authentication function called by the library to
+ * Type for the authentication function called by the library to
* obtain authentication credentials
*
* For kerberos support the function should just be called without
@@ -372,7 +372,7 @@ typedef void (*smbc_get_auth_data_fn)(const char *srv,
/**@ingroup callback
* Authentication callback function type (method that includes context)
*
- * Type for the the authentication function called by the library to
+ * Type for the authentication function called by the library to
* obtain authentication credentials
*
* For kerberos support the function should just be called without
diff --git a/source3/lib/netapi/netapi.h b/source3/lib/netapi/netapi.h
index b9bf4a09804..80f5482b241 100644
--- a/source3/lib/netapi/netapi.h
+++ b/source3/lib/netapi/netapi.h
@@ -2085,7 +2085,7 @@ NET_API_STATUS NetUserGetLocalGroups(const char *
server_name /* [in] */,
*
* @param[in] server_name The server name to connect to
* @param[in] level The enumeration level used for the query
- * @param[in] idx The index to start the the display enumeration at
+ * @param[in] idx The index to start the display enumeration at
* @param[in] entries_requested The number of entries requested
* @param[in] prefmaxlen The requested maximal buffer size
* @param[out] entries_read The number of returned entries
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 70b2b11688d..f9ca179c78e 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -897,7 +897,7 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key,
TDB_DATA data, void
return 0;
}
- /* need to continue the the bottom of the function to
+ /* need to continue at the bottom of the function to
save the correct attributes */
}
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c
b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 2040a41b249..73ab36051d1 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -1870,7 +1870,7 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
r->in.access_mask = PRINTER_ACCESS_USE;
}
- /* check smb.conf parameters and the the sec_desc */
+ /* check smb.conf parameters and the sec_desc */
raddr = tsocket_address_inet_addr_string(remote_address,
p->mem_ctx);
if (raddr == NULL) {
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 53a9c53f54a..aa53e33053d 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -2508,7 +2508,7 @@ static bool unpack_canon_ace(files_struct *fsp,
/******************************************************************************
When returning permissions, try and fit NT display
- semantics if possible. Note the the canon_entries here must have been
malloced.
+ semantics if possible. Note that the canon_entries here must have been
malloced.
The list format should be - first entry = owner, followed by group and other
user
entries, last entry = other.
diff --git a/source4/dsdb/samdb/ldb_modules/group_audit.c
b/source4/dsdb/samdb/ldb_modules/group_audit.c
index 1b05e892386..7f979d1392b 100644
--- a/source4/dsdb/samdb/ldb_modules/group_audit.c
+++ b/source4/dsdb/samdb/ldb_modules/group_audit.c
@@ -385,7 +385,7 @@ static enum dn_compare_result dn_compare(
*
* Get the DN of a users primary group as a printable string.
*
- * @param mem_ctx Talloc context the the returned string will be allocated on.
+ * @param mem_ctx Talloc context the returned string will be allocated on.
* @param module The ldb module
* @param account_sid The SID for the uses account.
* @param primary_group_rid The RID for the users primary group.
diff --git a/source4/lib/registry/regf.c b/source4/lib/registry/regf.c
index 18734ae6f60..ebe52029224 100644
--- a/source4/lib/registry/regf.c
+++ b/source4/lib/registry/regf.c
@@ -1524,7 +1524,7 @@ static WERROR regf_sl_del_entry(struct regf_data *regf,
uint32_t list_offset,
}
li.key_count--;
- /* If the there are no entries left, free the subkey list */
+ /* If there are no entries left, free the subkey list */
if (li.key_count == 0) {
hbin_free(regf, list_offset);
*ret = -1;
@@ -1569,7 +1569,7 @@ static WERROR regf_sl_del_entry(struct regf_data *regf,
uint32_t list_offset,
}
lf.key_count--;
- /* If the there are no entries left, free the subkey list */
+ /* If there are no entries left, free the subkey list */
if (lf.key_count == 0) {
hbin_free(regf, list_offset);
*ret = -1;
@@ -1615,7 +1615,7 @@ static WERROR regf_sl_del_entry(struct regf_data *regf,
uint32_t list_offset,
}
lh.key_count--;
- /* If the there are no entries left, free the subkey list */
+ /* If there are no entries left, free the subkey list */
if (lh.key_count == 0) {
hbin_free(regf, list_offset);
*ret = -1;
diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index ae41752b3d6..8546ef9f1f2 100644
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -876,7 +876,7 @@ static NTSTATUS libnet_SetPassword_samr_handle(struct
libnet_context *ctx, TALLO
/*
* set a password with DCERPC/SAMR calls
* 1. connect to the SAMR pipe of users domain PDC (maybe a standalone server
or workstation)
- * is it correct to contact the the pdc of the domain of the user who's
password should be set?
+ * is it correct to contact the pdc of the domain of the user who's
password should be set?
* 2. do a samr_Connect to get a policy handle
* 3. do a samr_LookupDomain to get the domain sid
* 4. do a samr_OpenDomain to get a domain handle
diff --git a/source4/rpc_server/drsuapi/getncchanges.c
b/source4/rpc_server/drsuapi/getncchanges.c
index a73efe93eb9..a9088e55414 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -2597,7 +2597,7 @@ static WERROR getncchanges_chunk_add_la_targets(struct
getncchanges_repl_chunk *
* This could happen for a one-way linked attribute, if the
* target is deleted and then later expunged (thus, the source
* object can be left with a hanging link). Continue to send
- * the the link (the client-side has already tried once with
+ * the link (the client-side has already tried once with
* GET_TGT, so it should just end up ignoring it).
*/
if (ret == LDB_ERR_NO_SUCH_OBJECT) {
diff --git a/source4/torture/drs/python/repl_rodc.py
b/source4/torture/drs/python/repl_rodc.py
index ab3d6fa1928..fe493f37398 100644
--- a/source4/torture/drs/python/repl_rodc.py
+++ b/source4/torture/drs/python/repl_rodc.py
@@ -280,7 +280,7 @@ class DrsRodcTestCase(drs_base.DrsBaseTestCase):
(level, ctr) = self.rodc_drs.DsGetNCChanges(self.rodc_drs_handle, 8,
req8)
# Get the next replication chunk, but set REPL_SECRET this time. This
- # is following on the the previous accepted request, but we've changed
+ # is following on the previous accepted request, but we've changed
# exop to now request secrets. This request should fail
try:
req8 = self._exop_req8(dest_dsa=str(self.rodc_ctx.ntds_guid),
diff --git a/testprogs/win32/prepare_dcpromo/prepare_dcpromo.c
b/testprogs/win32/prepare_dcpromo/prepare_dcpromo.c
index 91b819b54e6..0103cd5d848 100755
--- a/testprogs/win32/prepare_dcpromo/prepare_dcpromo.c
+++ b/testprogs/win32/prepare_dcpromo/prepare_dcpromo.c
@@ -115,7 +115,7 @@ static DWORD StringToSid(const char *str,
sid->IdentifierAuthority.Value[1] = 0;
sid->IdentifierAuthority.Value[0] = 0;
- /* now read the the subauthorities */
+ /* now read the subauthorities */
p = q +1;
sid->SubAuthorityCount = 0;
--
Samba Shared Repository
