summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-09-26 01:43:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:15 -0500
commit6bea5bea4ccd4eb45b9cd4dd1e16538b14e2180e (patch)
treebd8c95a07360dcf1363cbf49a46db6304893fc63 /source4/libcli
parent9cafc0d07ed339b511abf0f6fd41c289d2815974 (diff)
downloadsamba-6bea5bea4ccd4eb45b9cd4dd1e16538b14e2180e.tar.gz
samba-6bea5bea4ccd4eb45b9cd4dd1e16538b14e2180e.tar.bz2
samba-6bea5bea4ccd4eb45b9cd4dd1e16538b14e2180e.zip
r2643: convert more of the auth subsyystem to the new talloc methods. This
also fixes a memory leak found with --leak-check. (This used to be commit f19201ea274f0a542314c61c4af676197bf154ad)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/auth/gensec_krb5.c18
-rw-r--r--source4/libcli/auth/gensec_ntlmssp.c4
2 files changed, 11 insertions, 11 deletions
diff --git a/source4/libcli/auth/gensec_krb5.c b/source4/libcli/auth/gensec_krb5.c
index 37fa95bac4..06630455ce 100644
--- a/source4/libcli/auth/gensec_krb5.c
+++ b/source4/libcli/auth/gensec_krb5.c
@@ -627,13 +627,13 @@ static NTSTATUS gensec_krb5_session_info(struct gensec_security *gensec_security
server_info->guest = False;
- principal = talloc_strdup(server_info->mem_ctx, gensec_krb5_state->peer_principal);
+ principal = talloc_strdup(server_info, gensec_krb5_state->peer_principal);
p = strchr(principal, '@');
if (p) {
*p = '\0';
}
server_info->account_name = principal;
- server_info->domain = talloc_strdup(server_info->mem_ctx, p++);
+ server_info->domain = talloc_strdup(server_info, p++);
if (!server_info->domain) {
free_server_info(&server_info);
return NT_STATUS_NO_MEMORY;
@@ -650,7 +650,7 @@ static NTSTATUS gensec_krb5_session_info(struct gensec_security *gensec_security
* kind... */
if (logon_info) {
- ptoken = talloc_p(session_info->mem_ctx, struct nt_user_token);
+ ptoken = talloc_p(session_info, struct nt_user_token);
if (!ptoken) {
return NT_STATUS_NO_MEMORY;
}
@@ -663,16 +663,16 @@ static NTSTATUS gensec_krb5_session_info(struct gensec_security *gensec_security
}
- sid = dom_sid_dup(session_info->mem_ctx, logon_info->dom_sid);
- ptoken->user_sids[0] = dom_sid_add_rid(session_info->mem_ctx, sid, logon_info->user_rid);
+ sid = dom_sid_dup(session_info, logon_info->dom_sid);
+ ptoken->user_sids[0] = dom_sid_add_rid(session_info, sid, logon_info->user_rid);
ptoken->num_sids++;
- sid = dom_sid_dup(session_info->mem_ctx, logon_info->dom_sid);
- ptoken->user_sids[1] = dom_sid_add_rid(session_info->mem_ctx, sid, logon_info->group_rid);
+ sid = dom_sid_dup(session_info, logon_info->dom_sid);
+ ptoken->user_sids[1] = dom_sid_add_rid(session_info, sid, logon_info->group_rid);
ptoken->num_sids++;
for (;ptoken->num_sids < logon_info->groups_count; ptoken->num_sids++) {
- sid = dom_sid_dup(session_info->mem_ctx, logon_info->dom_sid);
- ptoken->user_sids[ptoken->num_sids] = dom_sid_add_rid(session_info->mem_ctx, sid, logon_info->groups[ptoken->num_sids - 2].rid);
+ sid = dom_sid_dup(session_info, logon_info->dom_sid);
+ ptoken->user_sids[ptoken->num_sids] = dom_sid_add_rid(session_info, sid, logon_info->groups[ptoken->num_sids - 2].rid);
}
debug_nt_user_token(DBGC_AUTH, 0, ptoken);
diff --git a/source4/libcli/auth/gensec_ntlmssp.c b/source4/libcli/auth/gensec_ntlmssp.c
index 0c96a783f1..8b760bcd45 100644
--- a/source4/libcli/auth/gensec_ntlmssp.c
+++ b/source4/libcli/auth/gensec_ntlmssp.c
@@ -386,11 +386,11 @@ static NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_secur
/* the session_info owns this now */
gensec_ntlmssp_state->server_info = NULL;
- (*session_info)->session_key = data_blob_talloc((*session_info)->mem_ctx,
+ (*session_info)->session_key = data_blob_talloc(*session_info,
gensec_ntlmssp_state->ntlmssp_state->session_key.data,
gensec_ntlmssp_state->ntlmssp_state->session_key.length);
- (*session_info)->workstation = talloc_strdup((*session_info)->mem_ctx,
+ (*session_info)->workstation = talloc_strdup(*session_info,
gensec_ntlmssp_state->ntlmssp_state->workstation);
return NT_STATUS_OK;