From 13756d0e803c228f7ff75ba996acd6afd1df0dcb Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 2 Oct 2010 11:50:26 +0200 Subject: s3: Attempt to fix bug 7665 Quite a few of our internal routines put stuff on talloc_tos() these days. In top-level netapi routines, properly allocate a stackframe and clean it again. Also, don't leak memory in the rpccli_ callers onto the libnetapi context. --- source3/lib/netapi/joindomain.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/lib/netapi/joindomain.c') diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c index e5777a0d33..3905709d50 100644 --- a/source3/lib/netapi/joindomain.c +++ b/source3/lib/netapi/joindomain.c @@ -128,7 +128,7 @@ WERROR NetJoinDomain_r(struct libnetapi_ctx *ctx, old_timeout = rpccli_set_timeout(pipe_cli, 600000); - status = rpccli_wkssvc_NetrJoinDomain2(pipe_cli, ctx, + status = rpccli_wkssvc_NetrJoinDomain2(pipe_cli, talloc_tos(), r->in.server, r->in.domain, r->in.account_ou, @@ -258,7 +258,7 @@ WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx, old_timeout = rpccli_set_timeout(pipe_cli, 60000); - status = rpccli_wkssvc_NetrUnjoinDomain2(pipe_cli, ctx, + status = rpccli_wkssvc_NetrUnjoinDomain2(pipe_cli, talloc_tos(), r->in.server_name, r->in.account, encrypted_password, @@ -295,7 +295,7 @@ WERROR NetGetJoinInformation_r(struct libnetapi_ctx *ctx, goto done; } - status = rpccli_wkssvc_NetrGetJoinInformation(pipe_cli, ctx, + status = rpccli_wkssvc_NetrGetJoinInformation(pipe_cli, talloc_tos(), r->in.server_name, &buffer, (enum wkssvc_NetJoinStatus *)r->out.name_type, @@ -436,7 +436,7 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx, &encrypted_password); } - status = rpccli_wkssvc_NetrGetJoinableOus2(pipe_cli, ctx, + status = rpccli_wkssvc_NetrGetJoinableOus2(pipe_cli, talloc_tos(), r->in.server_name, r->in.domain, r->in.account, @@ -478,7 +478,7 @@ WERROR NetRenameMachineInDomain_r(struct libnetapi_ctx *ctx, &encrypted_password); } - status = rpccli_wkssvc_NetrRenameMachineInDomain2(pipe_cli, ctx, + status = rpccli_wkssvc_NetrRenameMachineInDomain2(pipe_cli, talloc_tos(), r->in.server_name, r->in.new_machine_name, r->in.account, -- cgit