[SCM] Samba Shared Repository - branch master updated

Andreas Schneider asn at samba.org
Fri Apr 14 06:19:01 UTC 2023


The branch, master has been updated
       via  31418f95d3a testprogs: Set PREFIX_ABS before it is used in test_primary_group.sh
       via  cfa53c8a801 lib:util: Fix code spelling
       via  b3271603779 lib:util: Remove trailing white spaces in byteorder.h
       via  89d5c0dc5c7 lib:tsocket: Fix code spelling
       via  6eed0c128ce lib:tevent: Fix code spelling
       via  2afd7b1bb86 lib:tdb: Fix code spelling
       via  b6de03c74c2 lib:talloc: Fix code spelling
       via  c6e1a949156 lib:socket: Fix code spelling
       via  189f156c8c7 lib:smbconf: Fix code spelling
       via  8d647f2f7c0 lib:replace: Fix code spelling
       via  9d42ba7661f lib:replace: Remove trailing white spaces in xattr.c
      from  53f0a292f80 selftest:Samba3: use the correct NSS_WRAPPER_HOSTNAME

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


- Log -----------------------------------------------------------------
commit 31418f95d3a44b2c43081b3095ca813fbdb3d6a1
Author: Pavel Filipenský <pfilipensky at samba.org>
Date:   Thu Apr 13 09:41:26 2023 +0200

    testprogs: Set PREFIX_ABS before it is used in test_primary_group.sh
    
    Signed-off-by: Pavel Filipenský <pfilipensky at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri Apr 14 06:18:18 UTC 2023 on atb-devel-224

commit cfa53c8a80134dea025bd9cfe7b9c6518e75cae6
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 13 13:29:32 2023 +0200

    lib:util: Fix code spelling
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

commit b3271603779a04beee795c5ba8244923b4d04ef4
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 13 13:27:37 2023 +0200

    lib:util: Remove trailing white spaces in byteorder.h
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

commit 89d5c0dc5c709fef5d64715ab8a288b86db6aaca
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 13 13:19:05 2023 +0200

    lib:tsocket: Fix code spelling
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

commit 6eed0c128ce4d42409226a48dba147a22e2acacf
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 13 13:18:05 2023 +0200

    lib:tevent: Fix code spelling
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

commit 2afd7b1bb86a7454a960bacafc9dc9df0ba68dfc
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 13 13:17:08 2023 +0200

    lib:tdb: Fix code spelling
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

commit b6de03c74c28b6ef3517801260e02fde802b5fdb
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 13 13:14:10 2023 +0200

    lib:talloc: Fix code spelling
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

commit c6e1a949156398952ba7ea3bd8a164409abe985a
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 13 12:54:55 2023 +0200

    lib:socket: Fix code spelling
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

commit 189f156c8c7f1fc48048169e23861fdb9a4841cf
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 13 12:54:21 2023 +0200

    lib:smbconf: Fix code spelling
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

commit 8d647f2f7c00424ab52ada98d9131e81bfa38d1c
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 13 12:53:07 2023 +0200

    lib:replace: Fix code spelling
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

commit 9d42ba7661f46b7d76a7e4901c3752be43541548
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 13 12:52:52 2023 +0200

    lib:replace: Remove trailing white spaces in xattr.c
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

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

