r16100: Patch from Michael Wood <mwood@icts.uct.ac.za>: s/then/than/ for correct grammar

(This used to be commit 26a2fa97e4c819e630bc9b50e11c8d5328c7b8c8)

23 files changed, 31 insertions, 31 deletions

diff --git a/source4/auth/ntlmssp/ntlmssp_sign.c b/source4/auth/ntlmssp/ntlmssp_sign.c
index 0999a85a31..2e23802519 100644
--- a/source4/auth/ntlmssp/ntlmssp_sign.c
+++ b/source4/auth/ntlmssp/ntlmssp_sign.c
@@ -32,7 +32,7 @@
 #define SRV_SEAL "session key to server-to-client sealing key magic constant"
 
 /**
- * Some notes on then NTLM2 code:
+ * Some notes on the NTLM2 code:
  *
  * NTLM2 is a AEAD system.  This means that the data encrypted is not
  * all the data that is signed.  In DCE-RPC case, the headers of the
diff --git a/source4/heimdal/lib/gssapi/sequence.c b/source4/heimdal/lib/gssapi/sequence.c
index 2851b0a6c8..35a9b924af 100755
--- a/source4/heimdal/lib/gssapi/sequence.c
+++ b/source4/heimdal/lib/gssapi/sequence.c
@@ -159,8 +159,8 @@ _gssapi_msg_order_check(struct gss_msg_order *o, OM_uint32 seq_num)
 
     r = (o->flags & (GSS_C_REPLAY_FLAG|GSS_C_SEQUENCE_FLAG))==GSS_C_REPLAY_FLAG;
 
-    /* sequence number larger then largest sequence number 
-     * or smaller then the first sequence number */
+    /* sequence number larger than largest sequence number 
+     * or smaller than the first sequence number */
     if (seq_num > o->elem[0]
 	|| seq_num < o->first_seq
 	|| o->length == 0) 
