diff options
| author | Kai Blin <kai@samba.org> | 2008-01-19 02:12:35 +0100 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2008-01-19 02:20:16 +0100 |
| commit | 805caafd44cbc5fff49711b1a15fb64cc99f3ad3 (patch) | |
| tree | 54c96bb7e84de810b3199b3a444ae27adef6d626 /source3/utils/net_rpc_samsync.c | |
| parent | b97fbf58886427fbb7f3181694bf6f9648f5d0f4 (diff) | |
| download | samba-805caafd44cbc5fff49711b1a15fb64cc99f3ad3.tar.gz samba-805caafd44cbc5fff49711b1a15fb64cc99f3ad3.tar.bz2 samba-805caafd44cbc5fff49711b1a15fb64cc99f3ad3.zip | |
util_str: Don't return memory from talloc_tos(), use mem_ctx instead.
(This used to be commit ab0ee6e9a6a9eee317228f0c2bde254ad9a59b85)
Diffstat (limited to 'source3/utils/net_rpc_samsync.c')
| -rw-r--r-- | source3/utils/net_rpc_samsync.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c index 779006884d..d0fcfe3aeb 100644 --- a/source3/utils/net_rpc_samsync.c +++ b/source3/utils/net_rpc_samsync.c @@ -365,7 +365,8 @@ static NTSTATUS sam_account_from_delta(struct samu *account, SAM_ACCOUNT_INFO *d old_string = pdb_get_munged_dial(account); mung.length = delta->hdr_parameters.uni_str_len; mung.data = (uint8 *) delta->uni_parameters.buffer; - newstr = (mung.length == 0) ? NULL : base64_encode_data_blob(mung); + newstr = (mung.length == 0) ? NULL : + base64_encode_data_blob(talloc_tos(), mung); if (STRING_CHANGED_NC(old_string, newstr)) pdb_set_munged_dial(account, newstr, PDB_CHANGED); @@ -1422,12 +1423,11 @@ static int fprintf_attr(FILE *add_fd, const char *attr_name, base64_blob.data = (unsigned char *)value; base64_blob.length = strlen(value); - base64 = base64_encode_data_blob(base64_blob); + base64 = base64_encode_data_blob(value, base64_blob); SMB_ASSERT(base64 != NULL); res = fprintf(add_fd, "%s:: %s\n", attr_name, base64); TALLOC_FREE(value); - TALLOC_FREE(base64); return res; } |