sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-02 00:23:50 +03:00
Code Activity

r2247: talloc_destroy -> talloc_free

Browse Source
This commit is contained in:
Tim Potter
2004-09-08 00:00:56 +00:00
committed by Gerald (Jerry) Carter
parent 301bb069c3
commit 6c1a72c5d6
11 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/libcli/cliconnect.c
View File

@@ -92,7 +92,7 @@ NTSTATUS smbcli_session_setup(struct smbcli_state *cli,
cli->session->vuid = setup.generic.out.vuid; cli->session->vuid = setup.generic.out.vuid;
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
return status; return status;
} }
@@ -125,7 +125,7 @@ NTSTATUS smbcli_send_tconX(struct smbcli_state *cli, const char *sharename,
cli->tree->tid = tcon.tconx.out.cnum; cli->tree->tid = tcon.tconx.out.cnum;
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
return status; return status;
} }
@@ -176,7 +176,7 @@ NTSTATUS smbcli_full_connection(struct smbcli_state **ret_cli,
tree->reference_count++; tree->reference_count++;
done: done:
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
return status; return status;
} }

2
source/libcli/raw/clitransport.c
View File

@@ -47,7 +47,7 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock)
transport->event.ctx = event_context_init(); transport->event.ctx = event_context_init();
if (transport->event.ctx == NULL) { if (transport->event.ctx == NULL) {
talloc_destroy(transport); talloc_free(transport);
return NULL; return NULL;
} }

8
source/libcli/raw/clitree.c
View File

@@ -251,7 +251,7 @@ NTSTATUS smbcli_tree_full_connection(struct smbcli_tree **ret_tree,
status = smb_raw_session_setup(session, mem_ctx, &setup); status = smb_raw_session_setup(session, mem_ctx, &setup);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
smbcli_session_close(session); smbcli_session_close(session);
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
return status; return status;
} }
@@ -260,7 +260,7 @@ NTSTATUS smbcli_tree_full_connection(struct smbcli_tree **ret_tree,
tree = smbcli_tree_init(session); tree = smbcli_tree_init(session);
if (!tree) { if (!tree) {
smbcli_session_close(session); smbcli_session_close(session);
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
@@ -284,7 +284,7 @@ NTSTATUS smbcli_tree_full_connection(struct smbcli_tree **ret_tree,
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
smbcli_tree_close(tree); smbcli_tree_close(tree);
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
return status; return status;
} }
@@ -296,7 +296,7 @@ NTSTATUS smbcli_tree_full_connection(struct smbcli_tree **ret_tree,
tree->fs_type = talloc_strdup(tree, tcon.tconx.out.fs_type); tree->fs_type = talloc_strdup(tree, tcon.tconx.out.fs_type);
} }
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
*ret_tree = tree; *ret_tree = tree;
return NT_STATUS_OK; return NT_STATUS_OK;

2
source/librpc/ndr/ndr.c
View File

@@ -152,7 +152,7 @@ struct ndr_push *ndr_push_init(void)
/* free a ndr_push structure */ /* free a ndr_push structure */
void ndr_push_free(struct ndr_push *ndr) void ndr_push_free(struct ndr_push *ndr)
{ {
talloc_destroy(ndr); talloc_free(ndr);
} }

2
source/librpc/rpc/dcerpc_smb.c
View File

@@ -393,7 +393,7 @@ NTSTATUS dcerpc_pipe_open_smb(struct dcerpc_pipe **p,
} }
status = smb_raw_open(tree, mem_ctx, &io); status = smb_raw_open(tree, mem_ctx, &io);
free(name); free(name);
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
return status; return status;

6
source/ntvfs/simple/vfs_simple.c
View File

