From 369f5fd1d7a6e6298bc3cbe01e3aaed0106f6cf4 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 15 Dec 2000 01:02:11 +0000 Subject: Fixed memory leaks in lsa_XX calls. Fixed memory leaks in smbcacls. Merged in fixes from appliance-head and 2.2. Fixed multiple connection.tdb open problem. Jeremy. (This used to be commit 0a40bc83e14c69a09948ec09bb6fc5026c4f4c14) --- source3/rpc_server/srv_lsa.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'source3/rpc_server/srv_lsa.c') diff --git a/source3/rpc_server/srv_lsa.c b/source3/rpc_server/srv_lsa.c index 5bc780860f..aea7294ffe 100644 --- a/source3/rpc_server/srv_lsa.c +++ b/source3/rpc_server/srv_lsa.c @@ -390,11 +390,6 @@ static BOOL lsa_reply_lookup_sids(prs_struct *rdata, DOM_SID2 *sid, int num_entr return False; } - /* Free memory - perhaps this should be done using talloc()? */ - - safe_free(names.name); - safe_free(names.uni_name); - return True; } @@ -409,11 +404,8 @@ static BOOL lsa_reply_lookup_names(prs_struct *rdata, UNISTR2 *names, DOM_R_REF ref; DOM_RID2 rids[MAX_LOOKUP_SIDS]; uint32 mapped_count = 0; - TALLOC_CTX *mem_ctx = talloc_init(); BOOL result = True; - if (!mem_ctx) return False; - ZERO_STRUCT(r_l); ZERO_STRUCT(ref); ZERO_ARRAY(rids); @@ -423,12 +415,11 @@ static BOOL lsa_reply_lookup_names(prs_struct *rdata, UNISTR2 *names, init_reply_lookup_names(&r_l, &ref, num_entries, rids, mapped_count); /* store the response in the SMB stream */ - if(!lsa_io_r_lookup_names(mem_ctx, "", &r_l, rdata, 0)) { + if(!lsa_io_r_lookup_names("", &r_l, rdata, 0)) { DEBUG(0,("lsa_reply_lookup_names: Failed to marshall LSA_R_LOOKUP_NAMES.\n")); result = False; } - talloc_destroy(mem_ctx); return result; } @@ -583,20 +574,13 @@ static BOOL api_lsa_lookup_sids(pipes_struct *p) if(!lsa_io_q_lookup_sids("", &q_l, data, 0)) { DEBUG(0,("api_lsa_lookup_sids: failed to unmarshall LSA_Q_LOOKUP_SIDS.\n")); result = False; - goto done; } /* construct reply. return status is always 0x0 */ if(!lsa_reply_lookup_sids(rdata, q_l.sids.sid, q_l.sids.num_entries)) { result = False; - goto done; } - - done: - safe_free(q_l.sids.ptr_sid); - safe_free(q_l.sids.sid); - return result; } @@ -618,8 +602,6 @@ static BOOL api_lsa_lookup_names(pipes_struct *p) return False; } - SMB_ASSERT_ARRAY(q_l.uni_name, q_l.num_entries); - return lsa_reply_lookup_names(rdata, q_l.uni_name, q_l.num_entries); } -- cgit