summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-07-19 17:14:26 -0700
committerJeremy Allison <jra@samba.org>2010-07-19 17:14:26 -0700
commit0bb8d133c9a39873828dbe977513edd31e1a7045 (patch)
treeeddb973ad82ecc975ec344b390c70bcc0b31d2e8 /source3/smbd
parent8cba4a0c9639c48ec2433a98529bd8352e9d06c9 (diff)
downloadsamba-0bb8d133c9a39873828dbe977513edd31e1a7045.tar.gz
samba-0bb8d133c9a39873828dbe977513edd31e1a7045.tar.bz2
samba-0bb8d133c9a39873828dbe977513edd31e1a7045.zip
Remove gen_negTokenInit() - change all callers to spnego_gen_negTokenInit().
We now have one function to do this in all calling code. More rationalization to follow. Jeremy.
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/negprot.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index e7cf5b7591..c5c83cac30 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -189,7 +189,7 @@ DATA_BLOB negprot_spnego(TALLOC_CTX *ctx, struct smbd_server_connection *sconn)
OID_KERBEROS5_OLD,
OID_NTLMSSP,
NULL};
- const char *OIDs_plain[] = {OID_NTLMSSP, NULL};
+ const char *OIDs_ntlm[] = {OID_NTLMSSP, NULL};
sconn->smb1.negprot.spnego = true;
/* strangely enough, NT does not sent the single OID NTLMSSP when
@@ -211,7 +211,7 @@ DATA_BLOB negprot_spnego(TALLOC_CTX *ctx, struct smbd_server_connection *sconn)
blob = data_blob(guid, 16);
#else
/* Code for standalone WXP client */
- blob = spnego_gen_negTokenInit(OIDs_plain, "NONE");
+ blob = spnego_gen_negTokenInit(OIDs_ntlm, NULL, "NONE");
#endif
} else {
fstring myname;
@@ -222,7 +222,7 @@ DATA_BLOB negprot_spnego(TALLOC_CTX *ctx, struct smbd_server_connection *sconn)
== -1) {
return data_blob_null;
}
- blob = spnego_gen_negTokenInit(OIDs_krb5, host_princ_s);
+ blob = spnego_gen_negTokenInit(OIDs_krb5, NULL, host_princ_s);
SAFE_FREE(host_princ_s);
}