summaryrefslogtreecommitdiffstats
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-01-14 12:11:17 +0100
committerGünther Deschner <gd@samba.org>2014-01-16 16:22:52 +0100
commit5bbcec0c2a626f005ae71490a4530fdb6b7088ad (patch)
tree80a7791ff6cdc6a74dbc48d647415ecfed7a94f3 /source4
parent0fdf392e6ace8deb14b5b12faaf27deb5545ac1b (diff)
s4:libnet: let libnet_rpc_userdel() take tevent_context/dcerpc_binding_handle
This avoids usage/dereferencing 'struct dcerpc_pipe'. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/libnet/userman.c6
-rw-r--r--source4/torture/libnet/userman.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/source4/libnet/userman.c b/source4/libnet/userman.c
index 7e6bedf27c..650f71a4dc 100644
--- a/source4/libnet/userman.c
+++ b/source4/libnet/userman.c
@@ -454,12 +454,12 @@ NTSTATUS libnet_rpc_userdel_recv(struct composite_context *c, TALLOC_CTX *mem_ct
* @return nt status code of execution
*/
-NTSTATUS libnet_rpc_userdel(struct dcerpc_pipe *p,
+NTSTATUS libnet_rpc_userdel(struct tevent_context *ev,
+ struct dcerpc_binding_handle *b,
TALLOC_CTX *mem_ctx,
struct libnet_rpc_userdel *io)
{
- struct composite_context *c = libnet_rpc_userdel_send(mem_ctx, p->conn->event_ctx,
- p->binding_handle, io, NULL);
+ struct composite_context *c = libnet_rpc_userdel_send(mem_ctx, ev, b, io, NULL);
return libnet_rpc_userdel_recv(c, mem_ctx, io);
}
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 05e9592d3c..2abf1e826a 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -222,10 +222,12 @@ static bool test_userdel(struct torture_context *tctx,
NTSTATUS status;
struct libnet_rpc_userdel user;
+ ZERO_STRUCT(user);
+
user.in.domain_handle = *handle;
user.in.username = username;
- status = libnet_rpc_userdel(p, mem_ctx, &user);
+ status = libnet_rpc_userdel(tctx->ev, p->binding_handle, mem_ctx, &user);
if (!NT_STATUS_IS_OK(status)) {
torture_comment(tctx, "Failed to call sync libnet_rpc_userdel - %s\n", nt_errstr(status));
return false;