@@ -803,7 +803,7 @@ static NTSTATUS svfs_search_first(struct smbsrv_request *req, union smb_search_f
/* work out if we are going to keep the search state */ /* work out if we are going to keep the search state */
if ((io->t2ffirst.in.flags & FLAG_TRANS2_FIND_CLOSE) || if ((io->t2ffirst.in.flags & FLAG_TRANS2_FIND_CLOSE) ||
((io->t2ffirst.in.flags & FLAG_TRANS2_FIND_CLOSE_IF_END) && (i == dir->count))) { ((io->t2ffirst.in.flags & FLAG_TRANS2_FIND_CLOSE_IF_END) && (i == dir->count))) {
talloc_destroy(search->mem_ctx); talloc_free(search->mem_ctx);
} else { } else {
private->next_search_handle++; private->next_search_handle++;
DLIST_ADD(private->search, search); DLIST_ADD(private->search, search);
@@ -893,7 +893,7 @@ found:
if ((io->t2fnext.in.flags & FLAG_TRANS2_FIND_CLOSE) || if ((io->t2fnext.in.flags & FLAG_TRANS2_FIND_CLOSE) ||
((io->t2fnext.in.flags & FLAG_TRANS2_FIND_CLOSE_IF_END) && (i == dir->count))) { ((io->t2fnext.in.flags & FLAG_TRANS2_FIND_CLOSE_IF_END) && (i == dir->count))) {
DLIST_REMOVE(private->search, search); DLIST_REMOVE(private->search, search);
talloc_destroy(search->mem_ctx); talloc_free(search->mem_ctx);
} }
return NT_STATUS_OK; return NT_STATUS_OK;
@@ -915,7 +915,7 @@ static NTSTATUS svfs_search_close(struct smbsrv_request *req, union smb_search_c
} }
DLIST_REMOVE(private->search, search); DLIST_REMOVE(private->search, search);
talloc_destroy(search->mem_ctx); talloc_free(search->mem_ctx);
return NT_STATUS_OK; return NT_STATUS_OK;
} }

2
source/param/loadparm.c
View File

@@ -1125,7 +1125,7 @@ void lp_talloc_free(void)
{ {
if (!lp_talloc) if (!lp_talloc)
return; return;
talloc_destroy(lp_talloc); talloc_free(lp_talloc);
lp_talloc = NULL; lp_talloc = NULL;
} }

16
source/rpc_server/dcerpc_server.c
View File

@@ -255,7 +255,7 @@ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
*p = talloc_p(mem_ctx, struct dcesrv_connection); *p = talloc_p(mem_ctx, struct dcesrv_connection);
if (! *p) { if (! *p) {
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
@@ -332,7 +332,7 @@ void dcesrv_endpoint_disconnect(struct dcesrv_connection *p)
free_session_info(&p->auth_state.session_info); free_session_info(&p->auth_state.session_info);
} }
talloc_destroy(p->mem_ctx); talloc_free(p->mem_ctx);
} }
static void dcesrv_init_hdr(struct dcerpc_packet *pkt) static void dcesrv_init_hdr(struct dcerpc_packet *pkt)
@@ -544,7 +544,7 @@ static NTSTATUS dcesrv_auth3(struct dcesrv_call_state *call)
return dcesrv_fault(call, DCERPC_FAULT_OTHER); return dcesrv_fault(call, DCERPC_FAULT_OTHER);
} }
talloc_destroy(call->mem_ctx); talloc_free(call->mem_ctx);
/* we don't send a reply to a auth3 request, except by a /* we don't send a reply to a auth3 request, except by a
fault */ fault */
@@ -735,7 +735,7 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
call = talloc_p(mem_ctx, struct dcesrv_call_state); call = talloc_p(mem_ctx, struct dcesrv_call_state);
if (!call) { if (!call) {
talloc_free(dce_conn->partial_input.data); talloc_free(dce_conn->partial_input.data);
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
call->mem_ctx = mem_ctx; call->mem_ctx = mem_ctx;
@@ -748,7 +748,7 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
ndr = ndr_pull_init_blob(&blob, mem_ctx); ndr = ndr_pull_init_blob(&blob, mem_ctx);
if (!ndr) { if (!ndr) {
talloc_free(dce_conn->partial_input.data); talloc_free(dce_conn->partial_input.data);
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
@@ -759,7 +759,7 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
status = ndr_pull_dcerpc_packet(ndr, NDR_SCALARS|NDR_BUFFERS, &call->pkt); status = ndr_pull_dcerpc_packet(ndr, NDR_SCALARS|NDR_BUFFERS, &call->pkt);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
talloc_free(dce_conn->partial_input.data); talloc_free(dce_conn->partial_input.data);
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
return status; return status;
} }
@@ -841,7 +841,7 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
it to the list of pending calls. We add it to the end to keep the call it to the list of pending calls. We add it to the end to keep the call
list in the order we will answer */ list in the order we will answer */
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
} }
return status; return status;
@@ -924,7 +924,7 @@ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn,
if (call->replies == NULL) { if (call->replies == NULL) {
/* we're done with the whole call */ /* we're done with the whole call */
DLIST_REMOVE(dce_conn->call_list, call); DLIST_REMOVE(dce_conn->call_list, call);
talloc_destroy(call->mem_ctx); talloc_free(call->mem_ctx);
} }
return status; return status;

