summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-11-25 20:03:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:06:09 -0500
commite90061865467600a9d8a34f92e60a296cbf19234 (patch)
tree55919aa76141d312b5c288326489dc7b77c81061 /source4/torture
parent3308087bae76a99c02687bd11f4237d803f9f605 (diff)
downloadsamba-e90061865467600a9d8a34f92e60a296cbf19234.tar.gz
samba-e90061865467600a9d8a34f92e60a296cbf19234.tar.bz2
samba-e90061865467600a9d8a34f92e60a296cbf19234.zip
r3972: use GUID_* naming context and move GUID_* functions to one place
metze (This used to be commit 523e6acf4fec5d4946fa7c0c89f40d7d712c9f3a)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/rpc/oxidresolve.c2
-rw-r--r--source4/torture/rpc/remact.c2
-rw-r--r--source4/torture/rpc/testjoin.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 18cda418d0..cbd287b453 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -38,7 +38,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, HYP
ZERO_STRUCT(r.in);
r.in.this.version.MajorVersion = 5;
r.in.this.version.MinorVersion = 1;
- uuid_generate_random(&r.in.this.cid);
+ r.in.this.cid = GUID_random();
GUID_from_string(CLSID_SIMPLE, &r.in.Clsid);
r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
r.in.num_protseqs = 3;
diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 2e09f84da6..897dd78255 100644
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -37,7 +37,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
ZERO_STRUCT(r.in);
r.in.this.version.MajorVersion = 5;
r.in.this.version.MinorVersion = 1;
- uuid_generate_random(&r.in.this.cid);
+ r.in.this.cid = GUID_random();
GUID_from_string(CLSID_SIMPLE, &r.in.Clsid);
r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
r.in.num_protseqs = 3;
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 2568f16323..9636b27932 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -259,7 +259,7 @@ void torture_leave_domain(struct test_join *join)
struct samr_DeleteUser d;
NTSTATUS status;
- if (!uuid_all_zero(&join->user_handle.uuid)) {
+ if (!GUID_all_zero(&join->user_handle.uuid)) {
d.in.user_handle = &join->user_handle;
d.out.user_handle = &join->user_handle;