[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Apr 3 04:54:02 UTC 2023
The branch, master has been updated
via 4b1d2051383 lib:krb5_wrap: Fix code spelling
via 1bfa2c29387 lib:fuzzing: Fix code spelling
via 3289e7349ae lib:dbwrap: Fix code spelling
via 2b712191a84 lib:crypto: Improve comment about weak crypto
via 3d409c16ee7 lib:compression: Fix code spelling
via 4d39558c71f lib:cmdline: Fix code spelling
via 8e3bac473fe lib:audit_logging: Fix code spelling
via 1f2858eadaa lib:addns: Fix code spelling
via f59e813c760 lib:addns: Rename additionals to additional
via 8720a25d578 s4:libnet: cleanup py_net_time()
via 9b6f49d4b94 s3:modules: call rpcgen only if vfs_nfs4acl_xattr is enabled
from c66f6c58c7b torture/smb2: do not use client time in delayed timestamp updates test
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4b1d2051383a7bccc46dc34dba9be40a98892391
Author: Andreas Schneider <asn at samba.org>
Date: Fri Mar 31 11:14:11 2023 +0200
lib:krb5_wrap: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Mon Apr 3 04:53:05 UTC 2023 on atb-devel-224
commit 1bfa2c29387fb234a0ede244be54b9d13c9af11e
Author: Andreas Schneider <asn at samba.org>
Date: Fri Mar 31 11:11:34 2023 +0200
lib:fuzzing: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 3289e7349ae2523016abed890df1c5fc15a8a9b9
Author: Andreas Schneider <asn at samba.org>
Date: Fri Mar 31 11:10:03 2023 +0200
lib:dbwrap: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 2b712191a849a66d7362887647928067c2938f7d
Author: Andreas Schneider <asn at samba.org>
Date: Fri Mar 31 11:07:46 2023 +0200
lib:crypto: Improve comment about weak crypto
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 3d409c16ee7d00012f954e8e819f0f9d48aedb73
Author: Andreas Schneider <asn at samba.org>
Date: Fri Mar 31 11:04:54 2023 +0200
lib:compression: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 4d39558c71f4c4715694c93ad69308bde6d18031
Author: Andreas Schneider <asn at samba.org>
Date: Fri Mar 31 11:04:22 2023 +0200
lib:cmdline: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 8e3bac473fe600df9e7c154264b04f681b774d6d
Author: Andreas Schneider <asn at samba.org>
Date: Fri Mar 31 11:03:08 2023 +0200
lib:audit_logging: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 1f2858eadaad200a08522d4a0492ad7f12f3da43
Author: Andreas Schneider <asn at samba.org>
Date: Fri Mar 31 11:01:47 2023 +0200
lib:addns: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f59e813c76027184b9d57420e5fb73582505b857
Author: Andreas Schneider <asn at samba.org>
Date: Fri Mar 31 11:00:50 2023 +0200
lib:addns: Rename additionals to additional
Fixes code spelling.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 8720a25d57819ea51c304c9f76f84c6aa18fb2ae
Author: Dmitry Antipov <dantipov at cloudlinux.com>
Date: Fri Mar 31 08:06:44 2023 +0300
s4:libnet: cleanup py_net_time()
Fix size of buffer passed to and always check the value returned
from strftime(), raise PyErr_NoMemory() and return NULL if zero,
or use it with PyUnicode_FromStringAndSize() (thus avoiding extra
internal call to strlen()) otherwise.
Signed-off-by: Dmitry Antipov <dantipov at cloudlinux.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 9b6f49d4b946ae436ee4d5f20613508b368f14b0
Author: David Disseldorp <ddiss at samba.org>
Date: Tue Mar 28 17:00:24 2023 +0200
s3:modules: call rpcgen only if vfs_nfs4acl_xattr is enabled
rpcgen may be missing, so wrap all of the vfs_nfs4acl_xattr associated
calls in an appropriate if bld.SAMBA3_IS_ENABLED_MODULE() check.
Signed-off-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/addns/dns.h | 4 +-
lib/addns/dnsgss.c | 4 +-
lib/addns/dnsmarshall.c | 10 ++--
lib/addns/dnsquery.c | 4 +-
lib/addns/dnsquery_srv.c | 2 +-
lib/audit_logging/audit_logging.c | 2 +-
lib/cmdline/cmdline.h | 4 +-
lib/cmdline/cmdline_private.h | 10 ++--
lib/compression/lzxpress_huffman.c | 6 +--
lib/compression/lzxpress_huffman.h | 2 +-
lib/compression/pycompression.c | 2 +-
lib/compression/tests/test_lzx_huffman.c | 4 +-
lib/compression/tests/test_lzxpress_plain.c | 4 +-
lib/crypto/gnutls_weak_crypto.c | 3 +-
lib/dbwrap/dbwrap.h | 2 +-
lib/dbwrap/dbwrap_rbt.c | 2 +-
lib/fuzzing/fuzz_ndr_X.c | 2 +-
lib/fuzzing/oss-fuzz/check_build.sh | 2 +-
lib/fuzzing/oss-fuzz/do_build.sh | 6 +--
lib/krb5_wrap/krb5_samba.c | 34 ++++++------
lib/krb5_wrap/krb5_samba.h | 2 +-
source3/modules/wscript_build | 83 ++++++++++++++---------------
source4/libnet/py_net.c | 13 +++--
23 files changed, 105 insertions(+), 102 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/addns/dns.h b/lib/addns/dns.h
index 1f61d6e5bda..2c311e72a00 100644
--- a/lib/addns/dns.h
+++ b/lib/addns/dns.h
@@ -197,7 +197,7 @@ struct dns_request {
struct dns_question **questions;
struct dns_rrec **answers;
struct dns_rrec **auths;
- struct dns_rrec **additionals;
+ struct dns_rrec **additional;
};
/*
@@ -216,7 +216,7 @@ struct dns_update_request {
struct dns_zone **zones;
struct dns_rrec **preqs;
struct dns_rrec **updates;
- struct dns_rrec **additionals;
+ struct dns_rrec **additional;
};
struct dns_connection {
diff --git a/lib/addns/dnsgss.c b/lib/addns/dnsgss.c
index a446da670f7..a315b804df4 100644
--- a/lib/addns/dnsgss.c
+++ b/lib/addns/dnsgss.c
@@ -138,7 +138,7 @@ static DNS_ERROR dns_negotiate_gss_ctx_int( TALLOC_CTX *mem_ctx,
&req->answers);
} else {
err = dns_add_rrec(req, rec, &req->num_additionals,
- &req->additionals);
+ &req->additional);
}
if (!ERR_DNS_IS_OK(err)) goto error;
@@ -334,7 +334,7 @@ DNS_ERROR dns_sign_update(struct dns_update_request *req,
gss_release_buffer(&minor, &mic);
if (!ERR_DNS_IS_OK(err)) goto error;
- err = dns_add_rrec(req, rec, &req->num_additionals, &req->additionals);
+ err = dns_add_rrec(req, rec, &req->num_additionals, &req->additional);
error:
TALLOC_FREE(buf);
diff --git a/lib/addns/dnsmarshall.c b/lib/addns/dnsmarshall.c
index a07ed784ce1..6c93b98144f 100644
--- a/lib/addns/dnsmarshall.c
+++ b/lib/addns/dnsmarshall.c
@@ -369,7 +369,7 @@ DNS_ERROR dns_marshall_request(TALLOC_CTX *mem_ctx,
dns_marshall_rr(buf, req->auths[i]);
}
for (i=0; i<req->num_additionals; i++) {
- dns_marshall_rr(buf, req->additionals[i]);
+ dns_marshall_rr(buf, req->additional[i]);
}
if (!ERR_DNS_IS_OK(buf->error)) {
@@ -424,7 +424,7 @@ DNS_ERROR dns_unmarshall_request(TALLOC_CTX *mem_ctx,
goto error;
}
if ((req->num_additionals != 0) &&
- !(req->additionals = talloc_zero_array(req, struct dns_rrec *,
+ !(req->additional = talloc_zero_array(req, struct dns_rrec *,
req->num_additionals))) {
goto error;
}
@@ -442,8 +442,8 @@ DNS_ERROR dns_unmarshall_request(TALLOC_CTX *mem_ctx,
&req->auths[i]);
}
for (i=0; i<req->num_additionals; i++) {
- dns_unmarshall_rr(req->additionals, buf,
- &req->additionals[i]);
+ dns_unmarshall_rr(req->additional, buf,
+ &req->additional[i]);
}
if (!ERR_DNS_IS_OK(buf->error)) {
@@ -492,7 +492,7 @@ struct dns_request *dns_update2request(struct dns_update_request *update)
(struct dns_question **)(void *)update->zones) &&
(req->answers == update->preqs) &&
(req->auths == update->updates) &&
- (req->additionals == update->additionals));
+ (req->additional == update->additional));
#endif
return req;
diff --git a/lib/addns/dnsquery.c b/lib/addns/dnsquery.c
index 869d4597ee4..7590c9ff508 100644
--- a/lib/addns/dnsquery.c
+++ b/lib/addns/dnsquery.c
@@ -561,7 +561,7 @@ NTSTATUS ads_dns_lookup_a(TALLOC_CTX *ctx,
goto fail;
}
/*
- * Sychronous doesn't need to care about the rcode or
+ * Synchronous doesn't need to care about the rcode or
* a copy of the name_in.
*/
status = ads_dns_lookup_a_recv(req,
@@ -766,7 +766,7 @@ NTSTATUS ads_dns_lookup_aaaa(TALLOC_CTX *ctx,
goto fail;
}
/*
- * Sychronous doesn't need to care about the rcode or
+ * Synchronous doesn't need to care about the rcode or
* a copy of the name_in.
*/
status = ads_dns_lookup_aaaa_recv(req,
diff --git a/lib/addns/dnsquery_srv.c b/lib/addns/dnsquery_srv.c
index 6cba22f32a2..ac9e612b8f9 100644
--- a/lib/addns/dnsquery_srv.c
+++ b/lib/addns/dnsquery_srv.c
@@ -159,7 +159,7 @@ static void dns_rr_srv_fill_done(
* (hundreds) and a DNS that doesn't return the DC IPs in the
* SRV reply, you have bigger problems than this loop linearly
* walking a pointer array. This is theoretically O(n^2), but
- * probably the DNS roundtrip time outweights this by a
+ * probably the DNS roundtrip time outweighs this by a
* lot. And we have a global timeout on this whole
* dns_rr_srv_fill routine.
*/
diff --git a/lib/audit_logging/audit_logging.c b/lib/audit_logging/audit_logging.c
index 3ab14b2a187..671653fdcef 100644
--- a/lib/audit_logging/audit_logging.c
+++ b/lib/audit_logging/audit_logging.c
@@ -918,7 +918,7 @@ int json_add_guid(struct json_object *object,
* @param new_obj the new value object to be inserted.
*
* @return 0 the operation was successful
- * -1 the operation failed (e.j. if one of the paramters is invalid)
+ * -1 the operation failed (e.j. if one of the parameters is invalid)
*/
int json_update_object(struct json_object *object,
const char *key,
diff --git a/lib/cmdline/cmdline.h b/lib/cmdline/cmdline.h
index e254a1db5c3..19d1503ac59 100644
--- a/lib/cmdline/cmdline.h
+++ b/lib/cmdline/cmdline.h
@@ -80,10 +80,10 @@ struct samba_cmdline_daemon_cfg {
* This should be a long living context till the client
* exits.
*
- * @param[in] require_smbconf Wether the smb.conf file is required to be
+ * @param[in] require_smbconf Whether the smb.conf file is required to be
* present or not?
*
- * @return true on success, false if an error occured.
+ * @return true on success, false if an error occurred.
*/
bool samba_cmdline_init(TALLOC_CTX *mem_ctx,
enum samba_cmdline_config_type config_type,
diff --git a/lib/cmdline/cmdline_private.h b/lib/cmdline/cmdline_private.h
index b1584e020dc..9706b008b3e 100644
--- a/lib/cmdline/cmdline_private.h
+++ b/lib/cmdline/cmdline_private.h
@@ -58,7 +58,7 @@ typedef bool (*samba_cmdline_load_config)(void);
* This should be a long living context till the client
* exits.
*
- * @return true on success, false if an error occured.
+ * @return true on success, false if an error occurred.
*/
bool samba_cmdline_init_common(TALLOC_CTX *mem_ctx);
@@ -70,7 +70,7 @@ bool samba_cmdline_init_common(TALLOC_CTX *mem_ctx);
*
* @param[in] fn The callback to load the smb.conf file.
*
- * @return true on success, false if an error occured.
+ * @return true on success, false if an error occurred.
*/
bool samba_cmdline_set_load_config_fn(samba_cmdline_load_config fn);
@@ -83,7 +83,7 @@ bool samba_cmdline_set_load_config_fn(samba_cmdline_load_config fn);
*
* @param[in] mem_ctx The talloc memory context.
*
- * @return true on success, false if an error occured.
+ * @return true on success, false if an error occurred.
*/
bool samba_cmdline_set_talloc_ctx(TALLOC_CTX *mem_ctx);
@@ -103,7 +103,7 @@ TALLOC_CTX *samba_cmdline_get_talloc_ctx(void);
*
* @param[in] lp_ctx The loadparm context to use.
*
- * @return true on success, false if an error occured.
+ * @return true on success, false if an error occurred.
*/
bool samba_cmdline_set_lp_ctx(struct loadparm_context *lp_ctx);
@@ -114,7 +114,7 @@ bool samba_cmdline_set_lp_ctx(struct loadparm_context *lp_ctx);
*
* @param[in] creds The client credentials to use.
*
- * @return true on success, false if an error occured.
+ * @return true on success, false if an error occurred.
*/
bool samba_cmdline_set_creds(struct cli_credentials *creds);
diff --git a/lib/compression/lzxpress_huffman.c b/lib/compression/lzxpress_huffman.c
index ee0fa2c83e6..4d69cc406ec 100644
--- a/lib/compression/lzxpress_huffman.c
+++ b/lib/compression/lzxpress_huffman.c
@@ -447,7 +447,7 @@ static int generate_huffman_codes(struct huffman_node *leaf_nodes,
n_leaves = 2;
}
- /* note, in sort we're using internal_nodes as auxillary space */
+ /* note, in sort we're using internal_nodes as auxiliary space */
stable_sort(leaf_nodes,
internal_nodes,
n_leaves,
@@ -465,7 +465,7 @@ static int generate_huffman_codes(struct huffman_node *leaf_nodes,
* In practice it will almost always resolve in the first round; if
* not then, in the second or third. Remember we'll looking at 64k or
* less, so the rarest we can have is 1 in 64k; each round of
- * quantization effecively doubles its frequency to 1 in 32k, 1 in
+ * quantization effectively doubles its frequency to 1 in 32k, 1 in
* 16k, etc, until we're treating the rare symbol as actually quite
* common.
*/
@@ -591,7 +591,7 @@ static int generate_huffman_codes(struct huffman_node *leaf_nodes,
*
* We need to sort the nodes of equal depth, so that
* they are sorted by depth first, and symbol value
- * second. The internal_nodes can again be auxillary
+ * second. The internal_nodes can again be auxiliary
* memory.
*/
stable_sort(
diff --git a/lib/compression/lzxpress_huffman.h b/lib/compression/lzxpress_huffman.h
index 232e58920f5..41cca5c40a4 100644
--- a/lib/compression/lzxpress_huffman.h
+++ b/lib/compression/lzxpress_huffman.h
@@ -45,7 +45,7 @@ struct huffman_node {
/*
* This struct just coalesces all the memory you need for LZ77 + Huffman
- * compresssion together in one bundle.
+ * compression together in one bundle.
*
* There are a few different things you want, you usually want them all, so
* this makes it easy to allocate them all at once.
diff --git a/lib/compression/pycompression.c b/lib/compression/pycompression.c
index f67b0ddbe39..3be3620b1cf 100644
--- a/lib/compression/pycompression.c
+++ b/lib/compression/pycompression.c
@@ -270,7 +270,7 @@ static PyMethodDef mod_methods[] = {
};
-#define MODULE_DOC PyDoc_STR("LZXpress compresssion/decompression bindings")
+#define MODULE_DOC PyDoc_STR("LZXpress compression/decompression bindings")
static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
diff --git a/lib/compression/tests/test_lzx_huffman.c b/lib/compression/tests/test_lzx_huffman.c
index b7f22b9072b..7770535c1e9 100644
--- a/lib/compression/tests/test_lzx_huffman.c
+++ b/lib/compression/tests/test_lzx_huffman.c
@@ -293,7 +293,7 @@ struct lzx_pair bidirectional_pairs[] = {
/*
* In this case there are no matches encoded as there are no
* repeated symbols. Including the EOF, there are 27 symbols
- * all occuring exactly as frequently as each other (once).
+ * all occurring exactly as frequently as each other (once).
* From that we would expect the codes to be mostly 5 bits
* long, because 27 < 2^5 (32), but greater than 2^4. And
* that's what we see.
@@ -819,7 +819,7 @@ static void test_lzxpress_huffman_long_random_graph_round_trip(void **state)
* simple loop, but we introduce damage into the system, randomly
* flipping about 1 bit in 64.
*
- * The result is semi-structured and compressable.
+ * The result is semi-structured and compressible.
*/
uint8_t *d = original.data;
uint8_t *table = talloc_array(mem_ctx, uint8_t, 65536);
diff --git a/lib/compression/tests/test_lzxpress_plain.c b/lib/compression/tests/test_lzxpress_plain.c
index b1a4bee6e92..1c147932d40 100644
--- a/lib/compression/tests/test_lzxpress_plain.c
+++ b/lib/compression/tests/test_lzxpress_plain.c
@@ -481,7 +481,7 @@ static void test_lzxpress_plain_round_trip_files(void **state)
((double)compressed_total) / reference_total);
/*
* Assert that the compression is better than Windows. Unlike the
- * Huffman varient, where things are very even, here we do much better
+ * Huffman variant, where things are very even, here we do much better
* than Windows without especially trying.
*/
assert_true(compressed_total <= reference_total);
@@ -592,7 +592,7 @@ static void test_lzxpress_plain_long_random_graph_round_trip(void **state)
* simple loop, but we introduce damage into the system, randomly
* flipping about 1 bit in 64.
*
- * The result is semi-structured and compressable.
+ * The result is semi-structured and compressible.
*/
uint8_t *d = original.data;
uint8_t *table = talloc_array(mem_ctx, uint8_t, 65536);
diff --git a/lib/crypto/gnutls_weak_crypto.c b/lib/crypto/gnutls_weak_crypto.c
index 68ce588243f..dcc53bb0037 100644
--- a/lib/crypto/gnutls_weak_crypto.c
+++ b/lib/crypto/gnutls_weak_crypto.c
@@ -31,8 +31,7 @@ bool samba_gnutls_weak_crypto_allowed(void)
int rc;
/*
- * If RC4 is not allowed to be initialzed then weak crypto is not
- * allowed.
+ * If we can't initialize RC4 then weak crypto is not allowed.
*/
rc = gnutls_cipher_init(&cipher_hnd,
GNUTLS_CIPHER_ARCFOUR_128,
diff --git a/lib/dbwrap/dbwrap.h b/lib/dbwrap/dbwrap.h
index cfae403b178..834b10f0942 100644
--- a/lib/dbwrap/dbwrap.h
+++ b/lib/dbwrap/dbwrap.h
@@ -123,7 +123,7 @@ NTSTATUS dbwrap_parse_record(struct db_context *db, TDB_DATA key,
* @param[out] req_state Pointer to a enum dbwrap_req_state variable
*
* @note req_state is updated in the send function. To determine the final
- * result of the request the caller should therefor not rely on req_state. The
+ * result of the request the caller should therefore not rely on req_state. The
* primary use case is to give the caller an indication whether the request is
* already sent to ctdb (DBWRAP_REQ_DISPATCHED) or if it's still stuck in the
* sendqueue (DBWRAP_REQ_QUEUED).
diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c
index 691acef688d..89d30bb3232 100644
--- a/lib/dbwrap/dbwrap_rbt.c
+++ b/lib/dbwrap/dbwrap_rbt.c
@@ -358,7 +358,7 @@ static struct db_record *db_rbt_fetch_locked(struct db_context *db_ctx,
/*
* In this low-level routine, play tricks to reduce the number of
- * tallocs to one. Not recommened for general use, but here it pays
+ * tallocs to one. Not recommended for general use, but here it pays
* off.
*/
diff --git a/lib/fuzzing/fuzz_ndr_X.c b/lib/fuzzing/fuzz_ndr_X.c
index a3fb984451f..3c0fe062d96 100644
--- a/lib/fuzzing/fuzz_ndr_X.c
+++ b/lib/fuzzing/fuzz_ndr_X.c
@@ -49,7 +49,7 @@ enum {
/*
* We want an even number here to ensure 4-byte alignment later
- * not just for efficieny but because the fuzzers are known to guess
+ * not just for efficiency but because the fuzzers are known to guess
* that numbers will be 4-byte aligned
*/
#define HEADER_SIZE 4
diff --git a/lib/fuzzing/oss-fuzz/check_build.sh b/lib/fuzzing/oss-fuzz/check_build.sh
index 6523bf32ace..487addfe80a 100755
--- a/lib/fuzzing/oss-fuzz/check_build.sh
+++ b/lib/fuzzing/oss-fuzz/check_build.sh
@@ -3,7 +3,7 @@
# A very simple check script to confirm we still provide binaries
# that look like the targets oss-fuzz wants.
#
-# A much stronger check is availble in oss-fuzz via
+# A much stronger check is available in oss-fuzz via
# infra/helper.py check_build samba
#
diff --git a/lib/fuzzing/oss-fuzz/do_build.sh b/lib/fuzzing/oss-fuzz/do_build.sh
index 3b2fdd0da94..b23f6cd4e3e 100755
--- a/lib/fuzzing/oss-fuzz/do_build.sh
+++ b/lib/fuzzing/oss-fuzz/do_build.sh
@@ -109,7 +109,7 @@ mkdir -p $OUT/lib
# but not for our hack.
#
# If we use RUNPATH, we can get an error like this:
-# Step #6: Error occured while running fuzz_nmblib_parse_packet:
+# Step #6: Error occurred while running fuzz_nmblib_parse_packet:
# Step #6: /workspace/out/coverage/fuzz_nmblib_parse_packet: error while loading shared libraries: libavahi-common.so.3: cannot open shared object file: No such file or directory
#
# This is because the full contents of $OUT are copied to yet another
@@ -274,11 +274,11 @@ done
# will cause the dynamic linker to search in the runpath, and not in $OUT/lib,
# and there's no way it will be found in the fuzzing env.
#
-# So how is the indirect depedency found in $OUT/lib? Well, suppose the fuzzer binary
+# So how is the indirect dependency found in $OUT/lib? Well, suppose the fuzzer binary
# links library A which links library B. During linking, both A and B as listed in the
# executable file's runtime dependencies (This was pioneered in Fedora 13 in 2010, but
# is common behavior now). So we have the fuzzer binary with RPATH set to $OUT/lib, and
-# a dependency on library B, and it will therefor find library B in $OUT/lib. On the
+# a dependency on library B, and it will therefore find library B in $OUT/lib. On the
# hand, if we keep the RUNPATH in library A, and load A first, it will try loading
# library B as a dependency of A from the wrong place.
chrpath -d $OUT/lib/*
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 6c50e3283c0..61fda0e502c 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -143,7 +143,7 @@ const krb5_data *krb5_princ_component(krb5_context context,
* @param[in] paddr A pointer to a 'struct sockaddr_storage to extract the
* address from.
*
- * @param[out] pkaddr A Kerberos address to store tha address in.
+ * @param[out] pkaddr A Kerberos address to store the address in.
*
* @return True on success, false if an error occurred.
*/
@@ -176,7 +176,7 @@ bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
* @param[in] paddr A pointer to a 'struct sockaddr_storage to extract the
* address from.
*
- * @param[in] pkaddr A Kerberos address to store tha address in.
+ * @param[in] pkaddr A Kerberos address to store the address in.
*
* @return True on success, false if an error occurred.
*/
@@ -1074,15 +1074,15 @@ char *smb_krb5_principal_get_comp_string(TALLOC_CTX *mem_ctx,
*
* @param[in] service_string The service ticket string
* (e.g. krbtgt/SAMBA.SITE at SAMBA.SITE) or NULL. If
- * the sevice ticket is specified, it is parsed (
- * with the realm part ignored) and used as the
+ * the service ticket is specified, it is parsed
+ * (with the realm part ignored) and used as the
* server principal of the credential. Otherwise
* the ticket-granting service is used.
*
* @param[in] expire_time A pointer to store the credentials end time or
* NULL.
*
- * @return 0 on Succes, a Kerberos error code otherwise.
+ * @return 0 on Success, a Kerberos error code otherwise.
*/
krb5_error_code smb_krb5_renew_ticket(const char *ccache_string,
const char *client_string,
@@ -1405,7 +1405,7 @@ krb5_error_code smb_krb5_enctype_to_string(krb5_context context,
*
* @param[in] write_access Open with readwrite access.
*
- * @param[in] keytab A pointer o the opended key table.
+ * @param[in] keytab A pointer to the opened key table.
*
* The keytab pointer should be freed using krb5_kt_close().
*
@@ -1543,7 +1543,7 @@ out:
*
* @param[in] write_access Open with readwrite access.
*
- * @param[in] keytab A pointer o the opended key table.
+ * @param[in] keytab A pointer to the opened key table.
*
* The keytab pointer should be freed using krb5_kt_close().
*
@@ -1644,7 +1644,7 @@ krb5_error_code smb_krb5_kt_get_name(TALLOC_CTX *mem_ctx,
*
* @param[in] flush Whether to flush the complete keytab.
*
- * @retval 0 on Sucess
+ * @retval 0 on Success
*
* @return An appropriate KRB5 error code.
*/
@@ -2091,7 +2091,7 @@ krb5_error_code smb_krb5_get_credentials(krb5_context context,
/**
* @brief Initialize a krb5_keyblock with the given data.
*
- * Initialized a new keyblock, allocates the contents fo the key and
+ * Initializes a new keyblock, allocates the contents for the key and
* copies the data into the keyblock.
*
* @param[in] context The library context
@@ -2147,7 +2147,7 @@ krb5_error_code smb_krb5_keyblock_init_contents(krb5_context context,
*
* @param[in] krb_options Initial credential options.
*
- * @param[in] expire_time A pointer to store the experation time of the
+ * @param[in] expire_time A pointer to store the expiration time of the
* credentials (or NULL).
*
* @param[in] kdc_time A pointer to store the time when the ticket becomes
@@ -2260,7 +2260,7 @@ done:
*
* @param[in] krb_options Initial credential options.
*
- * @param[in] expire_time A pointer to store the experation time of the
+ * @param[in] expire_time A pointer to store the expiration time of the
* credentials (or NULL).
*
* @param[in] kdc_time A pointer to store the time when the ticket becomes
@@ -2340,7 +2340,7 @@ done:
*
* @param[in] krb_options Initial credential options.
*
- * @param[in] expire_time A pointer to store the experation time of the
+ * @param[in] expire_time A pointer to store the expiration time of the
* credentials (or NULL).
*
* @param[in] kdc_time A pointer to store the time when the ticket becomes
@@ -3051,7 +3051,7 @@ void smb_krb5_free_checksum_contents(krb5_context ctx, krb5_checksum *cksum)
* This function computes a checksum over a PAC using the keyblock for a keyed
--
Samba Shared Repository
More information about the samba-cvs
mailing list