summaryrefslogtreecommitdiff
path: root/source3/libsmb/cliconnect.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-10-21 20:51:27 +0000
committerJeremy Allison <jra@samba.org>2001-10-21 20:51:27 +0000
commitcfd68eaac48a29dec245dc6de03aae0d58698862 (patch)
tree116b33a2a7428a4d92fcc875c3536dface88536f /source3/libsmb/cliconnect.c
parente68daea2bd6e05b2faf8e61e478a876f49cd77ee (diff)
downloadsamba-cfd68eaac48a29dec245dc6de03aae0d58698862.tar.gz
samba-cfd68eaac48a29dec245dc6de03aae0d58698862.tar.bz2
samba-cfd68eaac48a29dec245dc6de03aae0d58698862.zip
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)
Diffstat (limited to 'source3/libsmb/cliconnect.c')
-rw-r--r--source3/libsmb/cliconnect.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 11825ab036..dc8c7c2957 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -383,14 +383,14 @@ static DATA_BLOB cli_session_setup_blob(struct cli_state *cli, DATA_BLOB blob)
/****************************************************************************
do a spnego/kerberos encrypted session setup
****************************************************************************/
-static BOOL cli_session_setup_kerberos(struct cli_state *cli, char *principle, char *workgroup)
+static BOOL cli_session_setup_kerberos(struct cli_state *cli, char *principal, char *workgroup)
{
DATA_BLOB blob2, negTokenTarg;
d_printf("Doing kerberos session setup\n");
/* generate the encapsulated kerberos5 ticket */
- negTokenTarg = spnego_gen_negTokenTarg(cli, principle);
+ negTokenTarg = spnego_gen_negTokenTarg(cli, principal);
if (!negTokenTarg.data) return False;
@@ -505,7 +505,7 @@ do a spnego encrypted session setup
static BOOL cli_session_setup_spnego(struct cli_state *cli, char *user,
char *pass, char *workgroup)
{
- char *principle;
+ char *principal;
char *OIDs[ASN1_MAX_OIDS];
uint8 guid[16];
int i;
@@ -525,7 +525,7 @@ static BOOL cli_session_setup_spnego(struct cli_state *cli, char *user,
/* the server sent us the first part of the SPNEGO exchange in the negprot
reply */
- if (!spnego_parse_negTokenInit(cli->secblob, guid, OIDs, &principle)) {
+ if (!spnego_parse_negTokenInit(cli->secblob, guid, OIDs, &principal)) {
return False;
}
@@ -538,17 +538,17 @@ static BOOL cli_session_setup_spnego(struct cli_state *cli, char *user,
}
free(OIDs[i]);
}
- DEBUG(3,("got principle=%s\n", principle));
+ DEBUG(3,("got principal=%s\n", principal));
fstrcpy(cli->user_name, user);
#if HAVE_KRB5
if (got_kerberos_mechanism && cli->use_kerberos) {
- return cli_session_setup_kerberos(cli, principle, workgroup);
+ return cli_session_setup_kerberos(cli, principal, workgroup);
}
#endif
- free(principle);
+ free(principal);
ntlmssp: