summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-07-19 16:45:16 -0700
committerJeremy Allison <jra@samba.org>2010-07-19 16:45:16 -0700
commit8cba4a0c9639c48ec2433a98529bd8352e9d06c9 (patch)
tree9cf2522fea2214e8cc11f23d5a4e904b7202357d /source3/libsmb
parent625a51138916473eacc1447b11ffd93db0832077 (diff)
downloadsamba-8cba4a0c9639c48ec2433a98529bd8352e9d06c9.tar.gz
samba-8cba4a0c9639c48ec2433a98529bd8352e9d06c9.tar.bz2
samba-8cba4a0c9639c48ec2433a98529bd8352e9d06c9.zip
Move the addition of the 16 byte guid out of spnego_gen_negTokenInit() and
into negprot_spnego() where it belongs (it's not an SPNEGO operation). Add a TALLOC_CTX for callers of negprot_spnego(). Closer to unifying all the gen_negTokenXXX calls. Jeremy.
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/clispnego.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index 1f2081cb03..2cf276485e 100644
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -24,11 +24,10 @@
#include "smb_krb5.h"
/*
- generate a negTokenInit packet given a GUID, a list of supported
+ generate a negTokenInit packet given a list of supported
OIDs (the mechanisms) and a principal name string
*/
-DATA_BLOB spnego_gen_negTokenInit(char guid[16],
- const char *OIDs[],
+DATA_BLOB spnego_gen_negTokenInit(const char *OIDs[],
const char *principal)
{
int i;
@@ -40,7 +39,6 @@ DATA_BLOB spnego_gen_negTokenInit(char guid[16],
return data_blob_null;
}
- asn1_write(data, guid, 16);
asn1_push_tag(data,ASN1_APPLICATION(0));
asn1_write_OID(data,OID_SPNEGO);
asn1_push_tag(data,ASN1_CONTEXT(0));