Summary of changes:
 lib/replace/xattr.c                      |  10 +-
 lib/smbconf/pysmbconf.c                  |   4 +-
 lib/smbconf/smbconf.h                    |   6 +-
 lib/socket/interfaces.c                  |   2 +-
 lib/talloc/pytalloc_guide.txt            |   2 +-
 lib/talloc/pytalloc_util.c               |   2 +-
 lib/talloc/talloc.c                      |   6 +-
 lib/tdb/common/lock.c                    |   4 +-
 lib/tdb/common/mutex.c                   |   8 +-
 lib/tdb/common/open.c                    |   4 +-
 lib/tdb/common/transaction.c             |   2 +-
 lib/tdb/common/traverse.c                |   2 +-
 lib/tdb/docs/mutex.txt                   |   4 +-
 lib/tdb/test/lock-tracking.c             |   2 +-
 lib/tevent/doc/tevent_events.dox         |   4 +-
 lib/tevent/doc/tevent_queue.dox          |   4 +-
 lib/tevent/doxy.config                   |   2 +-
 lib/tevent/testsuite.c                   |   2 +-
 lib/tevent/tevent.c                      |   2 +-
 lib/tevent/tevent.h                      |   8 +-
 lib/tevent/tevent_threads.c              |   4 +-
 lib/tsocket/tsocket.h                    |   4 +-
 lib/tsocket/tsocket_guide.txt            |   4 +-
 lib/util/access.c                        |   4 +-
 lib/util/byteorder.h                     |  14 +-
 lib/util/charset/charset_macosxfs.c      |  16 +-
 lib/util/charset/codepoints.c            |   2 +-
 lib/util/charset/iconv.c                 |   4 +-
 lib/util/charset/pull_push.c             |   2 +-
 lib/util/charset/tests/convert_string.c  | 376 +++++++++++++++----------------
 lib/util/charset/util_unistr.c           |   4 +-
 lib/util/debug.h                         |   8 +-
 lib/util/memcache.h                      |   2 +-
 lib/util/modules.c                       |   2 +-
 lib/util/ms_fnmatch.c                    |   2 +-
 lib/util/params.c                        |   2 +-
 lib/util/rfc1738.c                       |   2 +-
 lib/util/samba_util.h                    |   8 +-
 lib/util/smb_strtox.c                    |   4 +-
 lib/util/string_wrappers.h               |   2 +-
 lib/util/tests/asn1_tests.c              |   2 +-
 lib/util/tests/rfc1738.c                 |   2 +-
 lib/util/tfork.c                         |   6 +-
 lib/util/tfork.h                         |   2 +-
 lib/util/time.c                          |   4 +-
 lib/util/util.c                          |   2 +-
 testprogs/blackbox/test_primary_group.sh |   6 +-
 47 files changed, 285 insertions(+), 285 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/xattr.c b/lib/replace/xattr.c
index 6d014a83a73..c9b71267d88 100644
--- a/lib/replace/xattr.c
+++ b/lib/replace/xattr.c
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    replacement routines for xattr implementations
    Copyright (C) Jeremy Allison  1998-2005
