11 files changed, 11 insertions, 11 deletions
diff --git a/source4/lib/ldb-samba/ldif_handlers.c b/source4/lib/ldb-samba/ldif_handlers.c
index a3400dd774..effec46fda 100644
--- a/source4/lib/ldb-samba/ldif_handlers.c
+++ b/source4/lib/ldb-samba/ldif_handlers.c
@@ -533,7 +533,7 @@ static int ldif_read_prefixMap(struct ldb_context *ldb, void *mem_ctx,
 				p[0] = '\0';
 			}
 		}
-		/* allow a traling seperator */
+		/* allow a trailing separator */
 		if (line == p) {
 			break;
 		}
diff --git a/source4/lib/ldb/common/ldb_ldif.c b/source4/lib/ldb/common/ldb_ldif.c
index 888761e67b..819caa79d3 100644
--- a/source4/lib/ldb/common/ldb_ldif.c
+++ b/source4/lib/ldb/common/ldb_ldif.c
@@ -510,7 +510,7 @@ static int next_attr(void *mem_ctx, char **s, const char **attr, struct ldb_val
 	if (binary_file) {
 		int len = ldb_read_data_file(mem_ctx, value);
 		if (len == -1) {
-			/* an error occured hile trying to retrieve the file */
+			/* an error occurred while trying to retrieve the file */
 			return -1;
 		}
 	}
diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 3b8934702a..4cf5dc87d1 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -795,7 +795,7 @@ int ldb_module_send_referral(struct ldb_request *req,
  * 	req:   the original request passed to your module
  * 	ctrls: controls to send in the reply (must be a talloc pointer, steal)
  * 	response: results for extended request (steal)
- * 	error: LDB_SUCCESS for a succesful return
+ * 	error: LDB_SUCCESS for a successful return
  * 	       any other ldb error otherwise
  */
 int ldb_module_done(struct ldb_request *req,
diff --git a/source4/lib/ldb/common/ldb_msg.c b/source4/lib/ldb/common/ldb_msg.c
index f4adb560b1..3c5b64e7b3 100644
--- a/source4/lib/ldb/common/ldb_msg.c
+++ b/source4/lib/ldb/common/ldb_msg.c
@@ -237,7 +237,7 @@ int ldb_msg_add_string(struct ldb_message *msg,
 	val.length = strlen(str);
 
 	if (val.length == 0) {
-		/* allow empty strings as non-existant attributes */
+		/* allow empty strings as non-existent attributes */
 		return LDB_SUCCESS;
 	}
 
diff --git a/source4/lib/ldb/common/ldb_parse.c b/source4/lib/ldb/common/ldb_parse.c
index ba16b57da3..75cc6e74d0 100644
--- a/source4/lib/ldb/common/ldb_parse.c
+++ b/source4/lib/ldb/common/ldb_parse.c
@@ -773,7 +773,7 @@ char *ldb_filter_from_tree(void *mem_ctx, struct ldb_parse_tree *tree)
 
 
 /*
-  replace any occurances of an attribute name in the parse tree with a
+  replace any occurrences of an attribute name in the parse tree with a
   new name
 */
 void ldb_parse_tree_attr_replace(struct ldb_parse_tree *tree, 
diff --git a/source4/lib/ldb/include/ldb_errors.h b/source4/lib/ldb/include/ldb_errors.h
index 706d82732d..b247fbe09c 100644
--- a/source4/lib/ldb/include/ldb_errors.h
+++ b/source4/lib/ldb/include/ldb_errors.h
@@ -197,7 +197,7 @@
 #define LDB_ERR_NO_SUCH_OBJECT			32
 
 /**
-   The function referred to an alias which points to a non-existant
+   The function referred to an alias which points to a non-existent
    object in the database.
 */
 #define LDB_ERR_ALIAS_PROBLEM			33
diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
index b731f6570b..3110008c9f 100644
--- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
@@ -35,7 +35,7 @@
  *
  *  Modifications:
  *
- *  - description: make the module use asyncronous calls
+ *  - description: make the module use asynchronous calls
  *    date: Feb 2006
  *    author: Simo Sorce
  */
diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
index 0d75491e91..4e88cc487b 100644
--- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c
+++ b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
@@ -33,7 +33,7 @@
  *
  *  Modifications:
  *
- *  - description: make the module use asyncronous calls
+ *  - description: make the module use asynchronous calls
  *    date: Feb 2006
  *    author: Simo Sorce
  */
diff --git a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
index f07b330a8b..c8996467f3 100644
--- a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
+++ b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
@@ -557,7 +557,7 @@ query_int(const struct lsqlite3_private * lsqlite3,
 }
 
 /*
- * This is a bad hack to support ldap style comparisons whithin sqlite.
+ * This is a bad hack to support ldap style comparisons within sqlite.
  * val is the attribute in the row currently under test
  * func is the desired test "<=" ">=" "~" ":"
  * cmp is the value to compare against (eg: "test")
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index bad0928c23..fc9a949a41 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -36,7 +36,7 @@
  *
  *  Modifications:
  *
- *  - description: make the module use asyncronous calls
+ *  - description: make the module use asynchronous calls
  *    date: Feb 2006
  *    Author: Simo Sorce
  *
diff --git a/source4/lib/ldb/modules/paged_searches.c b/source4/lib/ldb/modules/paged_searches.c
index c5430eb9bf..09786c3eaa 100644
--- a/source4/lib/ldb/modules/paged_searches.c
+++ b/source4/lib/ldb/modules/paged_searches.c
@@ -78,7 +78,7 @@ static int check_ps_continuation(struct ps_context *ac, struct ldb_request *req,
 			ldb_set_errstring(ldb, "paged_searches:  ERROR: We got back a control from a previous page, but this time no control was returned!");
 			return LDB_ERR_OPERATIONS_ERROR;
 		} else {
-			/* No cookie recived yet, valid to just return the full data set */
+			/* No cookie received yet, valid to just return the full data set */
 
 			/* we are done */
 			ac->pending = false;