From 9539aaabb795de8de63dca1a1a18c011174c3fda Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Fri, 26 Mar 2010 14:28:43 -0700 Subject: [PATCH] s3 ntlm_auth: Don't malloc data that will be talloc_free()d This fixes bug #7290 Thanks to Mohan for the bug report. --- source3/utils/ntlm_auth.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index 70c1d05..f84f1fd 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -1082,18 +1082,18 @@ static void offer_gss_spnego_mechs(void) { /* Server negTokenInit (mech offerings) */ spnego.type = SPNEGO_NEG_TOKEN_INIT; - spnego.negTokenInit.mechTypes = SMB_XMALLOC_ARRAY(const char *, 2); + spnego.negTokenInit.mechTypes = talloc_array(ctx, const char *, 2); #ifdef HAVE_KRB5 - spnego.negTokenInit.mechTypes[0] = smb_xstrdup(OID_KERBEROS5_OLD); - spnego.negTokenInit.mechTypes[1] = smb_xstrdup(OID_NTLMSSP); + spnego.negTokenInit.mechTypes[0] = talloc_strdup(ctx, OID_KERBEROS5_OLD); + spnego.negTokenInit.mechTypes[1] = talloc_strdup(ctx, OID_NTLMSSP); spnego.negTokenInit.mechTypes[2] = NULL; #else - spnego.negTokenInit.mechTypes[0] = smb_xstrdup(OID_NTLMSSP); + spnego.negTokenInit.mechTypes[0] = talloc_strdup(ctx, OID_NTLMSSP); spnego.negTokenInit.mechTypes[1] = NULL; #endif - spnego.negTokenInit.mechListMIC = data_blob(principal, + spnego.negTokenInit.mechListMIC = data_blob_talloc(ctx, principal, strlen(principal)); len = write_spnego_data(&token, &spnego); @@ -1218,8 +1218,8 @@ static void manage_gss_spnego_request(struct ntlm_auth_state *state, request.negTokenInit.mechToken.length); response.type = SPNEGO_NEG_TOKEN_TARG; - response.negTokenTarg.supportedMech = SMB_STRDUP(OID_NTLMSSP); - response.negTokenTarg.mechListMIC = data_blob_null; + response.negTokenTarg.supportedMech = talloc_strdup(ctx, OID_NTLMSSP); + response.negTokenTarg.mechListMIC = data_blob_talloc(ctx, NULL, 0); status = ntlmssp_update(ntlmssp_state, request.negTokenInit.mechToken, @@ -1243,9 +1243,9 @@ static void manage_gss_spnego_request(struct ntlm_auth_state *state, } response.type = SPNEGO_NEG_TOKEN_TARG; - response.negTokenTarg.supportedMech = SMB_STRDUP(OID_KERBEROS5_OLD); - response.negTokenTarg.mechListMIC = data_blob_null; - response.negTokenTarg.responseToken = data_blob_null; + response.negTokenTarg.supportedMech = talloc_strdup(ctx, OID_KERBEROS5_OLD); + response.negTokenTarg.mechListMIC = data_blob_talloc(ctx, NULL, 0); + response.negTokenTarg.responseToken = data_blob_talloc(ctx, NULL, 0); status = ads_verify_ticket(mem_ctx, lp_realm(), 0, &request.negTokenInit.mechToken, @@ -1304,8 +1304,8 @@ static void manage_gss_spnego_request(struct ntlm_auth_state *state, &response.negTokenTarg.responseToken); response.type = SPNEGO_NEG_TOKEN_TARG; - response.negTokenTarg.supportedMech = SMB_STRDUP(OID_NTLMSSP); - response.negTokenTarg.mechListMIC = data_blob_null; + response.negTokenTarg.supportedMech = talloc_strdup(ctx, OID_NTLMSSP); + response.negTokenTarg.mechListMIC = data_blob_talloc(ctx, NULL, 0); if (NT_STATUS_IS_OK(status)) { user = SMB_STRDUP(ntlmssp_state->user); -- 1.7.0.1