The branch, master has been updated
       via  5a5cccce24e s3:libsmb: Fix code spelling
       via  939ec7ea46d s3:libads: Fix code spelling
       via  71b40127e11 s3:lib: Fix code spelling
       via  09d2e58986d s3:include: Fix code spelling
       via  ba5b1f633aa s3:include: Remove trailing whitepaces in 
MacExtensions.h
       via  929ed4800ce python:tests: Fix code spelling
       via  bb0297dadc5 python: Fix code spelling
       via  3d4235eb606 examples: Fix code spelling
       via  acd846aac44 examples: Make codespell happy
      from  05e2ec1d8be configure: ensure sizeof(int) >= 4

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5a5cccce24e5fe06b1fdedb3c59efb5b67750b09
Author: Andreas Schneider <a...@samba.org>
Date:   Wed Jul 5 11:26:30 2023 +0200

    s3:libsmb: Fix code spelling
    
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Martin Schwenke <mschwe...@ddn.com>
    
    Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
    Autobuild-Date(master): Thu Jul 13 06:34:01 UTC 2023 on atb-devel-224

commit 939ec7ea46d7c9fd30e4b6c1fec9354bfd9f4d40
Author: Andreas Schneider <a...@samba.org>
Date:   Wed Jul 5 11:21:39 2023 +0200

    s3:libads: Fix code spelling
    
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Martin Schwenke <mschwe...@ddn.com>

commit 71b40127e11c9b275f8e4049a40c5247d53b71f5
Author: Andreas Schneider <a...@samba.org>
Date:   Wed Jul 5 11:16:18 2023 +0200

    s3:lib: Fix code spelling
    
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Martin Schwenke <mschwe...@ddn.com>

commit 09d2e58986d30c71fa17aad12aca5e6b2807d109
Author: Andreas Schneider <a...@samba.org>
Date:   Wed Jul 5 11:10:23 2023 +0200

    s3:include: Fix code spelling
    
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Martin Schwenke <mschwe...@ddn.com>

commit ba5b1f633aaad654a399c815c2a7001d560eb2fc
Author: Andreas Schneider <a...@samba.org>
Date:   Wed Jul 5 11:11:20 2023 +0200

    s3:include: Remove trailing whitepaces in MacExtensions.h
    
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Martin Schwenke <mschwe...@ddn.com>

commit 929ed4800ce8468aa5559b9582c6342302a817e3
Author: Andreas Schneider <a...@samba.org>
Date:   Wed Jul 5 11:07:52 2023 +0200

    python:tests: Fix code spelling
    
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Martin Schwenke <mschwe...@ddn.com>

commit bb0297dadc537022a1002743d2858b48db2ea1d4
Author: Andreas Schneider <a...@samba.org>
Date:   Wed Jul 5 11:05:09 2023 +0200

    python: Fix code spelling
    
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Martin Schwenke <mschwe...@ddn.com>

commit 3d4235eb606b486b59a2a468a35809aec8a81b52
Author: Andreas Schneider <a...@samba.org>
Date:   Wed Jul 5 11:02:04 2023 +0200

    examples: Fix code spelling
    
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Martin Schwenke <mschwe...@ddn.com>

commit acd846aac44767b8035be1c2443acf590d9d79dc
Author: Andreas Schneider <a...@samba.org>
Date:   Wed Jul 5 11:01:25 2023 +0200

    examples: Make codespell happy
    
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Martin Schwenke <mschwe...@ddn.com>

-----------------------------------------------------------------------

