r8232: remove samr_String and netr_String as they are the same as lsa_String

metze
(This used to be commit e601042c07d7b6eed0dc34e5b136d9266b8a0f81)

4 files changed, 12 insertions, 12 deletions

diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index e36a21d2c6..7edbd5742d 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -25,7 +25,7 @@
 #include "libcli/composite/monitor.h"
 
 static BOOL test_domainopen(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			    struct samr_String *domname,
+			    struct lsa_String *domname,
 			    struct policy_handle *domain_handle)
 {
 	NTSTATUS status;
@@ -77,7 +77,7 @@ BOOL torture_domainopen(void)
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
 	struct policy_handle h;
-	struct samr_String name;
+	struct lsa_String name;
 
 	mem_ctx = talloc_init("test_domain_open");
 	binding = lp_parm_string(-1, "torture", "binding");
diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c
index 38cc81926f..4db0028481 100644
--- a/source4/torture/libnet/libnet_user.c
+++ b/source4/torture/libnet/libnet_user.c
@@ -38,7 +38,7 @@ static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct samr_OpenUser r2;
 	struct samr_DeleteUser r3;
 	struct samr_Close r4;
-	struct samr_String names[2];
+	struct lsa_String names[2];
 	uint32_t rid;
 	struct policy_handle user_handle;
 
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 6dad86178f..2dd60b02f1 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -27,7 +27,7 @@
 #define TEST_USERNAME  "libnetuserinfotest"
 
 static BOOL test_opendomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			    struct policy_handle *handle, struct samr_String *domname,
+			    struct policy_handle *handle, struct lsa_String *domname,
 			    struct dom_sid2 *sid)
 {
 	NTSTATUS status;
@@ -86,7 +86,7 @@ static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct samr_LookupNames r1;
 	struct samr_OpenUser r2;
 	struct samr_DeleteUser r3;
-	struct samr_String names[2];
+	struct lsa_String names[2];
 	uint32_t rid;
 	struct policy_handle user_handle;
 
@@ -138,7 +138,7 @@ static BOOL test_create(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			struct policy_handle *handle, const char *name, uint32_t *rid)
 {
 	NTSTATUS status;
-	struct samr_String username;
+	struct lsa_String username;
 	struct samr_CreateUser r;
 	struct policy_handle user_handle;
 	
@@ -263,7 +263,7 @@ BOOL torture_userinfo(void)
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
 	struct policy_handle h;
-	struct samr_String name;
+	struct lsa_String name;
 	struct dom_sid2 sid;
 	uint32_t rid;
 
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index f688336fd2..a5049691ed 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -28,7 +28,7 @@
 
 
 static BOOL test_opendomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			    struct policy_handle *handle, struct samr_String *domname)
+			    struct policy_handle *handle, struct lsa_String *domname)
 {
 	NTSTATUS status;
 	struct policy_handle h, domain_handle;
@@ -147,7 +147,7 @@ static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct samr_LookupNames r1;
 	struct samr_OpenUser r2;
 	struct samr_DeleteUser r3;
-	struct samr_String names[2];
+	struct lsa_String names[2];
 	uint32_t rid;
 	struct policy_handle user_handle;
 
@@ -200,7 +200,7 @@ static BOOL test_createuser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct policy_handle user_handle;
-	struct samr_String username;
+	struct lsa_String username;
 	struct samr_CreateUser r1;
 	struct samr_Close r2;
 	uint32_t user_rid;
@@ -277,7 +277,7 @@ BOOL torture_useradd(void)
 	const char *binding;
 	struct dcerpc_pipe *p;
 	struct policy_handle h;
-	struct samr_String domain_name;
+	struct lsa_String domain_name;
 	const char *name = TEST_USERNAME;
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
@@ -338,7 +338,7 @@ BOOL torture_userdel(void)
 	const char *binding;
 	struct dcerpc_pipe *p;
 	struct policy_handle h;
-	struct samr_String domain_name;
+	struct lsa_String domain_name;
 	const char *name = TEST_USERNAME;
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;