diff options
Diffstat (limited to 'source4/torture/libnet')
| -rw-r--r-- | source4/torture/libnet/domain.c | 4 | ||||
| -rw-r--r-- | source4/torture/libnet/libnet_rpc.c | 12 | ||||
| -rw-r--r-- | source4/torture/libnet/libnet_share.c | 4 | ||||
| -rw-r--r-- | source4/torture/libnet/userinfo.c | 4 | ||||
| -rw-r--r-- | source4/torture/libnet/userman.c | 12 |
5 files changed, 10 insertions, 26 deletions
diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c index 98c44cd942..7f8600d2dd 100644 --- a/source4/torture/libnet/domain.c +++ b/source4/torture/libnet/domain.c @@ -83,9 +83,7 @@ BOOL torture_domainopen(void) status = torture_rpc_connection(mem_ctx, &p, - DCERPC_SAMR_NAME, - DCERPC_SAMR_UUID, - DCERPC_SAMR_VERSION); + &dcerpc_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c index 4cd04ecb42..071fe99004 100644 --- a/source4/torture/libnet/libnet_rpc.c +++ b/source4/torture/libnet/libnet_rpc.c @@ -31,15 +31,13 @@ BOOL test_lsa_connect(struct libnet_context *ctx) struct libnet_RpcConnect connect; connect.level = LIBNET_RPC_CONNECT_PDC; connect.in.domain_name = lp_workgroup(); - connect.in.dcerpc_iface_name = DCERPC_LSARPC_NAME; - connect.in.dcerpc_iface_uuid = DCERPC_LSARPC_UUID; - connect.in.dcerpc_iface_version = DCERPC_LSARPC_VERSION; + connect.in.dcerpc_iface = &dcerpc_table_lsarpc; status = libnet_RpcConnect(ctx, ctx, &connect); if (!NT_STATUS_IS_OK(status)) { printf("Couldn't connect to rpc service %s on %s: %s\n", - connect.in.dcerpc_iface_name, connect.in.domain_name, + connect.in.dcerpc_iface->name, connect.in.domain_name, nt_errstr(status)); return False; @@ -55,15 +53,13 @@ BOOL test_samr_connect(struct libnet_context *ctx) struct libnet_RpcConnect connect; connect.level = LIBNET_RPC_CONNECT_PDC; connect.in.domain_name = lp_workgroup(); - connect.in.dcerpc_iface_name = DCERPC_SAMR_NAME; - connect.in.dcerpc_iface_uuid = DCERPC_SAMR_UUID; - connect.in.dcerpc_iface_version = DCERPC_SAMR_VERSION; + connect.in.dcerpc_iface = &dcerpc_table_samr; status = libnet_RpcConnect(ctx, ctx, &connect); if (!NT_STATUS_IS_OK(status)) { printf("Couldn't connect to rpc service %s on %s: %s\n", - connect.in.dcerpc_iface_name, connect.in.domain_name, + connect.in.dcerpc_iface->name, connect.in.domain_name, nt_errstr(status)); return False; diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c index 3d770b4ca1..1f0f5eacd3 100644 --- a/source4/torture/libnet/libnet_share.c +++ b/source4/torture/libnet/libnet_share.c @@ -218,9 +218,7 @@ BOOL torture_delshare(void) status = torture_rpc_connection(mem_ctx, &p, - DCERPC_SRVSVC_NAME, - DCERPC_SRVSVC_UUID, - DCERPC_SRVSVC_VERSION); + &dcerpc_table_srvsvc); if (!test_addshare(p, mem_ctx, host, TEST_SHARENAME)) { ret = False; diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c index 63724bc8b1..b987bd5c21 100644 --- a/source4/torture/libnet/userinfo.c +++ b/source4/torture/libnet/userinfo.c @@ -279,9 +279,7 @@ BOOL torture_userinfo(void) status = torture_rpc_connection(mem_ctx, &p, - DCERPC_SAMR_NAME, - DCERPC_SAMR_UUID, - DCERPC_SAMR_VERSION); + &dcerpc_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c index fc2a32c913..6ec5d9a7b7 100644 --- a/source4/torture/libnet/userman.c +++ b/source4/torture/libnet/userman.c @@ -313,9 +313,7 @@ BOOL torture_useradd(void) status = torture_rpc_connection(mem_ctx, &p, - DCERPC_SAMR_NAME, - DCERPC_SAMR_UUID, - DCERPC_SAMR_VERSION); + &dcerpc_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; @@ -374,9 +372,7 @@ BOOL torture_userdel(void) status = torture_rpc_connection(mem_ctx, &p, - DCERPC_SAMR_NAME, - DCERPC_SAMR_UUID, - DCERPC_SAMR_VERSION); + &dcerpc_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; @@ -437,9 +433,7 @@ BOOL torture_usermod(void) status = torture_rpc_connection(mem_ctx, &p, - DCERPC_SAMR_NAME, - DCERPC_SAMR_UUID, - DCERPC_SAMR_VERSION); + &dcerpc_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; |