Summary of changes:
 examples/dce-dfs/smb.conf                          |  4 +-
 examples/scripts/wins_hook/dns_update              |  2 +-
 python/samba/dbchecker.py                          |  2 +-
 python/samba/tests/dns.py                          |  2 +-
 source3/include/MacExtensions.h                    | 74 +++++++++++-----------
 source3/lib/adouble.c                              |  2 +-
 source3/lib/cbuf.h                                 | 12 ++--
 source3/lib/charcnv.c                              |  6 +-
 source3/lib/eventlog/eventlog.c                    |  6 +-
 source3/lib/g_lock.c                               |  6 +-
 source3/lib/interface.c                            |  2 +-
 source3/lib/ldap_escape.c                          |  2 +-
 source3/lib/ms_fnmatch.c                           |  2 +-
 .../examples/netdomjoin-gui/netdomjoin-gui.c       |  4 +-
 source3/lib/netapi/tests/netgroup.c                |  2 +-
 source3/lib/per_thread_cwd.c                       |  2 +-
 source3/lib/smbconf/smbconf_init.c                 |  2 +-
 source3/lib/smbconf/smbconf_init.h                 |  2 +-
 source3/lib/smbldap.c                              |  4 +-
 source3/lib/srprs.h                                |  2 +-
 source3/lib/substitute.c                           |  4 +-
 source3/lib/sysacls.c                              |  2 +-
 source3/lib/system.c                               | 22 +++----
 source3/lib/tevent_glib_glue.c                     |  6 +-
 source3/lib/util.c                                 |  6 +-
 source3/lib/util_malloc.c                          |  4 +-
 source3/lib/util_sec.c                             |  2 +-
 source3/lib/util_sock.c                            |  2 +-
 source3/libads/authdata.c                          |  2 +-
 source3/libads/kerberos.c                          |  2 +-
 source3/libads/ldap.c                              | 22 +++----
 source3/libads/sitename_cache.c                    |  4 +-
 source3/libsmb/cli_smb2_fnum.c                     |  6 +-
 source3/libsmb/clidfs.c                            |  2 +-
 source3/libsmb/clifile.c                           |  4 +-
 source3/libsmb/clilist.c                           |  2 +-
 source3/libsmb/dsgetdcname.c                       |  2 +-
 source3/libsmb/libsmb_server.c                     |  4 +-
 source3/libsmb/libsmb_setget.c                     |  2 +-
 source3/libsmb/libsmb_thread_impl.c                |  2 +-
 source3/libsmb/namecache.c                         |  4 +-
 source3/libsmb/namequery.c                         |  2 +-
 source3/libsmb/nmblib.c                            |  2 +-
 source3/libsmb/passchange.c                        |  2 +-
 source3/libsmb/trusts_util.c                       |  2 +-
 ...dbcheck-link-output-forward-link-corruption.txt |  2 +-
 46 files changed, 128 insertions(+), 128 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/dce-dfs/smb.conf b/examples/dce-dfs/smb.conf
index f0071637e28..422175364f8 100644
--- a/examples/dce-dfs/smb.conf
+++ b/examples/dce-dfs/smb.conf
@@ -14,13 +14,13 @@
 
 [test]
    comment = test stuff
-   path = /dept/mis/home/testacct
+   path = /dept/home/testacct
    valid users = testacct
    public = no
    writable = yes
 
 [namespace]
-   comment = DCE-DFS Global Root 
+   comment = DCE-DFS Global Root
    path = /...
    public = no
    writable = yes
diff --git a/examples/scripts/wins_hook/dns_update 
b/examples/scripts/wins_hook/dns_update
index 2e8b717e657..14fc1fe74dd 100644
--- a/examples/scripts/wins_hook/dns_update
+++ b/examples/scripts/wins_hook/dns_update
@@ -3,7 +3,7 @@
 # Example script for "wins hook".  This attempts to update the DNS with
 # new A records for the NETBIOS name that Samba passes us. We do this
 # the simple way, by deleting all DNS records for the name and then
