diff options
| author | Jeremy Allison <jra@samba.org> | 2010-07-20 14:59:31 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-07-20 14:59:31 -0700 |
| commit | cce19c51625e2d73a541bbdfcc549f5a63c26abe (patch) | |
| tree | 1803424149e5593829e67650202db5c0e5ef4361 /source3/libsmb/clispnego.c | |
| parent | 4ed9437b7e24365b9acd179b6553793db95a4c54 (diff) | |
| download | samba-cce19c51625e2d73a541bbdfcc549f5a63c26abe.tar.gz samba-cce19c51625e2d73a541bbdfcc549f5a63c26abe.tar.bz2 samba-cce19c51625e2d73a541bbdfcc549f5a63c26abe.zip | |
Fix one more data_blob -> data_blob_talloc. Move away from implicit NULL context tallocs.
Jeremy.
Diffstat (limited to 'source3/libsmb/clispnego.c')
| -rw-r--r-- | source3/libsmb/clispnego.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c index 0935041a34..d5867120ea 100644 --- a/source3/libsmb/clispnego.c +++ b/source3/libsmb/clispnego.c @@ -29,7 +29,8 @@ OIDs (the mechanisms) a blob, and a principal name string */ -DATA_BLOB spnego_gen_negTokenInit(const char *OIDs[], +DATA_BLOB spnego_gen_negTokenInit(TALLOC_CTX *ctx, + const char *OIDs[], DATA_BLOB *psecblob, const char *principal) { @@ -81,7 +82,7 @@ DATA_BLOB spnego_gen_negTokenInit(const char *OIDs[], DEBUG(1,("Failed to build negTokenInit at offset %d\n", (int)data->ofs)); } - ret = data_blob(data->data, data->length); + ret = data_blob_talloc(ctx, data->data, data->length); asn1_free(data); return ret; @@ -289,8 +290,9 @@ bool spnego_parse_krb5_wrap(DATA_BLOB blob, DATA_BLOB *ticket, uint8 tok_id[2]) generate a SPNEGO krb5 negTokenInit packet, ready for a EXTENDED_SECURITY kerberos session setup */ -int spnego_gen_krb5_negTokenInit(const char *principal, int time_offset, - DATA_BLOB *targ, +int spnego_gen_krb5_negTokenInit(TALLOC_CTX *ctx, + const char *principal, int time_offset, + DATA_BLOB *targ, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts, time_t *expire_time) { @@ -310,7 +312,7 @@ int spnego_gen_krb5_negTokenInit(const char *principal, int time_offset, tkt_wrapped = spnego_gen_krb5_wrap(tkt, TOK_ID_KRB_AP_REQ); /* and wrap that in a shiny SPNEGO wrapper */ - *targ = spnego_gen_negTokenInit(krb_mechs, &tkt_wrapped, NULL); + *targ = spnego_gen_negTokenInit(ctx, krb_mechs, &tkt_wrapped, NULL); data_blob_free(&tkt_wrapped); data_blob_free(&tkt); |