3 files changed, 24 insertions, 24 deletions

diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index e792cad674..e36a21d2c6 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -29,14 +29,14 @@ static BOOL test_domainopen(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			    struct policy_handle *domain_handle)
 {
 	NTSTATUS status;
-	struct rpc_composite_domain_open io;
+	struct libnet_rpc_domain_open io;
 	
 	printf("opening domain\n");
 	
 	io.in.domain_name  = talloc_strdup(mem_ctx, domname->string);
 	io.in.access_mask  = SEC_FLAG_MAXIMUM_ALLOWED;
 
-	status = rpc_composite_domain_open(p, mem_ctx, &io);
+	status = libnet_rpc_domain_open(p, mem_ctx, &io);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Composite domain open failed - %s\n", nt_errstr(status));
 		return False;
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index eefd939164..6dad86178f 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -184,7 +184,7 @@ static BOOL test_userinfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			  uint32_t *rid)
 {
 	NTSTATUS status;
-	struct rpc_composite_userinfo user;
+	struct libnet_rpc_userinfo user;
 	struct dom_sid *user_sid;
 	
 	user_sid = dom_sid_add_rid(mem_ctx, domain_sid, *rid);
@@ -193,10 +193,10 @@ static BOOL test_userinfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	user.in.sid           = dom_sid_string(mem_ctx, user_sid);
 	user.in.level         = 5;       /* this should be extended */
 
-	printf("Testing sync rpc_composite_userinfo\n");
-	status = rpc_composite_userinfo(p, mem_ctx, &user);
+	printf("Testing sync libnet_rpc_userinfo\n");
+	status = libnet_rpc_userinfo(p, mem_ctx, &user);
 	if (!NT_STATUS_IS_OK(status)) {
-		printf("Failed to call sync rpc_composite_userinfo - %s\n", nt_errstr(status));
+		printf("Failed to call sync libnet_rpc_userinfo - %s\n", nt_errstr(status));
 		return False;
 	}
 
@@ -228,7 +228,7 @@ static BOOL test_userinfo_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct composite_context *c;
-	struct rpc_composite_userinfo user;
+	struct libnet_rpc_userinfo user;
 	struct dom_sid *user_sid;
 
 	user_sid = dom_sid_add_rid(mem_ctx, domain_sid, *rid);
@@ -237,17 +237,17 @@ static BOOL test_userinfo_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	user.in.sid           = dom_sid_string(mem_ctx, user_sid);
 	user.in.level         = 10;       /* this should be extended */
 
-	printf("Testing async rpc_composite_userinfo\n");
+	printf("Testing async libnet_rpc_userinfo\n");
 
-	c = rpc_composite_userinfo_send(p, &user, msg_handler);
+	c = libnet_rpc_userinfo_send(p, &user, msg_handler);
 	if (!c) {
-		printf("Failed to call sync rpc_composite_userinfo_send\n");
+		printf("Failed to call sync libnet_rpc_userinfo_send\n");
 		return False;
 	}
 
-	status = rpc_composite_userinfo_recv(c, mem_ctx, &user);
+	status = libnet_rpc_userinfo_recv(c, mem_ctx, &user);
 	if (!NT_STATUS_IS_OK(status)) {
-		printf("Calling async rpc_composite_userinfo failed - %s\n", nt_errstr(status));
+		printf("Calling async libnet_rpc_userinfo failed - %s\n", nt_errstr(status));
 		return False;
 	}
 
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index be87c1373b..b308bfa0b5 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -84,14 +84,14 @@ static BOOL test_useradd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	BOOL ret = True;
-	struct rpc_composite_useradd user;
+	struct libnet_rpc_useradd user;
 	
 	user.in.domain_handle = *domain_handle;
 	user.in.username      = name;
 
-	printf("Testing rpc_composite_useradd\n");
+	printf("Testing libnet_rpc_useradd\n");
 
-	status = rpc_composite_useradd(p, mem_ctx, &user);
+	status = libnet_rpc_useradd(p, mem_ctx, &user);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Failed to call sync rpc_composite_userinfo - %s\n", nt_errstr(status));
 		return False;
@@ -116,22 +116,22 @@ static BOOL test_useradd_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct composite_context *c;
-	struct rpc_composite_useradd user;
+	struct libnet_rpc_useradd user;
 
 	user.in.domain_handle = *handle;
 	user.in.username      = username;
 	
-	printf("Testing async rpc_composite_useradd\n");
+	printf("Testing async libnet_rpc_useradd\n");
 	
-	c = rpc_composite_useradd_send(p, &user, msg_handler);
+	c = libnet_rpc_useradd_send(p, &user, msg_handler);
 	if (!c) {
-		printf("Failed to call async rpc_composite_useradd\n");
+		printf("Failed to call async libnet_rpc_useradd\n");
 		return False;
 	}
 
-	status = rpc_composite_useradd_recv(c, mem_ctx, &user);
+	status = libnet_rpc_useradd_recv(c, mem_ctx, &user);
 	if (!NT_STATUS_IS_OK(status)) {
-		printf("Calling async rpc_composite_useradd failed - %s\n", nt_errstr(status));
+		printf("Calling async libnet_rpc_useradd failed - %s\n", nt_errstr(status));
 		return False;
 	}
 
@@ -256,14 +256,14 @@ static BOOL test_userdel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			 struct policy_handle *handle, const char *username)
 {
 	NTSTATUS status;
-	struct rpc_composite_userdel user;
+	struct libnet_rpc_userdel user;
 	
 	user.in.domain_handle = *handle;
 	user.in.username = username;
 	
-	status = rpc_composite_userdel(p, mem_ctx, &user);
+	status = libnet_rpc_userdel(p, mem_ctx, &user);
 	if (!NT_STATUS_IS_OK(status)) {
-		printf("Failed to call sync rpc_composite_userdel - %s\n", nt_errstr(status));
+		printf("Failed to call sync libnet_rpc_userdel - %s\n", nt_errstr(status));
 		return False;
 	}