12
source/rpc_server/netlogon/dcerpc_netlogon.c
View File

@@ -52,7 +52,7 @@ static NTSTATUS netlogon_schannel_setup(struct dcesrv_call_state *dce_call)
} }
state = talloc_p(mem_ctx, struct server_pipe_state); state = talloc_p(mem_ctx, struct server_pipe_state);
if (state == NULL) { if (state == NULL) {
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
ZERO_STRUCTP(state); ZERO_STRUCTP(state);
@@ -60,7 +60,7 @@ static NTSTATUS netlogon_schannel_setup(struct dcesrv_call_state *dce_call)
state->authenticated = True; state->authenticated = True;
if (dce_call->conn->auth_state.session_info == NULL) { if (dce_call->conn->auth_state.session_info == NULL) {
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
smb_panic("No session info provided by schannel level setup!"); smb_panic("No session info provided by schannel level setup!");
return NT_STATUS_NO_USER_SESSION_KEY; return NT_STATUS_NO_USER_SESSION_KEY;
} }
@@ -71,7 +71,7 @@ static NTSTATUS netlogon_schannel_setup(struct dcesrv_call_state *dce_call)
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
DEBUG(3, ("getting schannel credentials failed with %s\n", nt_errstr(status))); DEBUG(3, ("getting schannel credentials failed with %s\n", nt_errstr(status)));
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
return status; return status;
} }
@@ -110,7 +110,7 @@ static void netlogon_unbind(struct dcesrv_connection *conn, const struct dcesrv_
struct server_pipe_state *pipe_state = conn->private; struct server_pipe_state *pipe_state = conn->private;
if (pipe_state) { if (pipe_state) {
talloc_destroy(pipe_state->mem_ctx); talloc_free(pipe_state->mem_ctx);
} }
conn->private = NULL; conn->private = NULL;
@@ -130,7 +130,7 @@ static NTSTATUS netr_ServerReqChallenge(struct dcesrv_call_state *dce_call, TALL
/* destroyed on pipe shutdown */ /* destroyed on pipe shutdown */
if (pipe_state) { if (pipe_state) {
talloc_destroy(pipe_state->mem_ctx); talloc_free(pipe_state->mem_ctx);
dce_call->conn->private = NULL; dce_call->conn->private = NULL;
} }
@@ -143,7 +143,7 @@ static NTSTATUS netr_ServerReqChallenge(struct dcesrv_call_state *dce_call, TALL
pipe_state = talloc_p(pipe_mem_ctx, struct server_pipe_state); pipe_state = talloc_p(pipe_mem_ctx, struct server_pipe_state);
if (!pipe_state) { if (!pipe_state) {
talloc_destroy(pipe_mem_ctx); talloc_free(pipe_mem_ctx);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }

2
source/rpc_server/samr/dcesrv_samr.c
View File

@@ -55,7 +55,7 @@ static NTSTATUS samr_Connect(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem
/* make sure the sam database is accessible */ /* make sure the sam database is accessible */
c_state->sam_ctx = samdb_connect(mem_ctx); c_state->sam_ctx = samdb_connect(mem_ctx);
if (c_state->sam_ctx == NULL) { if (c_state->sam_ctx == NULL) {
talloc_destroy(c_state); talloc_free(c_state);
return NT_STATUS_INVALID_SYSTEM_SERVICE; return NT_STATUS_INVALID_SYSTEM_SERVICE;
} }

4
source/smb_server/smb_server.c
View File

@@ -727,7 +727,7 @@ static void smbsrv_init(struct server_service *service, const struct model_ops *
ifip = interpret_addr2(mem_ctx, lp_socket_address()); ifip = interpret_addr2(mem_ctx, lp_socket_address());
add_socket(service, model_ops, NULL, ifip); add_socket(service, model_ops, NULL, ifip);
talloc_destroy(mem_ctx); talloc_free(mem_ctx);
} }
} }
@@ -783,7 +783,7 @@ static void smbsrv_close(struct server_connection *conn, const char *reason)
conn_close_all(smb_conn); conn_close_all(smb_conn);
talloc_destroy(smb_conn->mem_ctx); talloc_free(smb_conn->mem_ctx);
return; return;
} }