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 8db1d76d38033a109847d4ca9738ede4bf86fd7b..1f7308211b104e4c175bad49fff86ad52eb32dcf 100644 (file)
--- 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 8614ccdfd5497f8372f52983f177736b9ff7f226..db13ad3032f135b0dea574f52c8301e508084119 100644 (file)
--- 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 5b398ee2ced6a932bd49de59fb8ae9f566465394..208dc6215475520f53f0488aac61bb918a8131a3 100644 (file)
--- 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 a4c4cf3d36eb3e3dcc08b501ef20705438fe1d37..3584cdcbb095ca86ae4985bfe1bc043b692e7bfc 100644 (file)
--- 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 b18bc87b6c3cf0bcbfa5ae8b1b51ad76bd6d7371..ed834850206ad1616e9afa9fbffe84042d5d7efa 100644 (file)
--- 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 780260e1679af4cbf36c0877dc37394a18856881..db12f3f0816d7a798352c9fe935f0fe3c7b86019 100644 (file)
--- 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 b8447bec4de25802018c89ac9cad89501269e61e..09cc10064dc34f5c32a522bc2b2b47e607b53bac 100644 (file)
--- 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 23ac7378212256e77d07a6cf3215c1206a9b10df..559c77dc69f25381a0b9c0e592e2ea92842f2e03 100644 (file)
--- 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 3024e01510aed924f167d64fb1f30adb1f03bd16..e10c528b73286f149766fd8c07bc16f291b9f538 100644 (file)
--- 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 4aadab21c4cf5f606e220ba9b4917f8dc7139aab..88e651a396c696c069139c2787a049b040ebe367 100644 (file)
--- 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 242e2cc44567e189b85b7b603840d9c875ee9f38..64bf4c84e66c95f992728cbad65adf615381bef5 100644 (file)
--- 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 63e292bc73a481acc0b90d44319d0202074952b9..553132c76bba0a29735eb0ba5e31cfbf8246eb54 100644 (file)
--- 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 e43cbb9dff92418ed01908991c39c5f70971ad3b..b41cf98d60976c5f598782dcea9b498978c6e124 100644 (file)
--- 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 {