diff --git a/source4/heimdal/lib/krb5/crypto.c b/source4/heimdal/lib/krb5/crypto.c
index 876cbb5192..a3c58051f9 100644
--- a/source4/heimdal/lib/krb5/crypto.c
+++ b/source4/heimdal/lib/krb5/crypto.c
@@ -2299,7 +2299,7 @@ _krb5_aes_cts_encrypt(const unsigned char *in, unsigned char *out,
 
     /*
      * In the framework of kerberos, the length can never be shorter
-     * then at least one blocksize.
+     * than at least one blocksize.
      */
 
     if (encryptp) {
diff --git a/source4/heimdal/lib/krb5/get_for_creds.c b/source4/heimdal/lib/krb5/get_for_creds.c
index 661d05663b..f042cdb573 100644
--- a/source4/heimdal/lib/krb5/get_for_creds.c
+++ b/source4/heimdal/lib/krb5/get_for_creds.c
@@ -376,7 +376,7 @@ krb5_get_forwarded_creds (krb5_context	    context,
 	cred.enc_part.cipher.length = buf_size;
     } else {
 	/* 
-	 * Here older versions then 0.7.2 of Heimdal used the local or
+	 * Here older versions than 0.7.2 of Heimdal used the local or
 	 * remote subkey. That is wrong, the session key should be
 	 * used. Heimdal 0.7.2 and newer have code to try both in the
 	 * receiving end.
diff --git a/source4/heimdal/lib/krb5/heim_threads.h b/source4/heimdal/lib/krb5/heim_threads.h
index 3ebe66beee..41f0f83306 100755
--- a/source4/heimdal/lib/krb5/heim_threads.h
+++ b/source4/heimdal/lib/krb5/heim_threads.h
@@ -53,7 +53,7 @@
 /* 
  * NetBSD have a thread lib that we can use that part of libc that
  * works regardless if application are linked to pthreads or not.
- * NetBSD newer then 2.99.11 just use pthread.h, and the same thing
+ * NetBSD newer than 2.99.11 just use pthread.h, and the same thing
  * will happen.
  */
 #include <threadlib.h>
diff --git a/source4/heimdal/lib/krb5/init_creds_pw.c b/source4/heimdal/lib/krb5/init_creds_pw.c
index 70b6c3e4c3..c05386ec23 100644
--- a/source4/heimdal/lib/krb5/init_creds_pw.c
+++ b/source4/heimdal/lib/krb5/init_creds_pw.c
@@ -1211,7 +1211,7 @@ init_cred_loop(krb5_context context,
     ctx->pk_nonce = ctx->nonce;
 
     /*
-     * Increase counter when we want other pre-auth types then
+     * Increase counter when we want other pre-auth types than
      * KRB5_PA_ENC_TIMESTAMP.
      */
 #define MAX_PA_COUNTER 3 
@@ -1391,7 +1391,7 @@ krb5_get_init_creds(krb5_context context,
 	case KRB5KDC_ERR_KEY_EXPIRED :
 	    /* try to avoid recursion */
 
-	    /* don't try to change password where then where none */
+	    /* don't try to change password where there where none */
 	    if (prompter == NULL || ctx.password == NULL)
 		goto out;
 
diff --git a/source4/heimdal/lib/krb5/ticket.c b/source4/heimdal/lib/krb5/ticket.c
index b3efeb39d3..99cb778722 100644
--- a/source4/heimdal/lib/krb5/ticket.c
+++ b/source4/heimdal/lib/krb5/ticket.c
@@ -112,7 +112,7 @@ find_type_in_ad(krb5_context context,
 
     if (level > 9) {
 	krb5_set_error_string(context, "Authorization data nested deeper "
-			      "then %d levels, stop searching", level);
+			      "than %d levels, stop searching", level);
 	ret = ENOENT; /* XXX */
 	goto out;
     }
diff --git a/source4/intl/linux-msg.sed b/source4/intl/linux-msg.sed
index 5918e720a9..403b3ad455 100644
--- a/source4/intl/linux-msg.sed
+++ b/source4/intl/linux-msg.sed
@@ -68,7 +68,7 @@ $set 1 # Automatically created by po2msg.sed
   s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p
 }
 #
-# The .msg file contains, other then the .po file, only the translations
+# The .msg file contains, other than the .po file, only the translations
 # but each given a unique ID.  Starting from 1 and incrementing by 1 for
 # each message we assign them to the messages.
 # It is important that the .po file used to generate the cat-id-tbl.c file
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 */
diff --git a/source4/libcli/dgram/mailslot.c b/source4/libcli/dgram/mailslot.c
index 775f662370..c59cab79da 100644
--- a/source4/libcli/dgram/mailslot.c
+++ b/source4/libcli/dgram/mailslot.c
@@ -22,10 +22,10 @@
 
 /*
    This implements "Class 2 mailslots", i.e. the communication mechanism 
-   used for all mailslot packets smaller then 425 bytes. 
+   used for all mailslot packets smaller than 425 bytes. 
 
    "Class 1 mailslots" (which use SMB) are used for messages larger 
-   then 426 bytes and are supported on some systems. These are not implemented
+   than 426 bytes and are supported on some systems. These are not implemented
    in Samba4 yet, as there don't appear to be any core services that use
    them.
 
diff --git a/source4/librpc/idl/oxidresolver.idl b/source4/librpc/idl/oxidresolver.idl
index 835b848a45..beeb6a7f4f 100644
--- a/source4/librpc/idl/oxidresolver.idl
+++ b/source4/librpc/idl/oxidresolver.idl
@@ -65,7 +65,7 @@ interface IOXIDResolver
 
 	/* In some cases the client maybe unsure that a particular */
 	/* binding will reach the server. (For example, when the oxid */
-	/* bindings have more then one TCP/IP binding) This call */
+	/* bindings have more than one TCP/IP binding) This call */
 	/* can be used to validate the binding */
 	/* from the client. */
 	[idempotent] WERROR ServerAlive ();
diff --git a/source4/pidl/TODO b/source4/pidl/TODO
index c7ae61a890..bfbf5afc54 100644
--- a/source4/pidl/TODO
+++ b/source4/pidl/TODO
@@ -15,4 +15,4 @@
 
 - allow data structures outside of interfaces
 
-- mem_ctx in the interface rather then as struct ndr member.
+- mem_ctx in the interface rather than as struct ndr member.
diff --git a/source4/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm b/source4/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
index 02319a0aa9..e7f2922c7f 100644
--- a/source4/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
+++ b/source4/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
@@ -49,7 +49,7 @@ Generate a custom header field with specified properties.
 Force the use of new_hf_name when the parser generator was going to 
 use old_hf_name.
 
-This can be used in conjunction with HF_FIELD in order to make more then 
+This can be used in conjunction with HF_FIELD in order to make more than 
 one element use the same filter name.
 
 =item I<STRIP_PREFIX> prefix
@@ -78,7 +78,7 @@ Override the text shown when a bitmap boolean value is enabled or disabled.
 
 Force pidl to not generate a particular function but allow the user 
 to write a function manually. This can be used to remove the function 
-for only one level for a particular element rather then all the functions and 
+for only one level for a particular element rather than all the functions and 
 ett/hf variables for a particular element as the NOEMIT command does.
 
 =back
diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm
index a6b4b38cdf..57fa3867f7 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba3/Parser.pm
@@ -35,7 +35,7 @@ sub Align($$)
 {
 	my ($a,$b) = @_;
 
-	# Only align if previous element was smaller then current one
+	# Only align if previous element was smaller than current one
 	if ($$a < $b) {
 		pidl "if (!prs_align_custom(ps, $b))";
 		pidl "\treturn False;";
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 77482685b7..912c4b74f9 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -836,7 +836,7 @@ sub ParseDataPush($$$$$)
 {
 	my ($e,$l,$ndr,$var_name,$ndr_flags) = @_;
 
-	# strings are passed by value rather then reference
+	# strings are passed by value rather than reference
 	if (not Parse::Pidl::Typelist::is_scalar($l->{DATA_TYPE}) or Parse::Pidl::Typelist::scalar_is_reference($l->{DATA_TYPE})) {
 		$var_name = get_pointer_to($var_name);
 	}
@@ -2101,7 +2101,7 @@ sub ParseFunctionPull($)
 	}
 
 	# allocate the "simple" out ref variables. FIXME: Shouldn't this have it's
-	# own flag rather then be in NDR_IN ?
+	# own flag rather than be in NDR_IN ?
 
 	foreach my $e (@{$fn->{ELEMENTS}}) {
 		next unless (grep(/out/, @{$e->{DIRECTION}}));
diff --git a/source4/pidl/pidl b/source4/pidl/pidl
index a7838791b5..6b64541156 100755
--- a/source4/pidl/pidl
+++ b/source4/pidl/pidl
@@ -61,7 +61,7 @@ directory.
 =item I<--parse-idl-tree>
 
 Read internal tree structure from input files rather 
-then assuming they contain IDL.
+than assuming they contain IDL.
 
 =item I<--dump-idl>
 
@@ -101,7 +101,7 @@ packet-dcerpc-OUTNAME.h.
 	
 Pidl will read additional data from an ethereal conformance file if present. 
 Such a file should have the same location as the IDL file but with the 
-extension I<cnf> rather then I<idl>. See L<Parse::Pidl::Ethereal::Conformance>
+extension I<cnf> rather than I<idl>. See L<Parse::Pidl::Ethereal::Conformance>
 for details on the format of this file.
 
 =item I<--diff>
diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 688471c332..f32c4bb9bf 100644
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -320,7 +320,7 @@ NTSTATUS wreplsrv_add_table(struct wreplsrv_service *service,
 
 	/* the min_version is always 0 here, and won't be updated */
 
-	/* if the given version is higher the then current nax_version, update */
+	/* if the given version is higher than the current max_version, update */
 	if (cur->owner.max_version < version) {
 		cur->owner.max_version = version;
 		/* if it's for our local db, we need to update the wins.ldb too */