From de90ac17c393265ad073b1a80117b6579113cd7f Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:12:14 +0200 Subject: [PATCH 01/35] Fix spelling s/allows to/allows one to/ Signed-off-by: Mathieu Parent --- ctdb/client/client.h | 4 ++-- ctdb/common/run_event.h | 2 +- ctdb/common/run_proc.h | 2 +- ctdb/common/sock_client.h | 2 +- ctdb/common/sock_daemon.h | 2 +- docs-xml/smbdotconf/winbind/winbindignoredomains.xml | 2 +- lib/krb5_wrap/krb5_samba.c | 4 ++-- third_party/cmocka/cmocka.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ctdb/client/client.h b/ctdb/client/client.h index e792047e914..2eec3eaed63 100644 --- a/ctdb/client/client.h +++ b/ctdb/client/client.h @@ -31,7 +31,7 @@ * * @brief Client api to talk to ctdb daemon * - * This API allows to connect to ctdb daemon, perform various database + * This API allows one to connect to ctdb daemon, perform various database * operations, send controls to ctdb daemon and send messages to other ctdb * clients. */ @@ -193,7 +193,7 @@ int ctdb_client_wait_timeout(struct tevent_context *ev, bool *done, * @brief Async computation start to wait till recovery is completed * * CTDB daemon does not perform many operations while in recovery (especially - * database operations). This computation allows to wait till ctdb daemon has + * database operations). This computation allows one to wait till ctdb daemon has * finished recovery. * * @param[in] mem_ctx Talloc memory context diff --git a/ctdb/common/run_event.h b/ctdb/common/run_event.h index b7266875e9c..bd0f3e675a9 100644 --- a/ctdb/common/run_event.h +++ b/ctdb/common/run_event.h @@ -30,7 +30,7 @@ * * @brief Run scripts in a directory with specific event arguments. * - * This abstraction allows to execute multiple scripts in a directory + * This abstraction allows one to execute multiple scripts in a directory * (specified by script_dir) with given event and arguments. * * At one time, only one event can be run. Multiple run_event calls diff --git a/ctdb/common/run_proc.h b/ctdb/common/run_proc.h index 7de0c84f857..7b06dad90b1 100644 --- a/ctdb/common/run_proc.h +++ b/ctdb/common/run_proc.h @@ -28,7 +28,7 @@ * * @brief Run a process and capture the output * - * This abstraction allows to execute scripts with argumunts. + * This abstraction allows one to execute scripts with argumunts. */ /** diff --git a/ctdb/common/sock_client.h b/ctdb/common/sock_client.h index c5822a0ac01..d661c85f3e1 100644 --- a/ctdb/common/sock_client.h +++ b/ctdb/common/sock_client.h @@ -28,7 +28,7 @@ * * @brief A framework for a client based on unix-domain sockets. * - * This abstraction allows to build clients that communicate using + * This abstraction allows one to build clients that communicate using * unix-domain sockets. It takes care of the common boilerplate. */ diff --git a/ctdb/common/sock_daemon.h b/ctdb/common/sock_daemon.h index a071833c2f3..a2c4d3de778 100644 --- a/ctdb/common/sock_daemon.h +++ b/ctdb/common/sock_daemon.h @@ -30,7 +30,7 @@ * * @brief A framework for a server based on unix-domain sockets. * - * This abstraction allows to build simple servers that communicate using + * This abstraction allows one to build simple servers that communicate using * unix-domain sockets. It takes care of the common boilerplate. */ diff --git a/docs-xml/smbdotconf/winbind/winbindignoredomains.xml b/docs-xml/smbdotconf/winbind/winbindignoredomains.xml index 62a8f8634e5..af992228a42 100644 --- a/docs-xml/smbdotconf/winbind/winbindignoredomains.xml +++ b/docs-xml/smbdotconf/winbind/winbindignoredomains.xml @@ -3,7 +3,7 @@ type="cmdlist" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> - Allows to enter a list of trusted domains winbind should + Allows one to enter a list of trusted domains winbind should ignore (untrust). This can avoid the overhead of resources from attempting to login to DCs that should not be communicated with. diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index 1493d812266..f49838cc61c 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -1196,7 +1196,7 @@ krb5_error_code smb_krb5_enctype_to_string(krb5_context context, /** * @brief Open a key table readonly or with readwrite access. * - * Allows to use a different keytab than the default one using a relative + * Allows one to use a different keytab than the default one using a relative * path to the keytab. * * @param[in] context The library context @@ -1334,7 +1334,7 @@ krb5_error_code smb_krb5_kt_open_relative(krb5_context context, /** * @brief Open a key table readonly or with readwrite access. * - * Allows to use a different keytab than the default one. The path needs to be + * Allows one to use a different keytab than the default one. The path needs to be * an absolute path or an error will be returned. * * @param[in] context The library context diff --git a/third_party/cmocka/cmocka.c b/third_party/cmocka/cmocka.c index a5115c7cb5e..0861c2cbcd6 100644 --- a/third_party/cmocka/cmocka.c +++ b/third_party/cmocka/cmocka.c @@ -45,7 +45,7 @@ #include /* - * This allows to add a platform specific header file. Some embedded platforms + * This allows one to add a platform specific header file. Some embedded platforms * sometimes miss certain types and definitions. * * Example: From d97c44c3f779fb1775b6598616b77c81f4df6fa8 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:13:58 +0200 Subject: [PATCH 02/35] Fix spelling s/anwser/answer/ Signed-off-by: Mathieu Parent --- source4/torture/nbt/winsreplication.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c index e1d4b93618e..15db3ab9169 100644 --- a/source4/torture/nbt/winsreplication.c +++ b/source4/torture/nbt/winsreplication.c @@ -125,7 +125,7 @@ static bool test_assoc_ctx1(struct torture_context *tctx) torture_comment(tctx, "association context (conn2): 0x%x\n", associate2.out.assoc_ctx); - torture_comment(tctx, "Send a replication table query, with assoc 1 (conn2), the anwser should be on conn1\n"); + torture_comment(tctx, "Send a replication table query, with assoc 1 (conn2), the answer should be on conn1\n"); ZERO_STRUCT(packet); packet.opcode = WREPL_OPCODE_BITS; packet.assoc_ctx = associate1.out.assoc_ctx; From f7cf99c1943ad0c1156c6bf71b50b75532ea6e08 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:14:34 +0200 Subject: [PATCH 03/35] Fix spelling s/authenticaiton/authentication/ Signed-off-by: Mathieu Parent --- docs-xml/manpages/ntlm_auth.1.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs-xml/manpages/ntlm_auth.1.xml b/docs-xml/manpages/ntlm_auth.1.xml index 4f900d5b422..4f77eae7201 100644 --- a/docs-xml/manpages/ntlm_auth.1.xml +++ b/docs-xml/manpages/ntlm_auth.1.xml @@ -253,7 +253,7 @@ Request-User-Session-Key - Upon successful authenticaiton, return + Upon successful authentication, return the user session key associated with the login. Examples: @@ -264,7 +264,7 @@ Request-LanMan-Session-Key - Upon successful authenticaiton, return + Upon successful authentication, return the LANMAN session key associated with the login. From 91058f63e9b32a5b28efdc1a60e2e875bdc8d3e0 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:18:01 +0200 Subject: [PATCH 04/35] Heimdal: Fix spelling s/bulding/building/ Signed-off-by: Mathieu Parent --- source4/heimdal/lib/hx509/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/heimdal/lib/hx509/cert.c b/source4/heimdal/lib/hx509/cert.c index 190bdb48a4f..05d6dc58f09 100644 --- a/source4/heimdal/lib/hx509/cert.c +++ b/source4/heimdal/lib/hx509/cert.c @@ -1269,7 +1269,7 @@ _hx509_calculate_path(hx509_context context, if (path->len > max_depth) { hx509_cert_free(current); hx509_set_error_string(context, 0, HX509_PATH_TOO_LONG, - "Path too long while bulding " + "Path too long while building " "certificate chain"); return HX509_PATH_TOO_LONG; } From 6cae75bdc69d35725935b3c6f35b1e5a9131045d Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:18:16 +0200 Subject: [PATCH 05/35] Fix spelling s/conection/connection/ Signed-off-by: Mathieu Parent --- libcli/named_pipe_auth/npa_tstream.c | 4 ++-- source4/torture/nbt/winsreplication.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libcli/named_pipe_auth/npa_tstream.c b/libcli/named_pipe_auth/npa_tstream.c index d333ce6ee22..8ec52ed9b85 100644 --- a/libcli/named_pipe_auth/npa_tstream.c +++ b/libcli/named_pipe_auth/npa_tstream.c @@ -1402,7 +1402,7 @@ int _tstream_npa_accept_existing_recv(struct tevent_req *req, ret = tsocket_simple_int_recv(req, perrno); if (ret != 0) { - DEBUG(2, ("Failed to accept named pipe conection: %s\n", + DEBUG(2, ("Failed to accept named pipe connection: %s\n", strerror(*perrno))); tevent_req_received(req); return -1; @@ -1416,7 +1416,7 @@ int _tstream_npa_accept_existing_recv(struct tevent_req *req, #else *perrno = EINVAL; #endif - DEBUG(2, ("Failed to accept named pipe conection: %s => %s\n", + DEBUG(2, ("Failed to accept named pipe connection: %s => %s\n", nt_errstr(state->accept_status), strerror(*perrno))); tevent_req_received(req); diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c index 15db3ab9169..5d89f711219 100644 --- a/source4/torture/nbt/winsreplication.c +++ b/source4/torture/nbt/winsreplication.c @@ -101,7 +101,7 @@ static bool test_assoc_ctx1(struct torture_context *tctx) if (!torture_nbt_get_name(tctx, &name, &address)) return false; - torture_comment(tctx, "Test if assoc_ctx is only valid on the conection it was created on\n"); + torture_comment(tctx, "Test if assoc_ctx is only valid on the connection it was created on\n"); wrepl_socket1 = wrepl_socket_init(tctx, tctx->ev); wrepl_socket2 = wrepl_socket_init(tctx, tctx->ev); From 56e1a8d49a8f9ae5663fb559064f92fe3e8ae6d6 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:18:47 +0200 Subject: [PATCH 06/35] Fix spelling s/coult/could/ Signed-off-by: Mathieu Parent --- source3/passdb/pdb_samba_dsdb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/passdb/pdb_samba_dsdb.c b/source3/passdb/pdb_samba_dsdb.c index 05052a66361..06dea6d616a 100644 --- a/source3/passdb/pdb_samba_dsdb.c +++ b/source3/passdb/pdb_samba_dsdb.c @@ -2236,7 +2236,7 @@ static bool pdb_samba_dsdb_get_trusteddom_pw(struct pdb_methods *m, (ndr_pull_flags_fn_t)ndr_pull_trustAuthInOutBlob); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { DEBUG(0, ("Failed to get trusted domain password for %s, " - "attribute trustAuthOutgoing coult not be parsed %s.\n", + "attribute trustAuthOutgoing could not be parsed %s.\n", domain, ndr_map_error2string(ndr_err))); TALLOC_FREE(tmp_ctx); @@ -2391,7 +2391,7 @@ static NTSTATUS pdb_samba_dsdb_get_trusteddom_creds(struct pdb_methods *m, (ndr_pull_flags_fn_t)ndr_pull_trustAuthInOutBlob); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { DEBUG(0, ("Failed to get trusted domain password for %s, " - "attribute trustAuthOutgoing coult not be parsed %s.\n", + "attribute trustAuthOutgoing could not be parsed %s.\n", domain, ndr_map_error2string(ndr_err))); TALLOC_FREE(tmp_ctx); @@ -2678,7 +2678,7 @@ static bool pdb_samba_dsdb_set_trusteddom_pw(struct pdb_methods *m, (ndr_pull_flags_fn_t)ndr_pull_trustAuthInOutBlob); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { DEBUG(0, ("Failed to get trusted domain password for %s, " - "attribute trustAuthOutgoing coult not be parsed %s.\n", + "attribute trustAuthOutgoing could not be parsed %s.\n", domain, ndr_map_error2string(ndr_err))); TALLOC_FREE(tmp_ctx); From 250a71df903272ef3f6caefacda6b6fab7ade68b Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:18:54 +0200 Subject: [PATCH 07/35] Fix spelling s/desriptor/descriptor/ Signed-off-by: Mathieu Parent --- source3/smbd/open.c | 2 +- source4/dsdb/samdb/ldb_modules/descriptor.c | 2 +- third_party/dnspython/examples/zonediff.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 3c24d76a089..cb0330d6073 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -4734,7 +4734,7 @@ static NTSTATUS inherit_new_acl(files_struct *fsp) /* If inheritable_components == false, se_create_child_secdesc() - creates a security desriptor with a NULL dacl + creates a security descriptor with a NULL dacl entry, but with SEC_DESC_DACL_PRESENT. We need to remove that flag. */ diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c index e75d79d30e2..4c45e9b8f82 100644 --- a/source4/dsdb/samdb/ldb_modules/descriptor.c +++ b/source4/dsdb/samdb/ldb_modules/descriptor.c @@ -416,7 +416,7 @@ static DATA_BLOB *get_new_descriptor(struct ldb_module *module, } sddl_sd = sddl_encode(mem_ctx, final_sd, domain_sid); - DEBUG(10, ("Object %s created with desriptor %s\n\n", ldb_dn_get_linearized(dn), sddl_sd)); + DEBUG(10, ("Object %s created with descriptor %s\n\n", ldb_dn_get_linearized(dn), sddl_sd)); linear_sd = talloc(mem_ctx, DATA_BLOB); if (!linear_sd) { diff --git a/third_party/dnspython/examples/zonediff.py b/third_party/dnspython/examples/zonediff.py index ad81fb1d2d4..0c101781a3e 100755 --- a/third_party/dnspython/examples/zonediff.py +++ b/third_party/dnspython/examples/zonediff.py @@ -199,7 +199,7 @@ def _open(what, err): p.print_help() sys.exit(64) - # Open file desriptors + # Open file descriptors if not opts.use_vc: oldn, newn = args else: From 85529ff20dddf35e31316ee4a35956a14494b3a9 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:19:08 +0200 Subject: [PATCH 08/35] Fix spelling s/doens't/doesn't/ Signed-off-by: Mathieu Parent --- source4/auth/kerberos/kerberos-notes.txt | 2 +- source4/auth/kerberos/kerberos-porting-to-mit-notes.txt | 2 +- source4/torture/basic/delaywrite.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source4/auth/kerberos/kerberos-notes.txt b/source4/auth/kerberos/kerberos-notes.txt index 1981328bcf6..69541290ef7 100644 --- a/source4/auth/kerberos/kerberos-notes.txt +++ b/source4/auth/kerberos/kerberos-notes.txt @@ -460,7 +460,7 @@ in libkrb5 would be difficult, but valuable. In the short-term, we deal with blocking by taking over the network send() and recv() functions, therefore making them 'semi-async'. This -doens't apply to DNS yet.These thread-safety context-variables will +doesn't apply to DNS yet.These thread-safety context-variables will probably present porting problems, during the MIT port. This will probably be most of the work in the port to MIT. diff --git a/source4/auth/kerberos/kerberos-porting-to-mit-notes.txt b/source4/auth/kerberos/kerberos-porting-to-mit-notes.txt index 329558e9f7a..9b478bbd1c1 100644 --- a/source4/auth/kerberos/kerberos-porting-to-mit-notes.txt +++ b/source4/auth/kerberos/kerberos-porting-to-mit-notes.txt @@ -383,7 +383,7 @@ when using Kerberos and GSSAPI libraries in libkrb5 would be difficult, but valuable. * In the short-term, we deal with blocking by taking over the network send() and recv() functions, therefore making them 'semi-async'. This - doens't apply to DNS yet.These thread-safety context-variables will + doesn't apply to DNS yet.These thread-safety context-variables will probably present porting problems, during the MIT port. This will probably be most of the work in the port to MIT. This may require more thorough thread-safe-ing work on the MIT libraries. diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index 160674f19a1..34787168872 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -2924,7 +2924,7 @@ static bool test_delayed_write_update7(struct torture_context *tctx, struct smbc if (finfo2.basic_info.out.write_time != finfo3.basic_info.out.write_time) { torture_result(tctx, TORTURE_FAIL, - "qpathinfo time doens't match fileinfo time"); + "qpathinfo time doesn't match fileinfo time"); ret = false; } From a6c29cbf15aee1e2624b12c63b4ce35b6fa4bb2b Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:20:21 +0200 Subject: [PATCH 09/35] Fix spelling s/Everytime/Every time/ Signed-off-by: Mathieu Parent --- ctdb/doc/ctdb-tunables.7.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctdb/doc/ctdb-tunables.7.xml b/ctdb/doc/ctdb-tunables.7.xml index bc4e1b27edf..da01d212fc4 100644 --- a/ctdb/doc/ctdb-tunables.7.xml +++ b/ctdb/doc/ctdb-tunables.7.xml @@ -626,7 +626,7 @@ MonitorInterval=20 Some databases have seqnum tracking enabled, so that samba will be able to detect asynchronously when there has been updates - to the database. Everytime a database is updated its sequence + to the database. Every time a database is updated its sequence number is increased. From d5b54c72ba8a9a8b94748a90013adfc6d8d7b1ae Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:20:34 +0200 Subject: [PATCH 10/35] Fix spelling s/explicite/explicit/ Signed-off-by: Mathieu Parent --- ctdb/server/ctdb_daemon.c | 2 +- source3/utils/net_registry_check.c | 2 +- third_party/waf/wafadmin/Tools/qt4.py | 2 +- third_party/zlib/as400/readme.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 3b06972d030..dbaf7916952 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -456,7 +456,7 @@ static void reprocess_deferred_call(struct tevent_context *ev, static int deferred_fetch_queue_destructor(struct ctdb_deferred_fetch_queue *dfq) { - /* need to reprocess the packets from the queue explicitely instead of + /* need to reprocess the packets from the queue explicitly instead of just using a normal destructor since we want, need, to call the clients in the same oder as the requests queued up */ diff --git a/source3/utils/net_registry_check.c b/source3/utils/net_registry_check.c index 2274b739b0d..c7f0091bf6a 100644 --- a/source3/utils/net_registry_check.c +++ b/source3/utils/net_registry_check.c @@ -957,7 +957,7 @@ write_subkeylist(struct db_context *db, struct regkey *key, char sep) struct regkey *subkey = key->subkeys[i]; const char *name = subkey->name; if (name == NULL) { - printf("Warning: no explicite name for key %s\n", + printf("Warning: no explicit name for key %s\n", subkey->path); name = strrchr_m(subkey->path, sep); assert(name); diff --git a/third_party/waf/wafadmin/Tools/qt4.py b/third_party/waf/wafadmin/Tools/qt4.py index 7d2cad7d9c1..79f93c0c77c 100644 --- a/third_party/waf/wafadmin/Tools/qt4.py +++ b/third_party/waf/wafadmin/Tools/qt4.py @@ -302,7 +302,7 @@ def detect_qt4(conf): paths = [] - # the path to qmake has been given explicitely + # the path to qmake has been given explicitly if qtbin: paths = [qtbin] diff --git a/third_party/zlib/as400/readme.txt b/third_party/zlib/as400/readme.txt index beae13f565b..004053a71fa 100644 --- a/third_party/zlib/as400/readme.txt +++ b/third_party/zlib/as400/readme.txt @@ -106,6 +106,6 @@ Notes: For AS400 ILE RPG programmers, a /copy member defining the ZLIB Remember that most foreign textual data are ASCII coded: this implementation does not handle conversion from/to ASCII, so - text data code conversions must be done explicitely. + text data code conversions must be done explicitly. Always open zipped files in binary mode. From 422fdaa9cc2ca830dba66545d8081eb1327ee133 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:20:47 +0200 Subject: [PATCH 11/35] Heimdal: Fix spelling s/extention/extension/ Signed-off-by: Mathieu Parent --- source4/heimdal/lib/hdb/ext.c | 8 ++++---- source4/heimdal/lib/hx509/print.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source4/heimdal/lib/hdb/ext.c b/source4/heimdal/lib/hdb/ext.c index f4f17152400..f68b159fafc 100644 --- a/source4/heimdal/lib/hdb/ext.c +++ b/source4/heimdal/lib/hdb/ext.c @@ -101,7 +101,7 @@ hdb_replace_extension(krb5_context context, ext2 = hdb_find_extension(entry, ext->data.element); } else { /* - * This is an unknown extention, and we are asked to replace a + * This is an unknown extension, and we are asked to replace a * possible entry in `entry' that is of the same type. This * might seem impossible, but ASN.1 CHOICE comes to our * rescue. The first tag in each branch in the CHOICE is @@ -120,7 +120,7 @@ hdb_replace_extension(krb5_context context, &size); if (ret) { krb5_set_error_message(context, ret, "hdb: failed to decode " - "replacement hdb extention"); + "replacement hdb extension"); return ret; } @@ -136,7 +136,7 @@ hdb_replace_extension(krb5_context context, &size); if (ret) { krb5_set_error_message(context, ret, "hdb: failed to decode " - "present hdb extention"); + "present hdb extension"); return ret; } @@ -153,7 +153,7 @@ hdb_replace_extension(krb5_context context, ret = copy_HDB_extension(ext, ext2); if (ret) krb5_set_error_message(context, ret, "hdb: failed to copy replacement " - "hdb extention"); + "hdb extension"); return ret; } diff --git a/source4/heimdal/lib/hx509/print.c b/source4/heimdal/lib/hx509/print.c index 1e8bcabfa7e..4d2c3e2a421 100644 --- a/source4/heimdal/lib/hx509/print.c +++ b/source4/heimdal/lib/hx509/print.c @@ -969,7 +969,7 @@ hx509_validate_cert(hx509_context context, } validate_print(ctx, HX509_VALIDATE_F_VALIDATE|HX509_VALIDATE_F_VERBOSE, - "checking extention: %s\n", + "checking extension: %s\n", check_extension[j].name); (*check_extension[j].func)(ctx, &status, @@ -977,7 +977,7 @@ hx509_validate_cert(hx509_context context, &t->extensions->val[i]); } } else - validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "no extentions\n"); + validate_print(ctx, HX509_VALIDATE_F_VERBOSE, "no extensions\n"); if (status.isca) { if (!status.haveSKI) From 844552d6a164aa3bf6aa57999a1ac8cbf2a9ef7e Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:20:57 +0200 Subject: [PATCH 12/35] Heimdal: Fix spelling s/formated/formatted/ Signed-off-by: Mathieu Parent --- source4/heimdal/lib/hx509/hx509_err.et | 4 ++-- source4/heimdal/lib/krb5/store.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source4/heimdal/lib/hx509/hx509_err.et b/source4/heimdal/lib/hx509/hx509_err.et index 743354e1b44..cdebbf6e071 100644 --- a/source4/heimdal/lib/hx509/hx509_err.et +++ b/source4/heimdal/lib/hx509/hx509_err.et @@ -32,8 +32,8 @@ error_code PARENT_IS_CA, "Parent certificate is a CA" error_code EXTRA_DATA_AFTER_STRUCTURE, "Extra data was found after the structure" error_code PROXY_CERT_INVALID, "Proxy certificate is invalid" error_code PROXY_CERT_NAME_WRONG, "Proxy certificate name is wrong" -error_code NAME_MALFORMED, "Name is malformated" -error_code CERTIFICATE_MALFORMED, "Certificate is malformated" +error_code NAME_MALFORMED, "Name is malformatted" +error_code CERTIFICATE_MALFORMED, "Certificate is malformatted" error_code CERTIFICATE_MISSING_EKU, "Certificate is missing a required EKU" error_code PROXY_CERTIFICATE_NOT_CANONICALIZED, "Proxy certificate not canonicalize" diff --git a/source4/heimdal/lib/krb5/store.c b/source4/heimdal/lib/krb5/store.c index 17de78e9e74..6bc46c7dcf4 100644 --- a/source4/heimdal/lib/krb5/store.c +++ b/source4/heimdal/lib/krb5/store.c @@ -695,7 +695,7 @@ krb5_ret_data(krb5_storage *sp, } /** - * Store a string to the buffer. The data is formated as an len:uint32 + * Store a string to the buffer. The data is formatted as an len:uint32 * plus the string itself (not padded). * * @param sp the storage buffer to write to From eac78e00429edfe4eab1da12d5ad9ae7f19cebc0 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:20:57 +0200 Subject: [PATCH 13/35] Fix spelling s/formated/formatted/ Signed-off-by: Mathieu Parent --- nsswitch/pam_winbind.c | 2 +- source3/lib/cbuf.h | 2 +- source3/utils/log2pcaphex.c | 2 +- source3/utils/net_printing.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c index 63fede87c78..7ac5bb08181 100644 --- a/nsswitch/pam_winbind.c +++ b/nsswitch/pam_winbind.c @@ -1220,7 +1220,7 @@ static bool winbind_name_list_to_sid_string_list(struct pwb_context *ctx, /* * The lookup of the last name failed.. * It results in require_member_of_sid ends with ',' - * It is malformated parameter here, overwrite the last ','. + * It is malformatted parameter here, overwrite the last ','. */ len = strlen(sid_list_buffer); if ((len != 0) && (sid_list_buffer[len - 1] == ',')) { diff --git a/source3/lib/cbuf.h b/source3/lib/cbuf.h index 2fec822fec9..8a4098a42e5 100644 --- a/source3/lib/cbuf.h +++ b/source3/lib/cbuf.h @@ -174,7 +174,7 @@ int cbuf_puts(cbuf* b, const char* str, size_t len); int cbuf_putdw(cbuf* b, uint32_t u); /** - * Print formated to a character buffer. + * Print formatted to a character buffer. * * @param b a charcter buffer * @param fmt a printf format string diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c index b5c234f1b3c..99733ed3c87 100644 --- a/source3/utils/log2pcaphex.c +++ b/source3/utils/log2pcaphex.c @@ -281,7 +281,7 @@ static long read_log_data(FILE *in, unsigned char *buffer, long data_length) } if(!fscanf(in, "%02X", &tmp)) { if(!quiet) - fprintf(stderr, "%ld: Log message formated incorrectly. " + fprintf(stderr, "%ld: Log message formatted incorrectly. " "Only first %ld bytes are logged, packet trace will " "be incomplete\n", line_num, i-1); while ((tmp = getc(in)) != '\n'); diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c index 8287e0ea04a..a7f31ae1ac3 100644 --- a/source3/utils/net_printing.c +++ b/source3/utils/net_printing.c @@ -231,7 +231,7 @@ static int net_printing_dump(struct net_context *c, int argc, "net printing dump [options] \n" " %s\n", _("Usage:"), - _("Dump formated printer information of the tdb.")); + _("Dump formatted printer information of the tdb.")); d_printf(_("Valid options:\n")); d_printf(_(" encoding= Set the Code Page of the tdb file.\n" " See iconv -l for the list of CP values\n" From 19454ee092a7932755491d01c639fa0f3a74809b Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:21:09 +0200 Subject: [PATCH 14/35] Fix spelling s/fowarding/forwarding/ Signed-off-by: Mathieu Parent --- source4/kdc/hdb-samba4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c index a2fbf5a0099..50eed445cd5 100644 --- a/source4/kdc/hdb-samba4.c +++ b/source4/kdc/hdb-samba4.c @@ -343,7 +343,7 @@ static void send_bad_password_netlogon(TALLOC_CTX *mem_ctx, "winbind_server", &ndr_table_winbind); if (irpc_handle == NULL) { - DEBUG(0, ("Winbind fowarding for [%s]\\[%s] failed, " + DEBUG(0, ("Winbind forwarding for [%s]\\[%s] failed, " "no winbind_server running!\n", user_info->mapped.domain_name, user_info->mapped.account_name)); return; From 41d2bc01f39b85869952f225b60d1368e5db23e7 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:21:15 +0200 Subject: [PATCH 15/35] Heimdal: Fix spelling s/laod/load/ Signed-off-by: Mathieu Parent --- source4/heimdal/lib/krb5/pkinit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/heimdal/lib/krb5/pkinit.c b/source4/heimdal/lib/krb5/pkinit.c index c30a298a15c..b9df4ac7e74 100644 --- a/source4/heimdal/lib/krb5/pkinit.c +++ b/source4/heimdal/lib/krb5/pkinit.c @@ -1921,7 +1921,7 @@ _krb5_pk_load_id(krb5_context context, NULL, *chain_list); if (ret) { pk_copy_error(context, context->hx509ctx, ret, - "Failed to laod chain %s", + "Failed to load chain %s", *chain_list); goto out; } From bdc8845cbaea7c4ce228f8f3c2de0a32415c5b38 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:21:22 +0200 Subject: [PATCH 16/35] Heimdal: Fix spelling s/logile/logfile/ Signed-off-by: Mathieu Parent --- source4/heimdal/lib/krb5/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/heimdal/lib/krb5/log.c b/source4/heimdal/lib/krb5/log.c index 4b289afd807..7365ada805d 100644 --- a/source4/heimdal/lib/krb5/log.c +++ b/source4/heimdal/lib/krb5/log.c @@ -318,7 +318,7 @@ krb5_addlog_dest(krb5_context context, krb5_log_facility *f, const char *orig) if(i < 0) { ret = errno; krb5_set_error_message(context, ret, - N_("open(%s) logile: %s", ""), fn, + N_("open(%s) logfile: %s", ""), fn, strerror(ret)); free(fn); return ret; From 849bafe433878f905efb8909e9ea45defbb987be Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:21:30 +0200 Subject: [PATCH 17/35] Fix spelling s/malicous/malicious/ Signed-off-by: Mathieu Parent --- docs-xml/manpages/ntlm_auth.1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-xml/manpages/ntlm_auth.1.xml b/docs-xml/manpages/ntlm_auth.1.xml index 4f77eae7201..554522438ab 100644 --- a/docs-xml/manpages/ntlm_auth.1.xml +++ b/docs-xml/manpages/ntlm_auth.1.xml @@ -279,7 +279,7 @@ Implementers should take care to base64 encode - any data (such as usernames/passwords) that may contain malicous user data, such as + any data (such as usernames/passwords) that may contain malicious user data, such as a newline. They may also need to decode strings from the helper, which likewise may have been base64 encoded. From c8decf282756f05c115dc08ffd949e5a451483c7 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:21:41 +0200 Subject: [PATCH 18/35] Fix spelling s/missmatch/mismatch/ Signed-off-by: Mathieu Parent --- source3/smbd/open.c | 2 +- source3/torture/torture.c | 2 +- source4/torture/rpc/fsrvp.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source3/smbd/open.c b/source3/smbd/open.c index cb0330d6073..d385b54147f 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -3176,7 +3176,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, new_dos_attributes, smb_fname->st.st_ex_mode, unx_mode, &new_unx_mode)) { - DEBUG(5,("open_file_ntcreate: attributes missmatch " + DEBUG(5,("open_file_ntcreate: attributes mismatch " "for file %s (%x %x) (0%o, 0%o)\n", smb_fname_str_dbg(smb_fname), existing_dos_attributes, diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 56cc6ff3628..47da8178e8b 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -11311,7 +11311,7 @@ static bool run_local_canonicalize_path(int dummy) } if (strcmp(d, dst[i]) != 0) { d_fprintf(stderr, - "canonicalize missmatch %s -> %s != %s", + "canonicalize mismatch %s -> %s != %s", src[i], d, dst[i]); return false; } diff --git a/source4/torture/rpc/fsrvp.c b/source4/torture/rpc/fsrvp.c index 14559c9b453..1491e577fe9 100644 --- a/source4/torture/rpc/fsrvp.c +++ b/source4/torture/rpc/fsrvp.c @@ -345,10 +345,10 @@ static bool test_fsrvp_sc_create(struct torture_context *tctx, torture_assert(tctx, !GUID_compare(&r_sharemap_get.in.ShadowCopySetId, &map->ShadowCopySetId), - "sc_set GUID missmatch in GetShareMapping"); + "sc_set GUID mismatch in GetShareMapping"); torture_assert(tctx, !GUID_compare(&r_sharemap_get.in.ShadowCopyId, &map->ShadowCopyId), - "sc GUID missmatch in GetShareMapping"); + "sc GUID mismatch in GetShareMapping"); done: talloc_free(tmp_ctx); From 982ac2bb4d83eff2a0a8fd1786c49ec75c17173f Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:21:53 +0200 Subject: [PATCH 19/35] Fix spelling s/openened/opened/ Signed-off-by: Mathieu Parent --- source3/rpc_server/rpc_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c index a2bcf8545c0..2864495c24e 100644 --- a/source3/rpc_server/rpc_server.c +++ b/source3/rpc_server/rpc_server.c @@ -674,7 +674,7 @@ uint16_t setup_dcerpc_ncacn_tcpip_socket(struct tevent_context *ev_ctx, goto out; } - DEBUG(10, ("setup_tcpip_socket: openened socket fd %d for port %u\n", + DEBUG(10, ("setup_tcpip_socket: opened socket fd %d for port %u\n", state->fd, state->ep.port)); fde = tevent_add_fd(state->ev_ctx, From af44b0ffa130df384486c17d4fb13de15dddf075 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:22:00 +0200 Subject: [PATCH 20/35] Fix spelling s/opions/options/ Signed-off-by: Mathieu Parent --- docs-xml/manpages/vfs_fruit.8.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-xml/manpages/vfs_fruit.8.xml b/docs-xml/manpages/vfs_fruit.8.xml index 7f6a0e7c022..25833038d96 100644 --- a/docs-xml/manpages/vfs_fruit.8.xml +++ b/docs-xml/manpages/vfs_fruit.8.xml @@ -106,7 +106,7 @@ There's a set of per share options that come into play when - fruit:aapl is enabled. These opions, listed + fruit:aapl is enabled. These options, listed below, can be used to disable the computation of specific Mac metadata in the directory enumeration context, all are enabled by default: From 942b785024057887e0c0bf133063a488f7e001a3 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:22:20 +0200 Subject: [PATCH 21/35] Fix spelling s/ouput/output/ Signed-off-by: Mathieu Parent --- librpc/ndr/ndr_compression.c | 2 +- third_party/cmocka/cmocka.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/librpc/ndr/ndr_compression.c b/librpc/ndr/ndr_compression.c index bdce4317a92..f06a076a71f 100644 --- a/librpc/ndr/ndr_compression.c +++ b/librpc/ndr/ndr_compression.c @@ -143,7 +143,7 @@ static enum ndr_err_code ndr_pull_compression_mszip_cab_chunk(struct ndr_pull *n * happen */ return ndr_pull_error(ndrpull, NDR_ERR_COMPRESSION, - "zlib inflate error not enough space for ouput (PULL)"); + "zlib inflate error not enough space for output (PULL)"); } if (z_ret != Z_STREAM_END) { return ndr_pull_error(ndrpull, NDR_ERR_COMPRESSION, diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h index 72d6ae21c90..4fd82a98b30 100644 --- a/third_party/cmocka/cmocka.h +++ b/third_party/cmocka/cmocka.h @@ -2269,7 +2269,7 @@ enum cm_message_output { /** * @brief Function to set the output format for a test. * - * The ouput format for the test can either be set globally using this + * The output format for the test can either be set globally using this * function or overriden with environment variable CMOCKA_MESSAGE_OUTPUT. * * The environment variable can be set to either STDOUT, SUBUNIT, TAP or XML. From 365b6b37ab87822caa7ef357e1660a5bb225a0cc Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:22:38 +0200 Subject: [PATCH 22/35] Fix spelling s/processs/process/ Signed-off-by: Mathieu Parent --- source3/torture/torture.c | 6 +++--- source4/torture/basic/locking.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 47da8178e8b..2bc6ff712ce 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -2159,7 +2159,7 @@ static bool run_locktest5(int dummy) ret = NT_STATUS_IS_OK(status); EXPECTED(ret, False); - printf("a different processs %s get a read lock on the first process lock stack\n", ret?"can":"cannot"); + printf("a different process %s get a read lock on the first process lock stack\n", ret?"can":"cannot"); /* Unlock the process 2 lock. */ cli_unlock(cli2, fnum2, 0, 4); @@ -2168,7 +2168,7 @@ static bool run_locktest5(int dummy) ret = NT_STATUS_IS_OK(status); EXPECTED(ret, False); - printf("the same processs on a different fnum %s get a read lock\n", ret?"can":"cannot"); + printf("the same process on a different fnum %s get a read lock\n", ret?"can":"cannot"); /* Unlock the process 1 fnum3 lock. */ cli_unlock(cli1, fnum3, 0, 4); @@ -2211,7 +2211,7 @@ static bool run_locktest5(int dummy) ret = NT_STATUS_IS_OK(status); EXPECTED(ret, True); - printf("a different processs %s get a write lock on the unlocked stack\n", ret?"can":"cannot"); + printf("a different process %s get a write lock on the unlocked stack\n", ret?"can":"cannot"); fail: diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c index 98def5c09c1..e0e2971c9ad 100644 --- a/source4/torture/basic/locking.c +++ b/source4/torture/basic/locking.c @@ -567,7 +567,7 @@ static bool torture_locktest5(struct torture_context *tctx, struct smbcli_state ret = NT_STATUS_IS_OK(smbcli_lock(cli2->tree, fnum2, 0, 4, 0, READ_LOCK)); EXPECTED(ret, false); - torture_comment(tctx, "a different processs %s get a read lock on the first process lock stack\n", ret?"can":"cannot"); + torture_comment(tctx, "a different process %s get a read lock on the first process lock stack\n", ret?"can":"cannot"); /* Unlock the process 2 lock. */ smbcli_unlock(cli2->tree, fnum2, 0, 4); @@ -575,7 +575,7 @@ static bool torture_locktest5(struct torture_context *tctx, struct smbcli_state ret = NT_STATUS_IS_OK(smbcli_lock(cli1->tree, fnum3, 0, 4, 0, READ_LOCK)); EXPECTED(ret, false); - torture_comment(tctx, "the same processs on a different fnum %s get a read lock\n", ret?"can":"cannot"); + torture_comment(tctx, "the same process on a different fnum %s get a read lock\n", ret?"can":"cannot"); /* Unlock the process 1 fnum3 lock. */ smbcli_unlock(cli1->tree, fnum3, 0, 4); @@ -617,7 +617,7 @@ ret = NT_STATUS_IS_OK(smbcli_unlock(cli1->tree, fnum1, 0, 4)) && ret = NT_STATUS_IS_OK(smbcli_lock(cli2->tree, fnum2, 0, 4, 0, WRITE_LOCK)); EXPECTED(ret, true); - torture_comment(tctx, "a different processs %s get a write lock on the unlocked stack\n", ret?"can":"cannot"); + torture_comment(tctx, "a different process %s get a write lock on the unlocked stack\n", ret?"can":"cannot"); torture_assert_ntstatus_ok(tctx, smbcli_close(cli1->tree, fnum1), From b4479072e7391d0680fb55b2b43abf5f2d002032 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:22:46 +0200 Subject: [PATCH 23/35] Heimdal: Fix spelling s/propogate/propagate/ Signed-off-by: Mathieu Parent --- source4/heimdal/kdc/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/heimdal/kdc/misc.c b/source4/heimdal/kdc/misc.c index b0bc38a2b6f..a5bfb3a67b3 100644 --- a/source4/heimdal/kdc/misc.c +++ b/source4/heimdal/kdc/misc.c @@ -123,7 +123,7 @@ _kdc_db_fetch(krb5_context context, * HDB_ERR_NOT_FOUND_HERE (used to indicate to Samba that * the RODC on which this code is running does not have * the key we need, and so a proxy to the KDC is required) - * have specific meaning, and need to be propogated up. + * have specific meaning, and need to be propagated up. */ goto out; } From ad7f0a8b1f25110f46a3dd5dd236790362f9e471 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:22:46 +0200 Subject: [PATCH 24/35] Fix spelling s/propogate/propagate/ Signed-off-by: Mathieu Parent --- ctdb/server/ctdb_ltdb_server.c | 4 ++-- source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 2 +- source4/dsdb/samdb/ldb_modules/util.c | 2 +- source4/ntvfs/common/opendb_tdb.c | 2 +- source4/torture/raw/notify.c | 4 ++-- source4/torture/smb2/notify.c | 4 ++-- wintest/test-s4-howto.py | 12 ++++++------ 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c index c199aac2d1d..d94d942a9fa 100644 --- a/ctdb/server/ctdb_ltdb_server.c +++ b/ctdb/server/ctdb_ltdb_server.c @@ -1521,7 +1521,7 @@ int32_t ctdb_ltdb_update_seqnum(struct ctdb_context *ctdb, uint32_t db_id, uint3 } /* - timer to check for seqnum changes in a ltdb and propogate them + timer to check for seqnum changes in a ltdb and propagate them */ static void ctdb_ltdb_seqnum_check(struct tevent_context *ev, struct tevent_timer *te, @@ -1531,7 +1531,7 @@ static void ctdb_ltdb_seqnum_check(struct tevent_context *ev, struct ctdb_context *ctdb = ctdb_db->ctdb; uint32_t new_seqnum = tdb_get_seqnum(ctdb_db->ltdb->tdb); if (new_seqnum != ctdb_db->seqnum) { - /* something has changed - propogate it */ + /* something has changed - propagate it */ TDB_DATA data; data.dptr = (uint8_t *)&ctdb_db->db_id; data.dsize = sizeof(uint32_t); diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index a89a816c869..e739400634c 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -4731,7 +4731,7 @@ static int replmd_make_deleted_child_dn(TALLOC_CTX *tmp_ctx, their current values. This has the effect of changing these attributes to have been last updated by the current DC. This is needed to ensure that renames performed as part of conflict - resolution are propogated to other DCs + resolution are propagated to other DCs */ static int replmd_name_modify(struct replmd_replicated_request *ar, struct ldb_request *req, struct ldb_dn *dn) diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c index 9e37c085bba..738b773611d 100644 --- a/source4/dsdb/samdb/ldb_modules/util.c +++ b/source4/dsdb/samdb/ldb_modules/util.c @@ -688,7 +688,7 @@ int dsdb_check_single_valued_link(const struct dsdb_attribute *attr, place. For example, the recyclebin feature is marked as enabled both on the CN=Partitions,CN=Configurration object and on the NTDS DN of each DC in the forest. It seems likely that it is the job of the KCC - to propogate between the two + to propagate between the two */ int dsdb_check_optional_feature(struct ldb_module *module, struct GUID op_feature_guid, bool *feature_enabled) { diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c index 2047a0b3145..9fe0b2627ee 100644 --- a/source4/ntvfs/common/opendb_tdb.c +++ b/source4/ntvfs/common/opendb_tdb.c @@ -352,7 +352,7 @@ static NTSTATUS odb_tdb_open_can_internal(struct odb_context *odb, /* a batch oplock caches close calls, which means the client application might have already closed the file. We have to allow - this close to propogate by sending a oplock + this close to propagate by sending a oplock break request and suspending this call until the break is acknowledged or the file is closed */ diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c index fdb5771bf3d..afb4a8eb5f2 100644 --- a/source4/torture/raw/notify.c +++ b/source4/torture/raw/notify.c @@ -1462,7 +1462,7 @@ static bool test_notify_tree(struct torture_context *tctx, talloc_free(path); } - /* give a bit of time for the events to propogate */ + /* give a bit of time for the events to propagate */ tv = timeval_current(); do { @@ -1485,7 +1485,7 @@ static bool test_notify_tree(struct torture_context *tctx, } } while (!all_done && timeval_elapsed(&tv) < 20); - torture_comment(tctx, "took %.4f seconds to propogate all events\n", timeval_elapsed(&tv)); + torture_comment(tctx, "took %.4f seconds to propagate all events\n", timeval_elapsed(&tv)); for (i=0;i Date: Fri, 4 May 2018 22:22:53 +0200 Subject: [PATCH 25/35] Fix spelling s/protcol/protocol/ Signed-off-by: Mathieu Parent --- docs-xml/manpages/samba.7.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-xml/manpages/samba.7.xml b/docs-xml/manpages/samba.7.xml index 761c8d3c65a..5b72d659871 100644 --- a/docs-xml/manpages/samba.7.xml +++ b/docs-xml/manpages/samba.7.xml @@ -26,7 +26,7 @@ The Samba software suite is a collection of programs that implements the Server Message Block (commonly abbreviated as SMB) protocol for UNIX systems and provides Active Directory - services. The first version of the SMB protcol is sometimes also + services. The first version of the SMB protocol is sometimes also referred to as the Common Internet File System (CIFS). For a more thorough description, see http://www.ubiqx.org/cifs/. Samba also implements the NetBIOS From 6afff332fd2eff60b0ba0504d12092787c9c4f6f Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:23:01 +0200 Subject: [PATCH 26/35] Fix spelling s/receving/receiving/ Signed-off-by: Mathieu Parent --- source3/rpc_server/rpc_ncacn_np.c | 2 +- source3/rpc_server/rpc_server.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c index d7e7785248d..511d54e895a 100644 --- a/source3/rpc_server/rpc_ncacn_np.c +++ b/source3/rpc_server/rpc_ncacn_np.c @@ -179,7 +179,7 @@ NTSTATUS make_internal_rpc_pipe_socketpair( subreq = dcerpc_read_ncacn_packet_send(npc, npc->ev, npc->tstream); if (subreq == NULL) { - DEBUG(2, ("Failed to start receving packets\n")); + DEBUG(2, ("Failed to start receiving packets\n")); status = NT_STATUS_PIPE_BROKEN; goto out; } diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c index 2864495c24e..36dff114f90 100644 --- a/source3/rpc_server/rpc_server.c +++ b/source3/rpc_server/rpc_server.c @@ -395,7 +395,7 @@ static void named_pipe_accept_done(struct tevent_req *subreq) /* And now start receiving and processing packets */ subreq = dcerpc_read_ncacn_packet_send(npc, npc->ev, npc->tstream); if (!subreq) { - DEBUG(2, ("Failed to start receving packets\n")); + DEBUG(2, ("Failed to start receiving packets\n")); goto fail; } tevent_req_set_callback(subreq, named_pipe_packet_process, npc); @@ -494,7 +494,7 @@ void named_pipe_packet_process(struct tevent_req *subreq) /* Wait for the next packet */ subreq = dcerpc_read_ncacn_packet_send(npc, npc->ev, npc->tstream); if (!subreq) { - DEBUG(2, ("Failed to start receving packets\n")); + DEBUG(2, ("Failed to start receiving packets\n")); status = NT_STATUS_NO_MEMORY; goto fail; } @@ -574,7 +574,7 @@ static void named_pipe_packet_done(struct tevent_req *subreq) /* Wait for the next packet */ subreq = dcerpc_read_ncacn_packet_send(npc, npc->ev, npc->tstream); if (!subreq) { - DEBUG(2, ("Failed to start receving packets\n")); + DEBUG(2, ("Failed to start receiving packets\n")); sys_errno = ENOMEM; goto fail; } @@ -1272,7 +1272,7 @@ static void dcerpc_ncacn_packet_process(struct tevent_req *subreq) ncacn_conn->ev_ctx, ncacn_conn->tstream); if (subreq == NULL) { - DEBUG(2, ("Failed to start receving packets\n")); + DEBUG(2, ("Failed to start receiving packets\n")); status = NT_STATUS_NO_MEMORY; goto fail; } @@ -1343,7 +1343,7 @@ static void dcerpc_ncacn_packet_done(struct tevent_req *subreq) ncacn_conn->ev_ctx, ncacn_conn->tstream); if (subreq == NULL) { - DEBUG(2, ("Failed to start receving packets\n")); + DEBUG(2, ("Failed to start receiving packets\n")); status = NT_STATUS_NO_MEMORY; goto fail; } From 78c10ece2ae68c1522aaca528a943275fed3de71 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:23:09 +0200 Subject: [PATCH 27/35] Fix spelling s/reponse/response/ Signed-off-by: Mathieu Parent --- auth/credentials/pycredentials.c | 2 +- auth/ntlmssp/ntlmssp_client.c | 2 +- source4/torture/krb5/kdc-canon-heimdal.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/auth/credentials/pycredentials.c b/auth/credentials/pycredentials.c index 638ae8de2ed..68bb3060a99 100644 --- a/auth/credentials/pycredentials.c +++ b/auth/credentials/pycredentials.c @@ -130,7 +130,7 @@ static PyObject *py_creds_get_ntlm_response(PyObject *self, PyObject *args, PyOb ret = Py_BuildValue("{sis" PYARG_BYTES_LEN "s" PYARG_BYTES_LEN "s" PYARG_BYTES_LEN "s" PYARG_BYTES_LEN "}", "flags", flags, - "lm_reponse", + "lm_response", (const char *)lm_response.data, lm_response.length, "nt_response", (const char *)nt_response.data, nt_response.length, diff --git a/auth/ntlmssp/ntlmssp_client.c b/auth/ntlmssp/ntlmssp_client.c index db2003f0d6b..c511290d36b 100644 --- a/auth/ntlmssp/ntlmssp_client.c +++ b/auth/ntlmssp/ntlmssp_client.c @@ -777,7 +777,7 @@ NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_security) ntlmssp_state->unicode = gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "unicode", true); - ntlmssp_state->use_nt_response = gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "send_nt_reponse", true); + ntlmssp_state->use_nt_response = gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "send_nt_response", true); ntlmssp_state->allow_lm_response = lpcfg_client_lanman_auth(gensec_security->settings->lp_ctx); diff --git a/source4/torture/krb5/kdc-canon-heimdal.c b/source4/torture/krb5/kdc-canon-heimdal.c index 7f806e73e66..5b782a23fc4 100644 --- a/source4/torture/krb5/kdc-canon-heimdal.c +++ b/source4/torture/krb5/kdc-canon-heimdal.c @@ -515,7 +515,7 @@ static bool torture_krb5_post_recv_tgs_req_krbtgt_canon_test(struct torture_krb5 torture_assert_str_equal(test_context->tctx, test_context->tgs_rep.ticket.sname.name_string.val[0], "krbtgt", - "Mismatch in name between reponse and expected response, expected krbtgt"); + "Mismatch in name between response and expected response, expected krbtgt"); torture_assert_str_equal(test_context->tctx, test_context->tgs_rep.ticket.sname.name_string.val[1], test_context->test_data->real_realm, "Mismatch in realm part of krbtgt/ in expected response, expected krbtgt/REALM@REALM"); From e9e4bb35befd4b5374d91f2806199a278c621b4b Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:23:39 +0200 Subject: [PATCH 28/35] Fix spelling s/retrive/retrieve/ Signed-off-by: Mathieu Parent --- python/samba/samba3/__init__.py | 2 +- source3/passdb/pdb_smbpasswd.c | 2 +- source3/utils/ntlm_auth.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/samba/samba3/__init__.py b/python/samba/samba3/__init__.py index b145e432c97..053c113715d 100644 --- a/python/samba/samba3/__init__.py +++ b/python/samba/samba3/__init__.py @@ -163,7 +163,7 @@ def gids(self): def get_sid(self, xid, id_type): """Retrive SID associated with a particular id and type. - :param xid: UID or GID to retrive SID for. + :param xid: UID or GID to retrieve SID for. :param id_type: Type of id specified - 'UID' or 'GID' """ data = self.db.get("%s %s\0" % (id_type, str(xid))) diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c index 9c381471dda..4d210fd78c9 100644 --- a/source3/passdb/pdb_smbpasswd.c +++ b/source3/passdb/pdb_smbpasswd.c @@ -63,7 +63,7 @@ struct smbpasswd_privates unsigned char smbpwd[16]; unsigned char smbntpwd[16]; - /* retrive-once info */ + /* retrieve-once info */ const char *smbpasswd_file; }; diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index d3146ccb989..2409ef8d130 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -1601,7 +1601,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode, nt_status = gensec_session_info(state->gensec_state, mem_ctx, &session_info); if (!NT_STATUS_IS_OK(nt_status)) { - reply_code = "BH Failed to retrive session info"; + reply_code = "BH Failed to retrieve session info"; reply_arg = nt_errstr(nt_status); DEBUG(1, ("GENSEC failed to retrieve the session info: %s\n", nt_errstr(nt_status))); } else { From 2bff2980d31dbcff148b406baf0ad63e36d0d23f Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:23:45 +0200 Subject: [PATCH 29/35] Fix spelling s/retun/return/ Signed-off-by: Mathieu Parent --- ctdb/common/sock_daemon.h | 2 +- source3/client/client.c | 2 +- source4/torture/raw/setfileinfo.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ctdb/common/sock_daemon.h b/ctdb/common/sock_daemon.h index a2c4d3de778..aa40995b3e4 100644 --- a/ctdb/common/sock_daemon.h +++ b/ctdb/common/sock_daemon.h @@ -110,7 +110,7 @@ struct sock_daemon_funcs { * * @param[in] client The new socket client context * @param[in] private_data Private data set with the socket - * @retun true if connection should be accepted, false otherwise + * @return true if connection should be accepted, false otherwise * * * disconnect() is called when client closes connection diff --git a/source3/client/client.c b/source3/client/client.c index 1429b44e9cf..8dbf7474d25 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -5564,7 +5564,7 @@ static struct { {"posix_mkdir",cmd_posix_mkdir," 0 creates a directory using POSIX interface",{COMPL_REMOTE,COMPL_NONE}}, {"posix_rmdir",cmd_posix_rmdir," removes a directory using POSIX interface",{COMPL_REMOTE,COMPL_NONE}}, {"posix_unlink",cmd_posix_unlink," removes a file using POSIX interface",{COMPL_REMOTE,COMPL_NONE}}, - {"posix_whoami",cmd_posix_whoami,"retun logged on user information " + {"posix_whoami",cmd_posix_whoami,"return logged on user information " "using POSIX interface",{COMPL_REMOTE,COMPL_NONE}}, {"print",cmd_print," print a file",{COMPL_NONE,COMPL_NONE}}, {"prompt",cmd_prompt,"toggle prompting for filenames for mget and mput",{COMPL_NONE,COMPL_NONE}}, diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c index a08191d0bf2..45ff8195c19 100644 --- a/source4/torture/raw/setfileinfo.c +++ b/source4/torture/raw/setfileinfo.c @@ -825,7 +825,7 @@ torture_raw_sfileinfo_eof(struct torture_context *tctx, sfi.end_of_file_info.in.size = 200; status = smb_raw_setpathinfo(cli2->tree, &sfi); - /* This should cause the client to retun invalid level. */ + /* This should cause the client to return invalid level. */ if (TARGET_IS_W2K8(tctx) || TARGET_IS_WIN7(tctx)) { /* * Windows sends back an invalid packet that smbclient sees From e4c426bdf1351029f21bd4048495cbdba09c27f6 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:23:54 +0200 Subject: [PATCH 30/35] Fix spelling s/specfied/specified/ Signed-off-by: Mathieu Parent --- source3/passdb/pdb_smbpasswd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c index 4d210fd78c9..8a3d48b9980 100644 --- a/source3/passdb/pdb_smbpasswd.c +++ b/source3/passdb/pdb_smbpasswd.c @@ -1345,7 +1345,7 @@ static NTSTATUS smbpasswd_getsampwsid(struct pdb_methods *my_methods, struct sam if (rid == DOMAIN_RID_GUEST) { const char *guest_account = lp_guest_account(); if (!(guest_account && *guest_account)) { - DEBUG(1, ("Guest account not specfied!\n")); + DEBUG(1, ("Guest account not specified!\n")); return nt_status; } return smbpasswd_getsampwnam(my_methods, sam_acct, guest_account); From 19e5f47e926012fa7beaca973245272d35e8e1b8 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:24:00 +0200 Subject: [PATCH 31/35] Fix spelling s/succesfully/successfully/ Signed-off-by: Mathieu Parent --- ctdb/common/sock_daemon.c | 2 +- python/samba/netcmd/user.py | 2 +- source3/smbd/filename.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ctdb/common/sock_daemon.c b/ctdb/common/sock_daemon.c index 7554cd6da07..a56057b3e0b 100644 --- a/ctdb/common/sock_daemon.c +++ b/ctdb/common/sock_daemon.c @@ -689,7 +689,7 @@ static void sock_daemon_run_startup_done(struct tevent_req *subreq) return; } - D_NOTICE("startup completed succesfully\n"); + D_NOTICE("startup completed successfully\n"); status = sock_daemon_run_socket_listen(req); if (! status) { diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py index dfe167d8c7d..1e2e040e934 100644 --- a/python/samba/netcmd/user.py +++ b/python/samba/netcmd/user.py @@ -1605,7 +1605,7 @@ class cmd_user_syncpasswords(GetPasswordCommand): userPrincipalName and userAccountControl. It recovers from LDAP disconnects and updates the cache in conservative way -(in single steps after each succesfully processed change). An error from +(in single steps after each successfully processed change). An error from the script (specified by '--script') will result in fatal error and this command will exit. But the cache state should be still valid and can be resumed in the next "Sync Loop Run". diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index 1186918a7f2..9e15af1916d 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -1555,7 +1555,7 @@ static NTSTATUS build_stream_path(TALLOC_CTX *mem_ctx, * @param pp_smb_fname The final converted name will be allocated if the * return is NT_STATUS_OK. * - * @return NT_STATUS_OK if all operations completed succesfully, appropriate + * @return NT_STATUS_OK if all operations completed successfully, appropriate * error otherwise. */ static NTSTATUS filename_convert_internal(TALLOC_CTX *ctx, From a82a2e1e14b85faa2cef05a1699b76aa44634d81 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:24:08 +0200 Subject: [PATCH 32/35] Heimdal: Fix spelling s/underun/underrun/ Signed-off-by: Mathieu Parent --- source4/heimdal/lib/asn1/asn1_err.et | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/heimdal/lib/asn1/asn1_err.et b/source4/heimdal/lib/asn1/asn1_err.et index ac7a9ebaa52..dc08a86cf30 100644 --- a/source4/heimdal/lib/asn1/asn1_err.et +++ b/source4/heimdal/lib/asn1/asn1_err.et @@ -23,7 +23,7 @@ error_code MIN_CONSTRAINT, "ASN.1 too few elements" error_code MAX_CONSTRAINT, "ASN.1 too many elements" error_code EXACT_CONSTRAINT, "ASN.1 wrong number of elements" error_code INDEF_OVERRUN, "ASN.1 BER indefinte encoding overrun" -error_code INDEF_UNDERRUN, "ASN.1 BER indefinte encoding underun" +error_code INDEF_UNDERRUN, "ASN.1 BER indefinte encoding underrun" error_code GOT_BER, "ASN.1 got BER encoded when expected DER" error_code INDEF_EXTRA_DATA, "ASN.1 EoC tag contained data" end From 3a69057d6cfbc57a88cdc11a3fc2a385df888a95 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:24:16 +0200 Subject: [PATCH 33/35] Heimdal: Fix spelling s/unitialized/uninitialized/ Signed-off-by: Mathieu Parent --- source4/heimdal/lib/roken/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/heimdal/lib/roken/socket.c b/source4/heimdal/lib/roken/socket.c index 017d6252ea1..718bcc41cf0 100644 --- a/source4/heimdal/lib/roken/socket.c +++ b/source4/heimdal/lib/roken/socket.c @@ -37,7 +37,7 @@ #include /* - * Set `sa' to the unitialized address of address family `af' + * Set `sa' to the uninitialized address of address family `af' */ ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL From 76b072e60dd9878d171c7325498b38856e9f06db Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:24:16 +0200 Subject: [PATCH 34/35] Fix spelling s/unitialized/uninitialized/ Signed-off-by: Mathieu Parent --- lib/util/util_net.c | 2 +- source3/libsmb/clierror.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util/util_net.c b/lib/util/util_net.c index f0a30168342..6cfb35c87a4 100644 --- a/lib/util/util_net.c +++ b/lib/util/util_net.c @@ -869,7 +869,7 @@ char *print_canonical_sockaddr(TALLOC_CTX *ctx, char *dest = NULL; int ret; - /* Linux getnameinfo() man pages says port is unitialized if + /* Linux getnameinfo() man pages says port is uninitialized if service name is NULL. */ ret = sys_getnameinfo((const struct sockaddr *)pss, diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c index f20980251f4..66dfea0654f 100644 --- a/source3/libsmb/clierror.c +++ b/source3/libsmb/clierror.c @@ -35,7 +35,7 @@ const char *cli_errstr(struct cli_state *cli) char *result; if (!cli->initialised) { - fstrcpy(cli_error_message, "[Programmer's error] cli_errstr called on unitialized cli_stat struct!\n"); + fstrcpy(cli_error_message, "[Programmer's error] cli_errstr called on uninitialized cli_stat struct!\n"); goto done; } From 39167e74ab8004b97207b94675782856a1dfad59 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Fri, 4 May 2018 22:24:25 +0200 Subject: [PATCH 35/35] Fix spelling s/unsuported/unsupported/ Signed-off-by: Mathieu Parent --- source3/smbd/smbXsrv_open.c | 2 +- source3/smbd/smbXsrv_session.c | 2 +- source3/smbd/smbXsrv_tcon.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/smbd/smbXsrv_open.c b/source3/smbd/smbXsrv_open.c index 17a73077572..4ad0021cdf4 100644 --- a/source3/smbd/smbXsrv_open.c +++ b/source3/smbd/smbXsrv_open.c @@ -1479,7 +1479,7 @@ static NTSTATUS smbXsrv_open_global_parse_record(TALLOC_CTX *mem_ctx, if (global_blob.version != SMBXSRV_VERSION_0) { status = NT_STATUS_INTERNAL_DB_CORRUPTION; DEBUG(1,("Invalid record in smbXsrv_open_global.tdb:" - "key '%s' unsuported version - %d - %s\n", + "key '%s' unsupported version - %d - %s\n", hex_encode_talloc(frame, key.dptr, key.dsize), (int)global_blob.version, nt_errstr(status))); diff --git a/source3/smbd/smbXsrv_session.c b/source3/smbd/smbXsrv_session.c index 9e1fb6977b4..121ff264a9c 100644 --- a/source3/smbd/smbXsrv_session.c +++ b/source3/smbd/smbXsrv_session.c @@ -1918,7 +1918,7 @@ static int smbXsrv_session_global_traverse_fn(struct db_record *rec, void *data) if (global_blob.version != SMBXSRV_VERSION_0) { DEBUG(1,("Invalid record in smbXsrv_session_global.tdb:" - "key '%s' unsuported version - %d\n", + "key '%s' unsupported version - %d\n", hex_encode_talloc(frame, key.dptr, key.dsize), (int)global_blob.version)); goto done; diff --git a/source3/smbd/smbXsrv_tcon.c b/source3/smbd/smbXsrv_tcon.c index 82c880adc0b..2804311d93c 100644 --- a/source3/smbd/smbXsrv_tcon.c +++ b/source3/smbd/smbXsrv_tcon.c @@ -1211,7 +1211,7 @@ static int smbXsrv_tcon_global_traverse_fn(struct db_record *rec, void *data) if (global_blob.version != SMBXSRV_VERSION_0) { DEBUG(1,("Invalid record in smbXsrv_tcon_global.tdb:" - "key '%s' unsuported version - %d\n", + "key '%s' unsupported version - %d\n", hex_encode_talloc(frame, key.dptr, key.dsize), (int)global_blob.version)); goto done;