From cfd68eaac48a29dec245dc6de03aae0d58698862 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sun, 21 Oct 2001 20:51:27 +0000
Subject: Ok, I know it's a language thing and it shouldn't matter.... but a
 kerberos name is a "principal", not a principle. English majors will complain
 :-). Jeremy. (This used to be commit
 b668d7d656cdd066820fb8044f24bcd4fda29524)

---
 source3/smbd/negprot.c   |  8 ++++----
 source3/smbd/sesssetup.c | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index dc19e2bdfb..ecc6e7ee51 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -166,7 +166,7 @@ static int negprot_spnego(char *p, uint8 cryptkey[8])
 	const char *OIDs[] = {OID_NTLMSSP,
 			      OID_KERBEROS5,
 			      NULL};
-	char *principle;
+	char *principal;
 	int len;
 
 	memset(guid, 0, 16);
@@ -175,9 +175,9 @@ static int negprot_spnego(char *p, uint8 cryptkey[8])
 
 	/* win2000 uses host$@REALM, which we will probably use eventually,
 	   but for now this works */
-	asprintf(&principle, "HOST/%s@%s", guid, lp_realm());
-	blob = spnego_gen_negTokenInit(guid, OIDs, principle);
-	free(principle);
+	asprintf(&principal, "HOST/%s@%s", guid, lp_realm());
+	blob = spnego_gen_negTokenInit(guid, OIDs, principal);
+	free(principal);
 
 	memcpy(p, blob.data, blob.length);
 	len = blob.length;
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 7f9a09c79b..003cb0dc3d 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -41,7 +41,7 @@ static int reply_spnego_kerberos(connection_struct *conn,
 	int ret;
 	char *realm, *client, *p;
 	fstring hostname;
-	char *principle;
+	char *principal;
 	extern pstring global_myname;
 	const struct passwd *pw;
 	char *user;
@@ -58,7 +58,7 @@ static int reply_spnego_kerberos(connection_struct *conn,
 
 	fstrcpy(hostname, global_myname);
 	strlower(hostname);
-	asprintf(&principle, "HOST/%s@%s", hostname, realm);
+	asprintf(&principal, "HOST/%s@%s", hostname, realm);
 	
 	ret = krb5_init_context(&context);
 	if (ret) {
@@ -66,14 +66,14 @@ static int reply_spnego_kerberos(connection_struct *conn,
 		return ERROR_NT(NT_STATUS_LOGON_FAILURE);
 	}
 
-	ret = krb5_parse_name(context, principle, &server);
+	ret = krb5_parse_name(context, principal, &server);
 	if (ret) {
 		DEBUG(1,("krb5_parse_name(%s) failed (%s)\n", 
-			 principle, error_message(ret)));
+			 principal, error_message(ret)));
 		return ERROR_NT(NT_STATUS_LOGON_FAILURE);
 	}
 
-	free(principle);
+	free(principal);
 
 	packet.length = ticket.length;
 	packet.data = (krb5_pointer)ticket.data;
@@ -96,7 +96,7 @@ static int reply_spnego_kerberos(connection_struct *conn,
 
 	p = strchr_m(client, '@');
 	if (!p) {
-		DEBUG(3,("Doesn't look like a valid principle\n"));
+		DEBUG(3,("Doesn't look like a valid principal\n"));
 		return ERROR_NT(NT_STATUS_LOGON_FAILURE);
 	}
 
-- 
cgit