summaryrefslogtreecommitdiff
path: root/source4/heimdal
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-06-08 15:20:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:08:59 -0500
commite3a6c6be79326578a1e9c7cb8547234eab62235f (patch)
tree44f75558da5995fb939ebac55cdf6b847c82159b /source4/heimdal
parent7613015f47f6e45ee9ac4f652f773bd2980fc788 (diff)
downloadsamba-e3a6c6be79326578a1e9c7cb8547234eab62235f.tar.gz
samba-e3a6c6be79326578a1e9c7cb8547234eab62235f.tar.bz2
samba-e3a6c6be79326578a1e9c7cb8547234eab62235f.zip
r16100: Patch from Michael Wood <mwood@icts.uct.ac.za>: s/then/than/ for correct grammar
(This used to be commit 26a2fa97e4c819e630bc9b50e11c8d5328c7b8c8)
Diffstat (limited to 'source4/heimdal')
-rwxr-xr-xsource4/heimdal/lib/gssapi/sequence.c4
-rw-r--r--source4/heimdal/lib/krb5/crypto.c2
-rw-r--r--source4/heimdal/lib/krb5/get_for_creds.c2
-rwxr-xr-xsource4/heimdal/lib/krb5/heim_threads.h2
-rw-r--r--source4/heimdal/lib/krb5/init_creds_pw.c4
-rw-r--r--source4/heimdal/lib/krb5/ticket.c2
6 files changed, 8 insertions, 8 deletions
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;
}