diff options
| author | Jeremy Allison <jra@samba.org> | 2006-12-16 01:52:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:32 -0500 |
| commit | f0c7dc544bccda5eb87f56cbd5a49ca8d8372cb1 (patch) | |
| tree | d95e1ca463384937f657e36eaed5202758898113 | |
| parent | bf8988feaf818782d708da69d186295e140ade10 (diff) | |
| download | samba-f0c7dc544bccda5eb87f56cbd5a49ca8d8372cb1.tar.gz samba-f0c7dc544bccda5eb87f56cbd5a49ca8d8372cb1.tar.bz2 samba-f0c7dc544bccda5eb87f56cbd5a49ca8d8372cb1.zip | |
r20207: Fix a couple more places where extra_data was
being talloc'ed off the NULL context instead
of being malloced.
Jeremy.
(This used to be commit 47bdeb4efeaa5a441ad2d39bb3b94d72263e66e4)
| -rw-r--r-- | source3/nsswitch/winbindd_async.c | 4 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_group.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/source3/nsswitch/winbindd_async.c b/source3/nsswitch/winbindd_async.c index 93dea6f48c..3319fda406 100644 --- a/source3/nsswitch/winbindd_async.c +++ b/source3/nsswitch/winbindd_async.c @@ -1135,13 +1135,13 @@ enum winbindd_result winbindd_dual_getsidaliases(struct winbindd_domain *domain, } - if (!print_sidlist(NULL, sids, num_sids, &sidstr, &len)) { + if (!print_sidlist(state->mem_ctx, sids, num_sids, &sidstr, &len)) { DEBUG(0, ("Could not print_sidlist\n")); state->response.extra_data.data = NULL; return WINBINDD_ERROR; } - state->response.extra_data.data = sidstr; + state->response.extra_data.data = SMB_STRDUP(sidstr); if (state->response.extra_data.data != NULL) { DEBUG(10, ("aliases_list: %s\n", diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c index deee07413c..1b21352c86 100644 --- a/source3/nsswitch/winbindd_group.c +++ b/source3/nsswitch/winbindd_group.c @@ -1384,12 +1384,15 @@ enum winbindd_result winbindd_dual_getuserdomgroups(struct winbindd_domain *doma return WINBINDD_OK; } - if (!print_sidlist(NULL, groups, num_groups, &sidstring, &len)) { - DEBUG(0, ("malloc failed\n")); + if (!print_sidlist(state->mem_ctx, groups, num_groups, &sidstring, &len)) { + DEBUG(0, ("talloc failed\n")); return WINBINDD_ERROR; } - state->response.extra_data.data = sidstring; + state->response.extra_data.data = SMB_STRDUP(sidstring); + if (!state->response.extra_data.data) { + return WINBINDD_ERROR; + } state->response.length += len+1; state->response.data.num_entries = num_groups; |