7 files changed, 16 insertions, 16 deletions
diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index d6b456317e..50b53300a4 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -88,7 +88,7 @@ BOOL torture_domainopen(struct torture_context *torture)
 
 	status = torture_rpc_connection(mem_ctx, 
 					&net_ctx->samr.pipe,
-					&dcerpc_table_samr);
+					&ndr_table_samr);
 	
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
diff --git a/source4/torture/libnet/libnet_domain.c b/source4/torture/libnet/libnet_domain.c
index 7023988f9b..2ececa690a 100644
--- a/source4/torture/libnet/libnet_domain.c
+++ b/source4/torture/libnet/libnet_domain.c
@@ -203,7 +203,7 @@ BOOL torture_domain_close_lsa(struct torture_context *torture)
 	ctx->cred = cmdline_credentials;
 
 	mem_ctx = talloc_init("torture_domain_close_lsa");
-	status = dcerpc_pipe_connect(mem_ctx, &p, bindstr, &dcerpc_table_lsarpc,
+	status = dcerpc_pipe_connect(mem_ctx, &p, bindstr, &ndr_table_lsarpc,
 				     cmdline_credentials, NULL);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("failed to connect to server %s: %s\n", bindstr,
@@ -339,7 +339,7 @@ BOOL torture_domain_close_samr(struct torture_context *torture)
 	ctx->cred = cmdline_credentials;
 
 	mem_ctx = talloc_init("torture_domain_close_samr");
-	status = dcerpc_pipe_connect(mem_ctx, &p, bindstr, &dcerpc_table_samr,
+	status = dcerpc_pipe_connect(mem_ctx, &p, bindstr, &ndr_table_samr,
 				     ctx->cred, NULL);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("failed to connect to server %s: %s\n", bindstr,
diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c
index cfcee39c8e..d751a8e423 100644
--- a/source4/torture/libnet/libnet_rpc.c
+++ b/source4/torture/libnet/libnet_rpc.c
@@ -91,35 +91,35 @@ static BOOL torture_rpc_connect(struct torture_context *torture,
 	ctx->cred = cmdline_credentials;
 	
 	d_printf("Testing connection to LSA interface\n");
-	if (!test_connect_service(ctx, &dcerpc_table_lsarpc, bindstr,
+	if (!test_connect_service(ctx, &ndr_table_lsarpc, bindstr,
 				  hostname, level, False, NT_STATUS_OK)) {
 		d_printf("failed to connect LSA interface\n");
 		return False;
 	}
 
 	d_printf("Testing connection to SAMR interface\n");
-	if (!test_connect_service(ctx, &dcerpc_table_samr, bindstr,
+	if (!test_connect_service(ctx, &ndr_table_samr, bindstr,
 				  hostname, level, False, NT_STATUS_OK)) {
 		d_printf("failed to connect SAMR interface\n");
 		return False;
 	}
 
 	d_printf("Testing connection to SRVSVC interface\n");
-	if (!test_connect_service(ctx, &dcerpc_table_srvsvc, bindstr,
+	if (!test_connect_service(ctx, &ndr_table_srvsvc, bindstr,
 				  hostname, level, False, NT_STATUS_OK)) {
 		d_printf("failed to connect SRVSVC interface\n");
 		return False;
 	}
 
 	d_printf("Testing connection to LSA interface with wrong credentials\n");
-	if (!test_connect_service(ctx, &dcerpc_table_lsarpc, bindstr,
+	if (!test_connect_service(ctx, &ndr_table_lsarpc, bindstr,
 				  hostname, level, True, NT_STATUS_LOGON_FAILURE)) {
 		d_printf("failed to test wrong credentials on LSA interface\n");
 		return False;
 	}
 
 	d_printf("Testing connection to SAMR interface with wrong credentials\n");
-	if (!test_connect_service(ctx, &dcerpc_table_samr, bindstr,
+	if (!test_connect_service(ctx, &ndr_table_samr, bindstr,
 				  hostname, level, True, NT_STATUS_LOGON_FAILURE)) {
 		d_printf("failed to test wrong credentials on SAMR interface\n");
 		return False;
diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c
index 36f43394cb..720246ed7e 100644
--- a/source4/torture/libnet/libnet_share.c
+++ b/source4/torture/libnet/libnet_share.c
@@ -224,7 +224,7 @@ BOOL torture_delshare(struct torture_context *torture)
 
 	status = torture_rpc_connection(mem_ctx,
 					&p,
-					&dcerpc_table_srvsvc);
+					&ndr_table_srvsvc);
 
 	if (!test_addshare(p, mem_ctx, host, TEST_SHARENAME)) {
 		ret = False;
diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c
index f501349373..03092d5c67 100644
--- a/source4/torture/libnet/libnet_user.c
+++ b/source4/torture/libnet/libnet_user.c
@@ -298,7 +298,7 @@ BOOL torture_deleteuser(struct torture_context *torture)
 
 	status = torture_rpc_connection(prep_mem_ctx,
 					&p,
-					&dcerpc_table_samr);
+					&ndr_table_samr);
 	if (!NT_STATUS_IS_OK(status)) {
 		ret = False;
 		goto done;
@@ -485,7 +485,7 @@ BOOL torture_modifyuser(struct torture_context *torture)
 
 	status = torture_rpc_connection(prep_mem_ctx,
 					&p,
-					&dcerpc_table_samr);
+					&ndr_table_samr);
 	if (!NT_STATUS_IS_OK(status)) {
 		ret = False;
 		goto done;
@@ -626,7 +626,7 @@ BOOL torture_userinfo_api(struct torture_context *torture)
 
 	status = torture_rpc_connection(prep_mem_ctx,
 					&p,
-					&dcerpc_table_samr);
+					&ndr_table_samr);
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
 	}
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 42050419f9..f7aa479952 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -316,7 +316,7 @@ BOOL torture_userinfo(struct torture_context *torture)
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,
-					&dcerpc_table_samr);
+					&ndr_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 7ffbe43fbb..cdc8bf0c52 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -491,7 +491,7 @@ BOOL torture_useradd(struct torture_context *torture)
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,
-					&dcerpc_table_samr);
+					&ndr_table_samr);
 	
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
@@ -550,7 +550,7 @@ BOOL torture_userdel(struct torture_context *torture)
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,
-					&dcerpc_table_samr);
+					&ndr_table_samr);
 	
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
@@ -595,7 +595,7 @@ BOOL torture_usermod(struct torture_context *torture)
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,
-					&dcerpc_table_samr);
+					&ndr_table_samr);
 	
 	if (!NT_STATUS_IS_OK(status)) {
 		ret = False;