summaryrefslogtreecommitdiff
path: root/source4/torture/libnet
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-07-08 08:09:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:19:22 -0500
commit0b92507760910872d5f0f3fe2c45f4f3af3466eb (patch)
tree51959d4c79538b6ab8c9bb4db8df9d1992437272 /source4/torture/libnet
parentc851532bece629e114382e2c3571a18bf9b42be4 (diff)
downloadsamba-0b92507760910872d5f0f3fe2c45f4f3af3466eb.tar.gz
samba-0b92507760910872d5f0f3fe2c45f4f3af3466eb.tar.bz2
samba-0b92507760910872d5f0f3fe2c45f4f3af3466eb.zip
r8232: remove samr_String and netr_String as they are the same as lsa_String
metze (This used to be commit e601042c07d7b6eed0dc34e5b136d9266b8a0f81)
Diffstat (limited to 'source4/torture/libnet')
-rw-r--r--source4/torture/libnet/domain.c4
-rw-r--r--source4/torture/libnet/libnet_user.c2
-rw-r--r--source4/torture/libnet/userinfo.c8
-rw-r--r--source4/torture/libnet/userman.c10
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;