@@ -10,7 +10,7 @@
      ** NOTE! The following LGPL license applies to the replace
      ** library. This does NOT imply that all of Samba is released
      ** under the LGPL
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
@@ -196,7 +196,7 @@ static struct {
         int space;
 	const char *name;
 	size_t len;
-} 
+}
 extattr[] = {
 	{ EXTATTR_NAMESPACE_SYSTEM, EXTATTR_PREFIX("system.") },
         { EXTATTR_NAMESPACE_USER, EXTATTR_PREFIX("user.") },
@@ -233,7 +233,7 @@ static ssize_t bsd_attr_list (int type, extattr_arg arg, char *list, size_t size
 				errno = ENOSYS;
 				return -1;
 		}
-		/* Some error happend. Errno should be set by the previous call */
+		/* Some error happened. Errno should be set by the previous call */
 		if(list_size < 0)
 			return -1;
 		/* No attributes */
@@ -245,7 +245,7 @@ static ssize_t bsd_attr_list (int type, extattr_arg arg, char *list, size_t size
 		   problem with the emulation.
 		*/
 		if(list == NULL) {
-			/* Take the worse case of one char attribute names - 
+			/* Take the worse case of one char attribute names -
 			   two bytes per name plus one more for sanity.
 			*/
 			total_size += list_size + (list_size/2 + 1)*extattr[t].len;
diff --git a/lib/smbconf/pysmbconf.c b/lib/smbconf/pysmbconf.c
index 465876684ca..20041d3a580 100644
--- a/lib/smbconf/pysmbconf.c
+++ b/lib/smbconf/pysmbconf.c
@@ -602,12 +602,12 @@ PyDoc_STRVAR(obj_drop_doc,
 
 PyDoc_STRVAR(obj_set_parameter_doc,
 "set_parameter(str, str, str) -> None\n"
-"Set a configuration parmeter. Specify service name, parameter name,\n"
+"Set a configuration parameter. Specify service name, parameter name,\n"
 "and parameter value.\n");
 
 PyDoc_STRVAR(obj_set_global_parameter_doc,
 "set_global_parameter(str, str) -> None\n"
-"Set a global configuration parmeter. Specify the parameter name\n"
+"Set a global configuration parameter. Specify the parameter name\n"
 "and parameter value.\n");
 
 PyDoc_STRVAR(obj_delete_share_doc,
diff --git a/lib/smbconf/smbconf.h b/lib/smbconf/smbconf.h
index 1804cb5905a..e5f138fd98b 100644
--- a/lib/smbconf/smbconf.h
+++ b/lib/smbconf/smbconf.h
@@ -275,7 +275,7 @@ sbcErr smbconf_set_parameter(struct smbconf_ctx *ctx,
  * @brief Set a global configuration parameter to the value provided.
  *
  * This adds a paramet in the [global] service. It also creates [global] if it
- * does't exist.
+ * doesn't exist.
  *
  * @param[in] ctx       The smbconf context to use.
  *
@@ -314,7 +314,7 @@ sbcErr smbconf_get_parameter(struct smbconf_ctx *ctx,
 /**
  * @brief Get the value of a global configuration parameter as a string.
  *
- * It also creates [global] if it does't exist.
+ * It also creates [global] if it doesn't exist.
  *
  * @param[in]  ctx      The smbconf context to use.
  *
@@ -350,7 +350,7 @@ sbcErr smbconf_delete_parameter(struct smbconf_ctx *ctx,
 /**
  * @brief Delete a global parameter from the configuration.
  *
- * It also creates [global] if it does't exist.
+ * It also creates [global] if it doesn't exist.
  *
  * @param[in]  ctx      The smbconf context to use.
  *
diff --git a/lib/socket/interfaces.c b/lib/socket/interfaces.c
index 3157e0cef12..d8724e6c669 100644
--- a/lib/socket/interfaces.c
+++ b/lib/socket/interfaces.c
@@ -73,7 +73,7 @@ bool make_netmask(struct sockaddr_storage *pss_out,
 }
 
 /****************************************************************************
- Create a struct sockaddr_storage set to the broadcast or network adress from
+ Create a struct sockaddr_storage set to the broadcast or network address from
  an incoming sockaddr_storage.
 ****************************************************************************/
 
diff --git a/lib/talloc/pytalloc_guide.txt b/lib/talloc/pytalloc_guide.txt
index bd2b68c0213..85705deebff 100644
--- a/lib/talloc/pytalloc_guide.txt
+++ b/lib/talloc/pytalloc_guide.txt
@@ -215,7 +215,7 @@ This will increment the reference counter for the talloc context.
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 DEPRECATED! PyObject *pytalloc_CObject_FromTallocPtr(void *);
 
-Create a new pytalloc_Object for an abitrary talloc-maintained C pointer. This will
+Create a new pytalloc_Object for an arbitrary talloc-maintained C pointer. This will
 use a generic VoidPtr Python type, which just provides an opaque object in
 Python. The caller is responsible for incrementing the talloc reference count before calling
 this function - it will dereference the talloc pointer when it is garbage collected.
diff --git a/lib/talloc/pytalloc_util.c b/lib/talloc/pytalloc_util.c
index 1b7cfdda6e7..064957ffd6f 100644
--- a/lib/talloc/pytalloc_util.c
+++ b/lib/talloc/pytalloc_util.c
@@ -116,7 +116,7 @@ _PUBLIC_ PyObject *pytalloc_reference_ex(PyTypeObject *py_type,
 
 
 /**
- * Internal function that either steals or referecences the talloc
+ * Internal function that either steals or references the talloc
  * pointer into a new talloc context.
  */
 static PyObject *pytalloc_steal_or_reference(PyTypeObject *py_type,
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index 530bad896ab..14e9e389f54 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -146,7 +146,7 @@ static struct {
 } while (0)
 
 #if defined(DEVELOPER) && defined(VALGRIND_MAKE_MEM_NOACCESS)
-/* Mark the whole chunk as not accessable */
+/* Mark the whole chunk as not accessible */
 #define TC_INVALIDATE_FULL_VALGRIND_CHUNK(_tc) do { \
 	size_t _flen = TC_HDR_SIZE + (_tc)->size; \
 	char *_fptr = (char *)(_tc); \
@@ -171,7 +171,7 @@ static struct {
 } while (0)
 
 #if defined(DEVELOPER) && defined(VALGRIND_MAKE_MEM_NOACCESS)
-/* Mark the unused bytes not accessable */
+/* Mark the unused bytes not accessible */
 #define TC_INVALIDATE_SHRINK_VALGRIND_CHUNK(_tc, _new_size) do { \
 	size_t _flen = (_tc)->size - (_new_size); \
 	char *_fptr = (char *)TC_PTR_FROM_CHUNK(_tc); \
@@ -661,7 +661,7 @@ static inline void *tc_pool_first_chunk(struct talloc_pool_hdr *pool_hdr)
 	return tc_next_chunk(tc);
 }
 
-/* Mark the whole remaining pool as not accessable */
+/* Mark the whole remaining pool as not accessible */
 static inline void tc_invalidate_pool(struct talloc_pool_hdr *pool_hdr)
 {
 	size_t flen = tc_pool_space_left(pool_hdr);
diff --git a/lib/tdb/common/lock.c b/lib/tdb/common/lock.c
index c4e276f84d6..045ded95857 100644
--- a/lib/tdb/common/lock.c
+++ b/lib/tdb/common/lock.c
@@ -812,7 +812,7 @@ _PUBLIC_ int tdb_lockall_unmark(struct tdb_context *tdb)
 	return tdb_allrecord_unlock(tdb, F_WRLCK, true);
 }
 
-/* lock entire database with write lock - nonblocking varient */
+/* lock entire database with write lock - nonblocking variant */
 _PUBLIC_ int tdb_lockall_nonblock(struct tdb_context *tdb)
 {
 	int ret = tdb_allrecord_lock(tdb, F_WRLCK, TDB_LOCK_NOWAIT, false);
@@ -834,7 +834,7 @@ _PUBLIC_ int tdb_lockall_read(struct tdb_context *tdb)
 	return tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false);
 }
 
-/* lock entire database with read lock - nonblock varient */
+/* lock entire database with read lock - nonblock variant */
 _PUBLIC_ int tdb_lockall_read_nonblock(struct tdb_context *tdb)
 {
 	int ret = tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_NOWAIT, false);
diff --git a/lib/tdb/common/mutex.c b/lib/tdb/common/mutex.c
index 78926db0be8..a7106164445 100644
--- a/lib/tdb/common/mutex.c
+++ b/lib/tdb/common/mutex.c
@@ -454,7 +454,7 @@ int tdb_mutex_allrecord_upgrade(struct tdb_context *tdb)
 
 	/*
 	 * Our only caller tdb_allrecord_upgrade()
-	 * garantees that we already own the allrecord lock.
+	 * guarantees that we already own the allrecord lock.
 	 *
 	 * Which means m->allrecord_mutex is still locked by us.
 	 */
@@ -502,7 +502,7 @@ void tdb_mutex_allrecord_downgrade(struct tdb_context *tdb)
 
 	/*
 	 * Our only caller tdb_allrecord_upgrade() (in the error case)
-	 * garantees that we already own the allrecord lock.
+	 * guarantees that we already own the allrecord lock.
 	 *
 	 * Which means m->allrecord_mutex is still locked by us.
 	 */
@@ -531,7 +531,7 @@ int tdb_mutex_allrecord_unlock(struct tdb_context *tdb)
 	/*
 	 * Our only callers tdb_allrecord_unlock() and
 	 * tdb_allrecord_lock() (in the error path)
-	 * garantee that we already own the allrecord lock.
+	 * guarantee that we already own the allrecord lock.
 	 *
 	 * Which means m->allrecord_mutex is still locked by us.
 	 */
@@ -982,7 +982,7 @@ cleanup:
 	 * tdb_robust_mutex_pid to -1. This is ok as this code path is only
 	 * called once per process.
 	 *
-	 * Leaving our signal handler avoids races with other threads potentialy
+	 * Leaving our signal handler avoids races with other threads potentially
 	 * setting up their SIGCHLD handlers.
 	 *
 	 * The worst thing that can happen is that the other newer signal
diff --git a/lib/tdb/common/open.c b/lib/tdb/common/open.c
index f7f65b0e237..10233591dad 100644
--- a/lib/tdb/common/open.c
+++ b/lib/tdb/common/open.c
@@ -94,7 +94,7 @@ static int tdb_new_database(struct tdb_context *tdb, struct tdb_header *header,
 	}
 
 	/*
-	 * It's required for some following code pathes
+	 * It's required for some following code paths
 	 * to have the fields on 'tdb' up-to-date.
 	 *
 	 * E.g. tdb_mutex_size() requires it
@@ -826,7 +826,7 @@ _PUBLIC_ int tdb_close(struct tdb_context *tdb)
 	return ret;
 }
 
-/* register a loging function */
+/* register a logging function */
 _PUBLIC_ void tdb_set_logging_function(struct tdb_context *tdb,
                                        const struct tdb_logging_context *log_ctx)
 {
diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c
index 5ab38d0809f..78bbd7ad23e 100644
--- a/lib/tdb/common/transaction.c
+++ b/lib/tdb/common/transaction.c
@@ -68,7 +68,7 @@
     although once a transaction is started then an exclusive lock is
     gained until the transaction is committed or cancelled
 
-  - the commit stategy involves first saving away all modified data
+  - the commit strategy involves first saving away all modified data
     into a linearised buffer in the transaction recovery area, then
     marking the transaction recovery area with a magic value to
     indicate a valid recovery record. In total 4 fsync/msync calls are
diff --git a/lib/tdb/common/traverse.c b/lib/tdb/common/traverse.c
index d69e7dff285..fcd2e001be4 100644
--- a/lib/tdb/common/traverse.c
+++ b/lib/tdb/common/traverse.c
@@ -58,7 +58,7 @@ static tdb_off_t tdb_next_lock(struct tdb_context *tdb, struct tdb_traverse_lock
 			   that we have done at least one fcntl lock at the
 			   start of a search to guarantee that memory is
 			   coherent on SMP systems. If records are added by
-			   others during the search then thats OK, and we
+			   others during the search then that's OK, and we
 			   could possibly miss those with this trick, but we
 			   could miss them anyway without this trick, so the
 			   semantics don't change.
diff --git a/lib/tdb/docs/mutex.txt b/lib/tdb/docs/mutex.txt
index a5a75420c1d..0003c7f64be 100644
--- a/lib/tdb/docs/mutex.txt
+++ b/lib/tdb/docs/mutex.txt
@@ -15,7 +15,7 @@ with a fcntl lock.
 The external locking API of tdb also allows one to lock the complete database, and
 ctdb uses this facility to freeze databases during a recovery. While the
 so-called allrecord lock is held, all linked lists and all individual records
-are frozen alltogether. Tdb achieves this by locking the complete file range
+are frozen altogether. Tdb achieves this by locking the complete file range
 with a single fcntl lock. Individual 1-byte locks for the linked lists
 conflict with this. Access to records is prevented by the one large fnctl byte
 range lock.
@@ -73,7 +73,7 @@ The setpshared functions indicate to the kernel that the mutex is about to be
 shared between processes in a common shared memory area.
 
 The process shared posix mutexes have the potential to replace fcntl locking
-to coordinate mmap access for tdbs. However, they are missing the criticial
+to coordinate mmap access for tdbs. However, they are missing the critical
 auto-cleanup property that fcntl provides when a process dies. A process that
 dies hard while holding a shared mutex has no chance to clean up the protected
 data structures and unlock the shared mutex. Thus with a pure process shared
diff --git a/lib/tdb/test/lock-tracking.c b/lib/tdb/test/lock-tracking.c
index b2f092c0c4d..fb7706e9bcf 100644
--- a/lib/tdb/test/lock-tracking.c
+++ b/lib/tdb/test/lock-tracking.c
@@ -1,4 +1,4 @@
-/* We save the locks so we can reaquire them. */
+/* We save the locks so we can reacquire them. */
 #include "../common/tdb_private.h"
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/lib/tevent/doc/tevent_events.dox b/lib/tevent/doc/tevent_events.dox
index d56af25496c..94fed9c69c2 100644
--- a/lib/tevent/doc/tevent_events.dox
+++ b/lib/tevent/doc/tevent_events.dox
@@ -27,7 +27,7 @@ would be example, so examples describing all the types of events follow.
 This example shows how to set up an event which will be repeated for a minute
 with interval of 2 seconds (will be triggered 30 times). After exceeding this
 limit, the event loop will finish and all the memory resources will be freed.
-This is just example describing repeated activity, nothing usefull is done
+This is just example describing repeated activity, nothing useful is done
 within foo function
 
 @code
@@ -233,7 +233,7 @@ static void handler(struct tevent_context *ev,
                     void *private_data)
 {
 
-    // Do something usefull
+    // Do something useful
 
     printf("handling signal...\n");
     exit(EXIT_SUCCESS);
diff --git a/lib/tevent/doc/tevent_queue.dox b/lib/tevent/doc/tevent_queue.dox
index 9c247e5212a..c1d629c7488 100644
--- a/lib/tevent/doc/tevent_queue.dox
+++ b/lib/tevent/doc/tevent_queue.dox
@@ -231,9 +231,9 @@ int main (int argc, char **argv)
     tevent_queue_stop(fronta);
     tevent_queue_start(fronta);
     if (tevent_queue_running(fronta)) {
-        printf ("Queue is runnning (length: %d)\n", tevent_queue_length(fronta));
+        printf ("Queue is running (length: %d)\n", tevent_queue_length(fronta));
     } else {
-        printf ("Queue is not runnning\n");
+        printf ("Queue is not running\n");
     }
 
     data = talloc(ev, struct juststruct);
diff --git a/lib/tevent/doxy.config b/lib/tevent/doxy.config
index 76d8b4cb668..dbb40c567e8 100644
--- a/lib/tevent/doxy.config
+++ b/lib/tevent/doxy.config
@@ -930,7 +930,7 @@ HTML_STYLESHEET        =
 # user-defined cascading style sheet that is included after the standard
 # style sheets created by doxygen. Using this option one can overrule
 # certain style aspects. This is preferred over using HTML_STYLESHEET
-# since it does not replace the standard style sheet and is therefor more
+# since it does not replace the standard style sheet and is therefore more
 # robust against future updates. Doxygen will copy the style sheet file to
 # the output directory.
 
diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c
index 492b8807996..e7583e64059 100644
--- a/lib/tevent/testsuite.c
+++ b/lib/tevent/testsuite.c
@@ -1091,7 +1091,7 @@ static void test_free_wrapper_signal_handler(struct tevent_context *ev,
 	 * signal handlers have highest priority in tevent, so this signal
 	 * handler will always be started before the other handlers
 	 * below. Freeing the (wrapper) event context here tests that the
-	 * wrapper implementation correclty handles the wrapper ev going away
+	 * wrapper implementation correctly handles the wrapper ev going away
 	 * with pending events.
 	 */
 	talloc_free(ev);
diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c
index 698e467c88c..4142da78f60 100644
--- a/lib/tevent/tevent.c
+++ b/lib/tevent/tevent.c
@@ -518,7 +518,7 @@ void tevent_common_check_double_free(TALLOC_CTX *ptr, const char *reason)
 }
 
 /*
-  create a event_context structure for a specific implemementation.
+  create a event_context structure for a specific implementation.
   This must be the first events call, and all subsequent calls pass
   this event_context as the first element. Event handlers also
   receive this as their first argument.
diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
index 30391852885..ba564bc0195 100644
--- a/lib/tevent/tevent.h
+++ b/lib/tevent/tevent.h
@@ -2047,7 +2047,7 @@ pid_t tevent_cached_getpid(void);
  *
  * tevent_thread_call_depth_reset_from_req(struct tevent_req *req)
  *
- * If the call depth is used for trace indentation, it might be usefull to
+ * If the call depth is used for trace indentation, it might be useful to
  * reset the external variable to the call depth of currently processed tevent
  * request, since the ext. variable can be changed after return from a function
  * call that has created subrequests.
@@ -2062,7 +2062,7 @@ pid_t tevent_cached_getpid(void);
 
 /**
  * Activate call depth tracking and register external variable that will
- * be updated to the call epth of currenty processed tevent request.
+ * be updated to the call depth of currently processed tevent request.
  *
  * @param[in]  ptr   Address of external variable
  */
@@ -2820,7 +2820,7 @@ bool _tevent_context_push_use(struct tevent_context *ev,
  *
  * The wrapper event context might undo something like impersonation.
  *
- * This must be called after a succesful tevent_context_push_use().
+ * This must be called after a successful tevent_context_push_use().
  * Any ordering violation results in calling
  * the abort handler of the given tevent context.
  *
@@ -2872,7 +2872,7 @@ bool tevent_context_same_loop(struct tevent_context *ev1,
  * @defgroup tevent_compat The tevent compatibility functions
  * @ingroup tevent
  *
- * The following definitions are usueful only for compatibility with the
+ * The following definitions are useful only for compatibility with the
  * implementation originally developed within the samba4 code and will be
  * soon removed. Please NEVER use in new code.
  *
diff --git a/lib/tevent/tevent_threads.c b/lib/tevent/tevent_threads.c
index a89990f231a..5ba6029fee1 100644
--- a/lib/tevent/tevent_threads.c
+++ b/lib/tevent/tevent_threads.c
@@ -302,12 +302,12 @@ struct tevent_thread_proxy *tevent_thread_proxy_create(
  *
  * pp_im must be a pointer to an immediate event talloced on
  * a context owned by the calling thread, or the NULL context.
- * Ownership of *pp_im will be transfered to the tevent library.
+ * Ownership of *pp_im will be transferred to the tevent library.
  *
  * pp_private can be null, or contents of *pp_private must be
  * talloc'ed memory on a context owned by the calling thread
  * or the NULL context. If non-null, ownership of *pp_private will
- * be transfered to the tevent library.
+ * be transferred to the tevent library.
  *
  * If you want to return a message, have the destination use the
  * same function call to send back to the caller.
diff --git a/lib/tsocket/tsocket.h b/lib/tsocket/tsocket.h
index d3cde99bf5a..cf95d8bec34 100644
--- a/lib/tsocket/tsocket.h
+++ b/lib/tsocket/tsocket.h
@@ -93,7 +93,7 @@ struct iovec;
  *      ipv4:192.168.1.1:143
  *
  * Callers should not try to parse the string! The should use additional methods
- * of the specific tsocket_address implemention to get more details.
+ * of the specific tsocket_address implementation to get more details.
  *
  * @param[in]  addr     The address to convert.
  *
@@ -1251,7 +1251,7 @@ int tstream_readv_pdu_queue_recv(struct tevent_req *req, int *perrno);
  *
  * This function queues an iovector for sending to destination through an
  * existing stream socket. The async callback is triggered when the whole
- * vectror has been delivered to the underlying system socket.
+ * vector has been delivered to the underlying system socket.
  *
  * The caller needs to make sure that all non-scalar input parameters hang
  * around for the whole lifetime of the request.
diff --git a/lib/tsocket/tsocket_guide.txt b/lib/tsocket/tsocket_guide.txt
index 7c925d4f1db..1b560567001 100644
--- a/lib/tsocket/tsocket_guide.txt
+++ b/lib/tsocket/tsocket_guide.txt
@@ -246,7 +246,7 @@ abstracted socket.
 (Remember at the low level there is always only one IO in a specific
  direction allowed, only one tdgram_sendto_send() at a time).
 
-Some helpers that use 'tevent_queue' are avilable to simplify handling
+Some helpers that use 'tevent_queue' are available to simplify handling
 multiple IO requests. The functions just get a 'queue' argument and
 internally serialize all operations.
 
@@ -468,7 +468,7 @@ Virtual Sockets
 ===============
 
 The abstracted layout of tdgram_context and tstream_context
-allow implementations arround virtual sockets for encrypted tunnels
+allow implementations around virtual sockets for encrypted tunnels
 (like TLS, SASL or GSSAPI) or named pipes over smb.
 
 Named Pipe Auth (NPA) Sockets
diff --git a/lib/util/access.c b/lib/util/access.c
index f4b5ae79125..fd9912db873 100644
--- a/lib/util/access.c
+++ b/lib/util/access.c
@@ -309,7 +309,7 @@ static bool allow_access_internal(const char **deny_list,
 		return true;
 	}
 
-	/* if theres no deny list and no allow list then allow access */
+	/* if there's no deny list and no allow list then allow access */
 	if ((!deny_list || *deny_list == 0) &&
 	    (!allow_list || *allow_list == 0)) {


-- 
Samba Shared Repository



More information about the samba-cvs mailing list