summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/ldb/common/ldb_dn.c2
-rw-r--r--source4/lib/ldb/modules/ldb_map.h4
-rw-r--r--source4/lib/popt/popthelp.c2
-rw-r--r--source4/lib/registry/TODO2
-rw-r--r--source4/lib/registry/man/regtree.1.xml2
-rw-r--r--source4/lib/registry/reg_backend_nt4.c2
-rw-r--r--source4/lib/registry/registry.h4
7 files changed, 9 insertions, 9 deletions
diff --git a/source4/lib/ldb/common/ldb_dn.c b/source4/lib/ldb/common/ldb_dn.c
index b90d3d8c9b..a659f676c6 100644
--- a/source4/lib/ldb/common/ldb_dn.c
+++ b/source4/lib/ldb/common/ldb_dn.c
@@ -672,7 +672,7 @@ static struct ldb_dn_component ldb_dn_copy_component(void *mem_ctx, struct ldb_d
/* copy specified number of elements of a dn into a new one
element are copied from top level up to the unique rdn
- num_el may be greater then dn->comp_num (see ldb_dn_make_child)
+ num_el may be greater than dn->comp_num (see ldb_dn_make_child)
*/
struct ldb_dn *ldb_dn_copy_partial(void *mem_ctx, const struct ldb_dn *dn, int num_el)
{
diff --git a/source4/lib/ldb/modules/ldb_map.h b/source4/lib/ldb/modules/ldb_map.h
index 42eba23aa6..36165a260b 100644
--- a/source4/lib/ldb/modules/ldb_map.h
+++ b/source4/lib/ldb/modules/ldb_map.h
@@ -34,9 +34,9 @@
* that any upper layers will use.
*
* All local attributes will have to have a definition. Not all remote
- * attributes need a definition as LDB is a lot less stricter then LDAP
+ * attributes need a definition as LDB is a lot less strict than LDAP
* (in other words, sending unknown attributes to an LDAP server hurts us,
- * returning too much attributes in ldb_search() doesn't)
+ * while returning too many attributes in ldb_search() doesn't)
*/
struct ldb_map_context;
diff --git a/source4/lib/popt/popthelp.c b/source4/lib/popt/popthelp.c
index 4d8f0efc24..7ae3de7fb5 100644
--- a/source4/lib/popt/popthelp.c
+++ b/source4/lib/popt/popthelp.c
@@ -678,7 +678,7 @@ static int showShortOptions(const struct poptOption * opt, FILE * fp,
/*@globals fileSystem @*/
/*@modifies *str, *fp, fileSystem @*/
{
- char * s = alloca(300); /* larger then the ascii set */
+ char * s = alloca(300); /* larger than the ascii set */
s[0] = '\0';
/*@-branchstate@*/ /* FIX: W2DO? */
diff --git a/source4/lib/registry/TODO b/source4/lib/registry/TODO
index 518edf6795..562ed5657e 100644
--- a/source4/lib/registry/TODO
+++ b/source4/lib/registry/TODO
@@ -29,6 +29,6 @@ gregedit.c:
- support for adding/deleting keys
- support for security descriptors
-- pass parsed paths around rather then strings (i.e. just a list of strings)
+- pass parsed paths around rather than strings (i.e. just a list of strings)
- integrate various registry tools ?
- finish new patchfile code
diff --git a/source4/lib/registry/man/regtree.1.xml b/source4/lib/registry/man/regtree.1.xml
index 98e58070d1..aa31855a2b 100644
--- a/source4/lib/registry/man/regtree.1.xml
+++ b/source4/lib/registry/man/regtree.1.xml
@@ -30,7 +30,7 @@
<para>The regtree utility prints out all the contents of a
Windows registry file. Subkeys are printed with one level
- more indentation then their parents. </para>
+ more indentation than their parents. </para>
</refsect1>
diff --git a/source4/lib/registry/reg_backend_nt4.c b/source4/lib/registry/reg_backend_nt4.c
index d1d19f904b..a9759b8e68 100644
--- a/source4/lib/registry/reg_backend_nt4.c
+++ b/source4/lib/registry/reg_backend_nt4.c
@@ -463,7 +463,7 @@ static WERROR regf_get_value (TALLOC_CTX *ctx, const struct registry_key *key, i
}
if ((*ret)->data.length < vk->data_length) {
- DEBUG(1, ("Read data less then indicated data length!\n"));
+ DEBUG(1, ("Read data less than indicated data length!\n"));
}
return WERR_OK;
diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h
index 80b412a314..6b3675b0ee 100644
--- a/source4/lib/registry/registry.h
+++ b/source4/lib/registry/registry.h
@@ -103,11 +103,11 @@ struct hive_operations {
WERROR (*num_values) (const struct registry_key *, uint32_t *count);
WERROR (*get_subkey_by_index) (TALLOC_CTX *, const struct registry_key *, int idx, struct registry_key **);
- /* Can not contain more then one level */
+ /* Can not contain more than one level */
WERROR (*get_subkey_by_name) (TALLOC_CTX *, const struct registry_key *, const char *name, struct registry_key **);
WERROR (*get_value_by_index) (TALLOC_CTX *, const struct registry_key *, int idx, struct registry_value **);
- /* Can not contain more then one level */
+ /* Can not contain more than one level */
WERROR (*get_value_by_name) (TALLOC_CTX *, const struct registry_key *, const char *name, struct registry_value **);
/* Security control */