From: Andreas Schneider <asn@samba.org>
Date: Thu, 3 Aug 2023 12:34:51 +0000 (+0200)
Subject: s4:libcli: Fix code spelling
X-Git-Tag: tevent-0.16.0~939
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=950f0b47d94c572c0dc62cd256b8bf02f0fdc299;p=thirdparty%2Fsamba.git

s4:libcli: Fix code spelling

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c
index 8db1d76d380..1f7308211b1 100644
--- a/source4/libcli/ldap/ldap_bind.c
+++ b/source4/libcli/ldap/ldap_bind.c
@@ -334,7 +334,7 @@ try_logon_again:
 	}
 
 	/* reset the original gensec_features (on the credentials
-	 * context, so we don't tatoo it ) */
+	 * context, so we don't tattoo it ) */
 	cli_credentials_set_gensec_features(creds,
 					    old_gensec_features,
 					    CRED_SPECIFIED);
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 8614ccdfd54..db13ad3032f 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -52,7 +52,7 @@ static int ldap_connection_destructor(struct ldap_connection *conn)
 }
 
 /**
-  create a new ldap_connection stucture. The event context is optional
+  create a new ldap_connection structure. The event context is optional
 */
 
 _PUBLIC_ struct ldap_connection *ldap4_new_connection(TALLOC_CTX *mem_ctx, 
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 5b398ee2ced..208dc621547 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -68,7 +68,7 @@ struct smb2_lease_break {
 struct ntvfs_handle;
 
 /*
- * a generic container for file handles or file pathes
+ * a generic container for file handles or file paths
  * for qfileinfo/setfileinfo and qpathinfo/setpathinfo
 */
 union smb_handle_or_path {
@@ -1389,7 +1389,7 @@ enum smb_open_level {
 union smb_open {
 /* 
  * because the *.out.file structs are not aligned to the same offset for each level
- * we provide a hepler macro that should be used to find the current smb_handle structure
+ * we provide a helper macro that should be used to find the current smb_handle structure
  */
 #define SMB_OPEN_OUT_FILE(op, file) do { \
 	switch (op->generic.level) { \
@@ -1455,11 +1455,11 @@ union smb_open {
 			const char *fname;
 
 			/* these last 2 elements are only used in the
-			   NTTRANS varient of the call */
+			   NTTRANS variant of the call */
 			struct security_descriptor *sec_desc;
 			struct smb_ea_list *ea_list;
 
-			/* some optional parameters from the SMB2 varient */
+			/* some optional parameters from the SMB2 variant */
 			bool query_maximal_access;
 			bool query_on_disk_id;
 
@@ -2055,7 +2055,7 @@ union smb_lock {
 				uint32_t pid; /* 16 bits in SMB1 */
 				uint64_t offset;
 				uint64_t count;
-			} *locks; /* unlocks are first in the arrray */
+			} *locks; /* unlocks are first in the array */
 		} in;
 	} generic, lockx;
 
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index a4c4cf3d36e..3584cdcbb09 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -173,7 +173,7 @@ struct smbcli_session {
 	   the user to control these for torture testing */
 	uint16_t flags2;
 
-	/* the spnego context if we use extented security */
+	/* the spnego context if we use extended security */
 	struct gensec_security *gensec;
 
 	struct smbcli_session_options {
@@ -245,7 +245,7 @@ struct smbcli_request {
 	struct smb_nttrans nttrans;
 
 	/* information on what to do with a reply when it is received
-	   asyncronously. If this is not setup when a reply is received then
+	   asynchronously. If this is not setup when a reply is received then
 	   the reply is discarded
 
 	   The private pointer is private to the caller of the client
diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c
index b18bc87b6c3..ed834850206 100644
--- a/source4/libcli/raw/rawfileinfo.c
+++ b/source4/libcli/raw/rawfileinfo.c
@@ -93,7 +93,7 @@ NTSTATUS smb_raw_fileinfo_passthru_parse(const DATA_BLOB *blob, TALLOC_CTX *mem_
 {	
 	switch (level) {
 	case RAW_FILEINFO_BASIC_INFORMATION:
-		/* some servers return 40 bytes and some 36. w2k3 return 40, so thats
+		/* some servers return 40 bytes and some 36. w2k3 return 40, so that's
 		   what we should do, but we need to accept 36 */
 		if (blob->length != 36) {
 			FINFO_CHECK_SIZE(40);
@@ -794,7 +794,7 @@ _PUBLIC_ NTSTATUS smb_raw_pathinfo_recv(struct smbcli_request *req,
 			       TALLOC_CTX *mem_ctx,
 			       union smb_fileinfo *parms)
 {
-	/* recv is idential to fileinfo */
+	/* recv is identical to fileinfo */
 	return smb_raw_fileinfo_recv(req, mem_ctx, parms);
 }
 
diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h
index 780260e1679..db12f3f0816 100644
--- a/source4/libcli/raw/smb.h
+++ b/source4/libcli/raw/smb.h
@@ -292,7 +292,7 @@
 
 /*
  * Global value meaning that the smb_uid field should be
- * ingored (in share level security and protocol level == CORE)
+ * ignored (in share level security and protocol level == CORE)
  */
 
 #define UID_FIELD_INVALID 0
diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
index b8447bec4de..09cc10064dc 100644
--- a/source4/libcli/resolve/dns_ex.c
+++ b/source4/libcli/resolve/dns_ex.c
@@ -242,7 +242,7 @@ static struct dns_records_container get_a_aaaa_records(TALLOC_CTX *mem_ctx,
 	if (qtype == QTYPE_AAAA && a_num == 0) {
 		/*
 		* DNS server didn't returned A when asked for AAAA records.
-		* Most of the server do it, let's ask for A specificaly.
+		* Most of the server do it, let's ask for A specifically.
 		*/
 		err = dns_lookup(tmp_ctx, name, QTYPE_A, &reply);
 		if (ERR_DNS_IS_OK(err)) {
diff --git a/source4/libcli/smb2/find.c b/source4/libcli/smb2/find.c
index 23ac7378212..559c77dc69f 100644
--- a/source4/libcli/smb2/find.c
+++ b/source4/libcli/smb2/find.c
@@ -92,7 +92,7 @@ NTSTATUS smb2_find(struct smb2_tree *tree, TALLOC_CTX *mem_ctx,
 
 
 /*
-  a varient of smb2_find_recv that parses the resulting blob into
+  a variant of smb2_find_recv that parses the resulting blob into
   smb_search_data structures
 */
 NTSTATUS smb2_find_level_recv(struct smb2_request *req, TALLOC_CTX *mem_ctx,
@@ -167,7 +167,7 @@ NTSTATUS smb2_find_level_recv(struct smb2_request *req, TALLOC_CTX *mem_ctx,
 }
 
 /*
-  a varient of smb2_find that parses the resulting blob into
+  a variant of smb2_find that parses the resulting blob into
   smb_search_data structures
 */
 NTSTATUS smb2_find_level(struct smb2_tree *tree, TALLOC_CTX *mem_ctx,
diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c
index 3024e01510a..e10c528b732 100644
--- a/source4/libcli/smb2/request.c
+++ b/source4/libcli/smb2/request.c
@@ -554,7 +554,7 @@ NTSTATUS smb2_pull_o32s32_blob(struct smb2_request_buffer *buf, TALLOC_CTX *mem_
   pull a uint16_t ofs/ uint32_t length/blob triple from a data blob
   the ptr points to the start of the offset/length pair
   
-  In this varient the uint16_t is padded by an extra 2 bytes, making
+  In this variant the uint16_t is padded by an extra 2 bytes, making
   the size aligned on 4 byte boundary
 */
 NTSTATUS smb2_pull_o16As32_blob(struct smb2_request_buffer *buf, TALLOC_CTX *mem_ctx, uint8_t *ptr, DATA_BLOB *blob)
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index 4aadab21c4c..88e651a396c 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -166,7 +166,7 @@ struct smb2_request {
 	uint16_t credit_charge;
 
 	/* information on what to do with a reply when it is received
-	   asyncronously. If this is not setup when a reply is received then
+	   asynchronously. If this is not setup when a reply is received then
 	   the reply is discarded
 
 	   The private pointer is private to the caller of the client
diff --git a/source4/libcli/smb_composite/fsinfo.c b/source4/libcli/smb_composite/fsinfo.c
index 242e2cc4456..64bf4c84e66 100644
--- a/source4/libcli/smb_composite/fsinfo.c
+++ b/source4/libcli/smb_composite/fsinfo.c
@@ -1,5 +1,5 @@
 /*
-  a composite API for quering file system information
+  a composite API for querying file system information
 */
 
 #include "includes.h"
diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c
index 63e292bc73a..553132c76bb 100644
--- a/source4/libcli/smb_composite/sesssetup.c
+++ b/source4/libcli/smb_composite/sesssetup.c
@@ -113,7 +113,7 @@ static void request_handler(struct smbcli_request *req)
 		/* This doesn't work, as this only happens on old
 		 * protocols, where this comparison won't match. */
 		if (NT_STATUS_EQUAL(c->status, NT_STATUS_LOGON_FAILURE)) {
-			/* we neet to reset the vuid for a new try */
+			/* we need to reset the vuid for a new try */
 			session->vuid = 0;
 			if (cli_credentials_wrong_password(state->io->in.credentials)) {
 				nt_status = session_setup_old(c, session,
@@ -611,8 +611,8 @@ static NTSTATUS session_setup_spnego(struct composite_context *c,
 
 /*
   composite session setup function that hides the details of all the
-  different session setup varients, including the multi-pass nature of
-  the spnego varient
+  different session setup variants, including the multi-pass nature of
+  the spnego variant
 */
 struct composite_context *smb_composite_sesssetup_send(struct smbcli_session *session,
 						       struct smb_composite_sesssetup *io)
@@ -642,7 +642,7 @@ struct composite_context *smb_composite_sesssetup_send(struct smbcli_session *se
 
 	talloc_set_destructor(state, sesssetup_state_destructor);
 
-	/* no session setup at all in earliest protocol varients */
+	/* no session setup at all in earliest protocol variants */
 	if (session->transport->negotiate.protocol < PROTOCOL_LANMAN1) {
 		if (krb5_state == CRED_USE_KERBEROS_REQUIRED) {
 			composite_error(c, NT_STATUS_NETWORK_CREDENTIAL_CONFLICT);
diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h
index e43cbb9dff9..b41cf98d609 100644
--- a/source4/libcli/smb_composite/smb_composite.h
+++ b/source4/libcli/smb_composite/smb_composite.h
@@ -166,7 +166,7 @@ NTSTATUS smb_composite_connect(struct smb_composite_connect *io, TALLOC_CTX *mem
 
 /*
   generic session setup interface that takes care of which
-  session setup varient to use
+  session setup variant to use
 */
 struct smb_composite_sesssetup {
 	struct {