-# readding all the expected 'A' records.
+# re-adding all the expected 'A' records.
 #
 # Written by Stephen Rothwell <s...@linuxcare.com>
 #
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index 419f57acfba..84513694fab 100644
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -1306,7 +1306,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), 
str(to_base)))
                 self.report("ERROR: Duplicate forward link values for 
attribute '%s' in '%s'" % (attrname, obj.dn))
             for m in missing_forward_links:
                 self.report("Missing   link '%s'" % (m))
-                if not self.confirm_all("Schedule readding missing forward 
link for attribute %s" % attrname,
+                if not self.confirm_all("Schedule re-adding missing forward 
link for attribute %s" % attrname,
                                         'fix_all_missing_forward_links'):
                     self.err_orphaned_backlink(m.dn, reverse_link_name,
                                                obj.dn.extended_str(), obj.dn,
diff --git a/python/samba/tests/dns.py b/python/samba/tests/dns.py
index 899b07f2d55..62929289b08 100644
--- a/python/samba/tests/dns.py
+++ b/python/samba/tests/dns.py
@@ -529,7 +529,7 @@ class TestDNSUpdates(DNSTest):
         self.assert_dns_rcode_equals(response, dns.DNS_RCODE_NXDOMAIN)
 
     def test_readd_record(self):
-        "Test if adding, deleting and then readding a records works"
+        "Test if adding, deleting and then re-adding a records works"
 
         NAME = "readdrec.%s" % self.get_dns_domain()
 
diff --git a/source3/include/MacExtensions.h b/source3/include/MacExtensions.h
index 0d98df7d9b4..6175ef98757 100644
--- a/source3/include/MacExtensions.h
+++ b/source3/include/MacExtensions.h
@@ -1,21 +1,21 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    SMB parameters and setup
    Copyright (C) Andrew Tridgell 1992-1998
    Copyright (C) John H Terpstra 1996-1998
    Copyright (C) Luke Kenneth Casson Leighton 1996-1998
    Copyright (C) Paul Ashton 1998
-    
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -47,7 +47,7 @@
 ** NT's AFP_AfpInfo stream structure
 */
 #define AFP_INFO_SIZE          0x3c
-#define AFP_Signature          0x41465000 
+#define AFP_Signature          0x41465000
 #define AFP_Version                    0x00000100
 #define AFP_BackupTime         0x80000000
 #define AFP_FinderSize         32
@@ -73,13 +73,13 @@ typedef struct _AfpInfo
 
 typedef struct _SambaAfpInfo
 {
-        AfpInfo        afp; 
+        AfpInfo        afp;
         unsigned long  createtime;
 } SambaAfpInfo;
 
 /*
 ** On SAMBA this structure is followed by 4 bytes that store the create
-** date of the file or folder asociated with it.
+** date of the file or folder associated with it.
 */
 
 /*
@@ -102,30 +102,30 @@ typedef struct _SambaAfpInfo
 
 
 
-/* 
-** The server will return folder access control in the Trans2_Find_First2 
-** and Trans2_Find_Next2 message described later in this document. 
+/*
+** The server will return folder access control in the Trans2_Find_First2
+** and Trans2_Find_Next2 message described later in this document.
 */
 #define SUPPORT_MAC_ACCESS_CNTRL       0x0010
 /*
-** The server supports setting/getting comments using the mechanism in this 
-** document instead of using the NTFS format described in the Introduction. 
+** The server supports setting/getting comments using the mechanism in this
+** document instead of using the NTFS format described in the Introduction.
 */
 #define SUPPORT_MAC_GETSETCOMMENTS     0x0020
 /*
 ** The Server supports setting and getting Macintosh desktop database 
information
-** using the mechanism in this document. 
+** using the mechanism in this document.
 */
 #define SUPPORT_MAC_DESKTOPDB_CALLS    0x0040
 /*
-** The server will return a unique id for files and directories in the 
-** Trans2_Find_First2 and Trans2_Find_Next2 message described later in this 
document. 
+** The server will return a unique id for files and directories in the
+** Trans2_Find_First2 and Trans2_Find_Next2 message described later in this 
document.
 */
 #define SUPPORT_MAC_UNIQUE_IDS         0x0080
 /*
 ** The server will return this flag telling the client that the server does
 ** not support streams or the Macintosh extensions. The rest of this message
-** will be ignored by the client. 
+** will be ignored by the client.
 */
 #define NO_STREAMS_OR_MAC_SUPPORT      0x0100
 
@@ -150,7 +150,7 @@ enum {
        otherSearch     = 0x0001,
        Owner           = 0x0800
 };
-       
+
 
 /*
 ** We will be adding a new info level to the Trans2_Set_Path_Information.
@@ -173,25 +173,25 @@ enum {
 
 /*
 ** We will be adding some new info level to the Trans2_Set_Path_Information 
and Trans2_Query_Path_Information.
-** These info levels will allow the client to add, get, and remove desktop 
inforamtion from the
+** These info levels will allow the client to add, get, and remove desktop 
information from the
 ** server. How the server stores this information is up to them.
 */
 
 /*
-** We need to be able to store an application name and its creator in a 
database. We send a 
-** Trans2_Set_Path_Information call with the full path of the application in 
the path field. 
+** We need to be able to store an application name and its creator in a 
database. We send a
+** Trans2_Set_Path_Information call with the full path of the application in 
the path field.
 ** We will send an info level that represents adding an application name and 
creator to the database.
-** We will pass the File Creator in the data message. 
+** We will pass the File Creator in the data message.
 **
 ** The server should just respond  with no error or an error.
 */
 #define SMB_MAC_DT_ADD_APPL      0x304
 
 /*
-** We need to be able to remove an application name and its creator from a 
database. We send a 
-** Trans2_Set_Path_Information call with the full path of the application in 
the path field. 
+** We need to be able to remove an application name and its creator from a 
database. We send a
+** Trans2_Set_Path_Information call with the full path of the application in 
the path field.
 ** We will send an info level that represents removing an application name and 
creator from the database.
-** We will pass the File Creator in the data message. 
+** We will pass the File Creator in the data message.
 **
 ** The server should just respond  with no error or an error.
 */
@@ -199,51 +199,51 @@ enum {
 
 
 /*
-** We need to be able to get an application name and its creator from a 
database. We send a 
-** Trans2_Query_Path_Information call in which the name field is just ignore. 
-** We will send an info level that represents getting an application name with 
a structure that 
+** We need to be able to get an application name and its creator from a 
database. We send a
+** Trans2_Query_Path_Information call in which the name field is just ignore.
+** We will send an info level that represents getting an application name with 
a structure that
 ** contains the File Creator and index. Were index has the following meaning.
 **             Index = 0; Get the application path from the database with the 
most current date.
 **             Index > 0; Use the index to find the application path from the 
database.
 **                             e.g.    index of 5 means get the fifth entry of 
this application name in the database.
 **                                             if not entry return an error.
 **
-** The server returns with a structure that contains the full path to the 
appication and
+** The server returns with a structure that contains the full path to the 
application and
 ** its creator's date.
 */
 #define SMB_MAC_DT_GET_APPL      0x306
 
 
 /*
-** We need to be able to get an icon from a database. We send a 
Trans2_Query_Path_Information call in 
+** We need to be able to get an icon from a database. We send a 
Trans2_Query_Path_Information call in
 ** which the path name is ignore. We will send an info level that represents 
getting an icon with a structure
 ** that contains the Requested size of the icon, the Icon type, File Creator, 
and File Type.
 **
-** The server returns with a structure that contains the actual size of the 
icon 
-** (must be less than requested length) and the icon bit map. 
+** The server returns with a structure that contains the actual size of the 
icon
+** (must be less than requested length) and the icon bit map.
 */
 #define SMB_MAC_DT_GET_ICON      0x307
 
 
 /*
-** We need to be able to get an icon from a database. We send a 
Trans2_Query_Path_Information call in 
+** We need to be able to get an icon from a database. We send a 
Trans2_Query_Path_Information call in
 ** which the path name is ignore. We will send an info level that represents 
getting an icon with a structure
 ** that contains the index and File Creator. The index allows the client to 
make repeated calls to the server
 ** gathering all icon stored by this file creator.
-**             
 **
-** The server returns with a structure that contains the actual size of the 
icon 
-** (must be less than requested length) and the icon bit map, File Type, and 
Icon Type. 
+**
+** The server returns with a structure that contains the actual size of the 
icon
+** (must be less than requested length) and the icon bit map, File Type, and 
Icon Type.
 */
 #define SMB_MAC_DT_GET_ICON_INFO         0x308
 
 
 
 /*
-** We need to be able to add an icon to a database. We send a 
Trans2_Set_Path_Information call in 
+** We need to be able to add an icon to a database. We send a 
Trans2_Set_Path_Information call in
 ** which the path name is ignore. We will send an info level that represents 
setting an icon with a structure
 ** that contains the icon data, icon size, icon type, the file type, and file 
creator.
-**             
+**
 **
 ** The server returns only that the call was successful or not.
 */
diff --git a/source3/lib/adouble.c b/source3/lib/adouble.c
index 3181a390d35..45a44dbbaf4 100644
--- a/source3/lib/adouble.c
+++ b/source3/lib/adouble.c
@@ -132,7 +132,7 @@
  *
  * The ad_xattr_header follows the FinderInfo data in the FinderInfo entry if
  * the length of the FinderInfo entry is larger then 32 bytes. It is then
- * preceeded with 2 bytes padding.
+ * preceded with 2 bytes padding.
  *
  * Cf: 
https://opensource.apple.com/source/xnu/xnu-4570.1.46/bsd/vfs/vfs_xattr.c
  */
diff --git a/source3/lib/cbuf.h b/source3/lib/cbuf.h
index 8a4098a42e5..d4f5a723a92 100644
--- a/source3/lib/cbuf.h
+++ b/source3/lib/cbuf.h
@@ -60,7 +60,7 @@ void  cbuf_delete(cbuf* b);
 
 /**
  * Reset the buffer to initial state.
- * Set the write positon to the start of buffer, effectivly
+ * Set the write position to the start of buffer, effectivly
  * clearing its contents. Doesn't free memory.
  *
  * @param b the buffer to clear
@@ -126,9 +126,9 @@ char* cbuf_reserve(cbuf* b, size_t len);
 /**
  * Put a character into the buffer.
  *
- * @param b a charcter buffer, may be NULL.
+ * @param b a character buffer, may be NULL.
  * @param c a character
- * @return number of charcters written ((b==NULL) ? 0 : 1)
+ * @return number of characters written ((b==NULL) ? 0 : 1)
  *
  * @retval -1 on error
  */
@@ -176,7 +176,7 @@ int cbuf_putdw(cbuf* b, uint32_t u);
 /**
  * Print formatted to a character buffer.
  *
- * @param b a charcter buffer
+ * @param b a character buffer
  * @param fmt a printf format string
  *
  * @return number of characters written, negative on error
@@ -189,7 +189,7 @@ int cbuf_printf(cbuf* b, const char* fmt, ...) 
PRINTF_ATTRIBUTE(2,3);
  *
  * @param b a character buffer.
  *
- * @return index of the next charcter to write.
+ * @return index of the next character to write.
  */
 size_t cbuf_getpos(const cbuf* b);
 
@@ -197,7 +197,7 @@ size_t cbuf_getpos(const cbuf* b);
  * Set the current write position of a buffer.
  * Invalidates the buffer contents from on the new position.
  *
- * @param b a charcter buffer
+ * @param b a character buffer
  * @param pos a position obtained by cbuf_getpos
  */
 void cbuf_setpos(cbuf* b, size_t pos);
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 5ec070c0b6c..d00a3a3cfa0 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -336,7 +336,7 @@ static size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx,
        *ppdest = NULL;
 
 #ifdef DEVELOPER
-       /* Ensure we never use the braindead "malloc" varient. */
+       /* Ensure we never use the braindead "malloc" variant. */
        if (ctx == NULL) {
                smb_panic("NULL talloc CTX in pull_ucs2_base_talloc\n");
        }
@@ -417,7 +417,7 @@ static size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx,
   STR_ASCII     use ascii even with unicode packet.
   STR_NOALIGN   means don't do alignment.
  dest_len is the maximum length allowed in the destination. If dest_len
- is -1 then no maxiumum is used.
+ is -1 then no maximum is used.
 **/
 
 size_t push_string_check_fn(void *dest, const char *src,
@@ -441,7 +441,7 @@ size_t push_string_check_fn(void *dest, const char *src,
   STR_ASCII     use ascii even with unicode packet.
   STR_NOALIGN   means don't do alignment.
  dest_len is the maximum length allowed in the destination. If dest_len
- is -1 then no maxiumum is used.
+ is -1 then no maximum is used.
 **/
 
 size_t push_string_base(const char *base, uint16_t flags2,
diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c
index 473b6fa6337..0c13d2a1d4b 100644
--- a/source3/lib/eventlog/eventlog.c
+++ b/source3/lib/eventlog/eventlog.c
@@ -356,7 +356,7 @@ ELOG_TDB *elog_open_tdb( const char *logname, bool 
force_clear, bool read_only )
                if ( strequal( ptr->name, logname ) ) {
                        ptr->ref_count++;
 
-                       /* trick to alow clearing of the eventlog tdb.
+                       /* trick to allow clearing of the eventlog tdb.
                           The force_clear flag should imply that someone
                           has done a force close.  So make sure the tdb
                           is NULL.  If this is a normal open, then just
@@ -485,7 +485,7 @@ bool parse_logentry( TALLOC_CTX *mem_ctx, char *line, 
struct eventlog_Record_tdb
 
        start = line;
 
-       /* empty line signyfiying record delimeter, or we're at the end of the 
buffer */
+       /* empty line signyfiying record delimiter, or we're at the end of the 
buffer */
        if ( start == NULL || strlen( start ) == 0 ) {
                DEBUG( 6,
                       ( "parse_logentry: found end-of-record indicator.\n" ) );
@@ -761,7 +761,7 @@ struct EVENTLOGRECORD *evlog_pull_record(TALLOC_CTX 
*mem_ctx,
  write an eventlog entry. Note that we have to lock, read next
  eventlog, increment, write, write the record, unlock
 
- coming into this, ee has the eventlog record, and the auxilliary date
+ coming into this, ee has the eventlog record, and the auxiliary date
  (computer name, etc.) filled into the other structure. Before packing
  into a record, this routine will calc the appropriate padding, etc.,
  and then blast out the record in a form that can be read back in
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index d3f049d43bb..33f088b2a43 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -756,7 +756,7 @@ static NTSTATUS g_lock_trylock(
 
                                /*
                                 * We're trying to upgrade, and the
-                                * exlusive lock is taken by someone
+                                * exclusive lock is taken by someone
                                 * else. This means that someone else
                                 * is waiting for us to give up our
                                 * shared lock. If we now also wait
@@ -873,7 +873,7 @@ noexclusive:
 
                if (lck.num_shared == 0) {
                        /*
-                        * If we store ourself as exclusive writter,
+                        * If we store ourself as exclusive writer,
                         * without any pending readers ...
                         */
                        goto got_lock;
@@ -1456,7 +1456,7 @@ static void g_lock_writev_data_fn(
        bool ok;
 
        /*
-        * We're holding an exclusiv write lock.
+        * We're holding an exclusive write lock.
         *
         * Now we're updating the content of the record.
         *
diff --git a/source3/lib/interface.c b/source3/lib/interface.c
index 440d74cab99..beb100398b8 100644
--- a/source3/lib/interface.c
+++ b/source3/lib/interface.c
@@ -429,7 +429,7 @@ static void parse_extra_info(char *key, uint64_t *speed, 
uint32_t *cap,
  where
  - keys known: 'speed', 'capability', 'if_index'
  - speed is in bits per second
- - capabilites known: 'RSS', 'RDMA'
+ - capabilities known: 'RSS', 'RDMA'
  - if_index should be used with care, because
    these indexes should not conicide with indexes
    the kernel sets...
diff --git a/source3/lib/ldap_escape.c b/source3/lib/ldap_escape.c
index 0d2b8f5fe01..b44662c75df 100644
--- a/source3/lib/ldap_escape.c
+++ b/source3/lib/ldap_escape.c
@@ -24,7 +24,7 @@
 
 /**
  * Escape a parameter to an LDAP filter string, so they cannot contain
- * embeded ( ) * or \ chars which may cause it not to parse correctly.
+ * embedded ( ) * or \ chars which may cause it not to parse correctly.
  *
  * @param s The input string
  *
diff --git a/source3/lib/ms_fnmatch.c b/source3/lib/ms_fnmatch.c
index a69407b5267..4fbed586acf 100644
--- a/source3/lib/ms_fnmatch.c
+++ b/source3/lib/ms_fnmatch.c
@@ -19,7 +19,7 @@
 
 /*
    This module was originally based on fnmatch.c copyright by the Free
-   Software Foundation. It bears little (if any) resemblence to that
+   Software Foundation. It bears little (if any) resemblance to that
    code now
 */
 
diff --git a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c 
b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index ca599d316ca..d90a06c76fa 100644
--- a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -999,7 +999,7 @@ static void callback_do_join_workgroup(GtkWidget *widget,
                                       gpointer data)
 {
        struct join_state *state = (struct join_state *)data;
-       debug("callback_do_join_workgroup choosen\n");
+       debug("callback_do_join_workgroup chosen\n");
        gtk_widget_set_sensitive(GTK_WIDGET(state->entry_workgroup), TRUE);
        gtk_widget_grab_focus(GTK_WIDGET(state->entry_workgroup));
        gtk_widget_set_sensitive(GTK_WIDGET(state->entry_domain), FALSE);
@@ -1012,7 +1012,7 @@ static void callback_do_join_domain(GtkWidget *widget,
                                    gpointer data)
 {
        struct join_state *state = (struct join_state *)data;
-       debug("callback_do_join_domain choosen\n");
+       debug("callback_do_join_domain chosen\n");
        gtk_widget_set_sensitive(GTK_WIDGET(state->entry_domain), TRUE);
        gtk_widget_grab_focus(GTK_WIDGET(state->entry_domain));
        gtk_widget_set_sensitive(GTK_WIDGET(state->entry_workgroup), FALSE);
diff --git a/source3/lib/netapi/tests/netgroup.c 
b/source3/lib/netapi/tests/netgroup.c
index dba4fe7567c..5180c499017 100644
--- a/source3/lib/netapi/tests/netgroup.c
+++ b/source3/lib/netapi/tests/netgroup.c
@@ -434,7 +434,7 @@ NET_API_STATUS netapitest_group(struct libnetapi_ctx *ctx,
                goto out;
        }
 
-       /* set it again via exlicit member set */
+       /* set it again via explicit member set */
 
        status = test_netgroupsetusers(hostname, groupname2, 0, 1, &username);
        if (status) {
diff --git a/source3/lib/per_thread_cwd.c b/source3/lib/per_thread_cwd.c
index fcec572a759..b71d4c6818f 100644
--- a/source3/lib/per_thread_cwd.c
+++ b/source3/lib/per_thread_cwd.c
@@ -54,7 +54,7 @@ void per_thread_cwd_check(void)
         * per container namespaces.
         *


-- 
Samba Shared Repository

Reply via email to