summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-10-17 20:00:02 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-10-18 12:25:30 +0200
commitf3333bdade7d54b19bfcdc2addc685abd165eddf (patch)
treec8afe46e77e9143d44c44e11250a81a8b8ed6c2a
parent56328a4d61c8d0a52f6841097bf8fc4ffd46bfb6 (diff)
downloadsamba-f3333bdade7d54b19bfcdc2addc685abd165eddf.tar.gz
samba-f3333bdade7d54b19bfcdc2addc685abd165eddf.tar.bz2
samba-f3333bdade7d54b19bfcdc2addc685abd165eddf.zip
s3-rpc_client remove cli_auth_ntlmssp_data_destructor
This can be an ordinary talloc child without causing any problem. This seems to have been inherited from a time when ntlmssp_client_start() returned malloc() based memory. Andrew Bartlett
-rw-r--r--source3/rpc_client/cli_pipe.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 65bc028c41..247e4867f9 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -2256,12 +2256,6 @@ NTSTATUS rpccli_anon_bind_data(TALLOC_CTX *mem_ctx,
return NT_STATUS_OK;
}
-static int cli_auth_ntlmssp_data_destructor(struct pipe_auth_data *auth)
-{
- TALLOC_FREE(auth->auth_ctx);
- return 0;
-}
-
static NTSTATUS rpccli_ntlmssp_bind_data(TALLOC_CTX *mem_ctx,
enum dcerpc_AuthType auth_type,
enum dcerpc_AuthLevel auth_level,
@@ -2289,7 +2283,7 @@ static NTSTATUS rpccli_ntlmssp_bind_data(TALLOC_CTX *mem_ctx,
goto fail;
}
- status = auth_ntlmssp_client_start(NULL,
+ status = auth_ntlmssp_client_start(result,
lp_netbios_name(),
lp_workgroup(),
lp_client_ntlmv2_auth(),
@@ -2298,8 +2292,6 @@ static NTSTATUS rpccli_ntlmssp_bind_data(TALLOC_CTX *mem_ctx,
goto fail;
}
- talloc_set_destructor(result, cli_auth_ntlmssp_data_destructor);
-
status = auth_ntlmssp_set_username(ntlmssp_ctx, username);
if (!NT_STATUS_IS_OK(status)) {
goto fail;