r25377: Simplify code a little by employing commonly used functions.
authorRafal Szczesniak <mimir@samba.org>
Thu, 27 Sep 2007 15:51:07 +0000 (15:51 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 20:07:22 +0000 (15:07 -0500)
rafal
(This used to be commit f0be9939cd83d8568d6b7f0540fb73ab530243f7)

source4/torture/libnet/groupinfo.c
source4/torture/libnet/groupman.c
source4/torture/libnet/userinfo.c
source4/torture/libnet/userman.c

index 9be25115655876fdd2a69b4994d8b4dc4342a85d..3efd3f2e853a0e2e9ac5c35c8940353bf90ebb79 100644 (file)
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "param/param.h"
+#include "torture/libnet/utils.h"
 
 #define TEST_GROUPNAME  "libnetgroupinfotest"
 
 
-static BOOL test_opendomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-                           struct policy_handle *handle, struct lsa_String *domname,
-                           struct dom_sid2 *sid)
-{
-       NTSTATUS status;
-       struct policy_handle h, domain_handle;
-       struct samr_Connect r1;
-       struct samr_LookupDomain r2;
-       struct samr_OpenDomain r3;
-       
-       printf("connecting\n");
-       
-       r1.in.system_name = 0;
-       r1.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-       r1.out.connect_handle = &h;
-       
-       status = dcerpc_samr_Connect(p, mem_ctx, &r1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("Connect failed - %s\n", nt_errstr(status));
-               return False;
-       }
-       
-       r2.in.connect_handle = &h;
-       r2.in.domain_name = domname;
-
-       printf("domain lookup on %s\n", domname->string);
-
-       status = dcerpc_samr_LookupDomain(p, mem_ctx, &r2);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("LookupDomain failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       r3.in.connect_handle = &h;
-       r3.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-       r3.in.sid = r2.out.sid;
-       r3.out.domain_handle = &domain_handle;
-
-       printf("opening domain\n");
-
-       status = dcerpc_samr_OpenDomain(p, mem_ctx, &r3);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("OpenDomain failed - %s\n", nt_errstr(status));
-               return False;
-       } else {
-               *handle = domain_handle;
-       }
-
-       *sid = *r2.out.sid;
-       return True;
-}
-
-
-static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-                        struct policy_handle *domain_handle, const char *groupname)
-{
-       NTSTATUS status;
-       struct samr_LookupNames r1;
-       struct samr_OpenGroup r2;
-       struct samr_DeleteDomainGroup r3;
-       struct lsa_String names[2];
-       uint32_t rid;
-       struct policy_handle group_handle;
-
-       names[0].string = groupname;
-
-       r1.in.domain_handle  = domain_handle;
-       r1.in.num_names      = 1;
-       r1.in.names          = names;
-       
-       printf("group account lookup '%s'\n", groupname);
-
-       status = dcerpc_samr_LookupNames(p, mem_ctx, &r1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("LookupNames failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       rid = r1.out.rids.ids[0];
-       
-       r2.in.domain_handle  = domain_handle;
-       r2.in.access_mask    = SEC_FLAG_MAXIMUM_ALLOWED;
-       r2.in.rid            = rid;
-       r2.out.group_handle  = &group_handle;
-
-       printf("opening group account\n");
-
-       status = dcerpc_samr_OpenGroup(p, mem_ctx, &r2);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("OpenUser failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       r3.in.group_handle  = &group_handle;
-       r3.out.group_handle = &group_handle;
-
-       printf("deleting group account\n");
-       
-       status = dcerpc_samr_DeleteDomainGroup(p, mem_ctx, &r3);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("DeleteGroup failed - %s\n", nt_errstr(status));
-               return False;
-       }
-       
-       return True;
-}
-
-
-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 lsa_String groupname;
-       struct samr_CreateDomainGroup r;
-       struct policy_handle group_handle;
-       
-       groupname.string = name;
-       
-       r.in.domain_handle  = handle;
-       r.in.name           = &groupname;
-       r.in.access_mask    = SEC_FLAG_MAXIMUM_ALLOWED;
-       r.out.group_handle  = &group_handle;
-       r.out.rid           = rid;
-
-       printf("creating group account %s\n", name);
-
-       status = dcerpc_samr_CreateDomainGroup(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("CreateGroup failed - %s\n", nt_errstr(status));
-
-               if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
-                       printf("Group (%s) already exists - attempting to delete and recreate account again\n", name);
-                       if (!test_cleanup(p, mem_ctx, handle, TEST_GROUPNAME)) {
-                               return False;
-                       }
-
-                       printf("creating group account\n");
-                       
-                       status = dcerpc_samr_CreateDomainGroup(p, mem_ctx, &r);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               printf("CreateGroup failed - %s\n", nt_errstr(status));
-                               return False;
-                       }
-                       return True;
-               }
-               return False;
-       }
-
-       return True;
-}
-
-
 static BOOL test_groupinfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                           struct policy_handle *domain_handle,
                           struct dom_sid2 *domain_sid, const char* group_name,
@@ -252,7 +101,7 @@ BOOL torture_groupinfo(struct torture_context *torture)
                goto done;
        }
 
-       if (!test_create(p, mem_ctx, &h, TEST_GROUPNAME, &rid)) {
+       if (!test_group_create(p, mem_ctx, &h, TEST_GROUPNAME, &rid)) {
                ret = False;
                goto done;
        }
@@ -262,7 +111,7 @@ BOOL torture_groupinfo(struct torture_context *torture)
                goto done;
        }
 
-       if (!test_cleanup(p, mem_ctx, &h, TEST_GROUPNAME)) {
+       if (!test_group_cleanup(p, mem_ctx, &h, TEST_GROUPNAME)) {
                ret = False;
                goto done;
        }
index ba8fad89a0a7d41b94bdce7455df76b3d2cdc8e8..0db89f49607b543e54df7ac705006edce72c551c 100644 (file)
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "param/param.h"
-
-
-static BOOL test_opendomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-                           struct policy_handle *handle, struct lsa_String *domname)
-{
-       NTSTATUS status;
-       struct policy_handle h, domain_handle;
-       struct samr_Connect r1;
-       struct samr_LookupDomain r2;
-       struct samr_OpenDomain r3;
-       
-       printf("connecting\n");
-       
-       r1.in.system_name = 0;
-       r1.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-       r1.out.connect_handle = &h;
-       
-       status = dcerpc_samr_Connect(p, mem_ctx, &r1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("Connect failed - %s\n", nt_errstr(status));
-               return False;
-       }
-       
-       r2.in.connect_handle = &h;
-       r2.in.domain_name = domname;
-
-       printf("domain lookup on %s\n", domname->string);
-
-       status = dcerpc_samr_LookupDomain(p, mem_ctx, &r2);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("LookupDomain failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       r3.in.connect_handle = &h;
-       r3.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-       r3.in.sid = r2.out.sid;
-       r3.out.domain_handle = &domain_handle;
-
-       printf("opening domain\n");
-
-       status = dcerpc_samr_OpenDomain(p, mem_ctx, &r3);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("OpenDomain failed - %s\n", nt_errstr(status));
-               return False;
-       } else {
-               *handle = domain_handle;
-       }
-
-       return True;
-}
-
-
-static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-                        struct policy_handle *domain_handle, const char *groupname)
-{
-       NTSTATUS status;
-       struct samr_LookupNames r1;
-       struct samr_OpenGroup r2;
-       struct samr_DeleteDomainGroup r3;
-       struct lsa_String names[2];
-       uint32_t rid;
-       struct policy_handle group_handle;
-
-       names[0].string = groupname;
-
-       r1.in.domain_handle  = domain_handle;
-       r1.in.num_names      = 1;
-       r1.in.names          = names;
-       
-       printf("group account lookup '%s'\n", groupname);
-
-       status = dcerpc_samr_LookupNames(p, mem_ctx, &r1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("LookupNames failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       rid = r1.out.rids.ids[0];
-       
-       r2.in.domain_handle  = domain_handle;
-       r2.in.access_mask    = SEC_FLAG_MAXIMUM_ALLOWED;
-       r2.in.rid            = rid;
-       r2.out.group_handle   = &group_handle;
-
-       printf("opening group account\n");
-
-       status = dcerpc_samr_OpenGroup(p, mem_ctx, &r2);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("OpenGroup failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       r3.in.group_handle  = &group_handle;
-       r3.out.group_handle = &group_handle;
-
-       printf("deleting group account\n");
-       
-       status = dcerpc_samr_DeleteDomainGroup(p, mem_ctx, &r3);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("DeleteGroup failed - %s\n", nt_errstr(status));
-               return False;
-       }
-       
-       return True;
-}
+#include "torture/libnet/utils.h"
 
 
 static BOOL test_groupadd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
@@ -161,6 +56,7 @@ BOOL torture_groupadd(struct torture_context *torture)
        struct dcerpc_pipe *p;
        struct policy_handle h;
        struct lsa_String domain_name;
+       struct dom_sid2 sid;
        const char *name = TEST_GROUPNAME;
        TALLOC_CTX *mem_ctx;
        BOOL ret = True;
@@ -176,7 +72,7 @@ BOOL torture_groupadd(struct torture_context *torture)
        }
 
        domain_name.string = lp_workgroup();
-       if (!test_opendomain(p, mem_ctx, &h, &domain_name)) {
+       if (!test_opendomain(p, mem_ctx, &h, &domain_name, &sid)) {
                ret = False;
                goto done;
        }
@@ -186,7 +82,7 @@ BOOL torture_groupadd(struct torture_context *torture)
                goto done;
        }
 
-       if (!test_cleanup(p, mem_ctx, &h, name)) {
+       if (!test_group_cleanup(p, mem_ctx, &h, name)) {
                ret = False;
                goto done;
        }
index 314bc6d4dafa1160587b0b92b19065d46c332b7d..b53965b91ec385c168a02b777517dc8c74066a41 100644 (file)
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "param/param.h"
-
-#define TEST_USERNAME  "libnetuserinfotest"
-
-static BOOL test_opendomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-                           struct policy_handle *handle, struct lsa_String *domname,
-                           struct dom_sid2 *sid)
-{
-       NTSTATUS status;
-       struct policy_handle h, domain_handle;
-       struct samr_Connect r1;
-       struct samr_LookupDomain r2;
-       struct samr_OpenDomain r3;
-       
-       printf("connecting\n");
-       
-       r1.in.system_name = 0;
-       r1.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-       r1.out.connect_handle = &h;
-       
-       status = dcerpc_samr_Connect(p, mem_ctx, &r1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("Connect failed - %s\n", nt_errstr(status));
-               return False;
-       }
-       
-       r2.in.connect_handle = &h;
-       r2.in.domain_name = domname;
-
-       printf("domain lookup on %s\n", domname->string);
-
-       status = dcerpc_samr_LookupDomain(p, mem_ctx, &r2);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("LookupDomain failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       r3.in.connect_handle = &h;
-       r3.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-       r3.in.sid = r2.out.sid;
-       r3.out.domain_handle = &domain_handle;
-
-       printf("opening domain\n");
-
-       status = dcerpc_samr_OpenDomain(p, mem_ctx, &r3);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("OpenDomain failed - %s\n", nt_errstr(status));
-               return False;
-       } else {
-               *handle = domain_handle;
-       }
-
-       *sid = *r2.out.sid;
-       return True;
-}
-
-
-static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-                        struct policy_handle *domain_handle, const char *username)
-{
-       NTSTATUS status;
-       struct samr_LookupNames r1;
-       struct samr_OpenUser r2;
-       struct samr_DeleteUser r3;
-       struct lsa_String names[2];
-       uint32_t rid;
-       struct policy_handle user_handle;
-
-       names[0].string = username;
-
-       r1.in.domain_handle  = domain_handle;
-       r1.in.num_names      = 1;
-       r1.in.names          = names;
-       
-       printf("user account lookup '%s'\n", username);
-
-       status = dcerpc_samr_LookupNames(p, mem_ctx, &r1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("LookupNames failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       rid = r1.out.rids.ids[0];
-       
-       r2.in.domain_handle  = domain_handle;
-       r2.in.access_mask    = SEC_FLAG_MAXIMUM_ALLOWED;
-       r2.in.rid            = rid;
-       r2.out.user_handle   = &user_handle;
-
-       printf("opening user account\n");
-
-       status = dcerpc_samr_OpenUser(p, mem_ctx, &r2);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("OpenUser failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       r3.in.user_handle  = &user_handle;
-       r3.out.user_handle = &user_handle;
-
-       printf("deleting user account\n");
-       
-       status = dcerpc_samr_DeleteUser(p, mem_ctx, &r3);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("DeleteUser failed - %s\n", nt_errstr(status));
-               return False;
-       }
-       
-       return True;
-}
+#include "torture/libnet/utils.h"
 
 
-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 lsa_String username;
-       struct samr_CreateUser r;
-       struct policy_handle user_handle;
-       
-       username.string = name;
-       
-       r.in.domain_handle = handle;
-       r.in.account_name  = &username;
-       r.in.access_mask   = SEC_FLAG_MAXIMUM_ALLOWED;
-       r.out.user_handle  = &user_handle;
-       r.out.rid          = rid;
-
-       printf("creating user account %s\n", name);
-
-       status = dcerpc_samr_CreateUser(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("CreateUser failed - %s\n", nt_errstr(status));
-
-               if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
-                       printf("User (%s) already exists - attempting to delete and recreate account again\n", name);
-                       if (!test_cleanup(p, mem_ctx, handle, TEST_USERNAME)) {
-                               return False;
-                       }
-
-                       printf("creating user account\n");
-                       
-                       status = dcerpc_samr_CreateUser(p, mem_ctx, &r);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               printf("CreateUser failed - %s\n", nt_errstr(status));
-                               return False;
-                       }
-                       return True;
-               }
-               return False;
-       }
-
-       return True;
-}
+#define TEST_USERNAME  "libnetuserinfotest"
 
 
 static BOOL test_userinfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
@@ -220,30 +71,6 @@ static BOOL test_userinfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
-static void msg_handler(struct monitor_msg *m)
-{
-       struct msg_rpc_open_user *msg_open;
-       struct msg_rpc_query_user *msg_query;
-       struct msg_rpc_close_user *msg_close;
-
-       switch (m->type) {
-       case mon_SamrOpenUser:
-               msg_open = (struct msg_rpc_open_user*)m->data;
-               printf("monitor_msg: user opened (rid=%d, access_mask=0x%08x)\n",
-                      msg_open->rid, msg_open->access_mask);
-               break;
-       case mon_SamrQueryUser:
-               msg_query = (struct msg_rpc_query_user*)m->data;
-               printf("monitor_msg: user queried (level=%d)\n", msg_query->level);
-               break;
-       case mon_SamrCloseUser:
-               msg_close = (struct msg_rpc_close_user*)m->data;
-               printf("monitor_msg: user closed (rid=%d)\n", msg_close->rid);
-               break;
-       }
-}
-
-
 static BOOL test_userinfo_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                                struct policy_handle *domain_handle,
                                struct dom_sid2 *domain_sid, const char* user_name,
@@ -331,7 +158,7 @@ bool torture_userinfo(struct torture_context *torture)
                goto done;
        }
 
-       if (!test_create(p, mem_ctx, &h, TEST_USERNAME, &rid)) {
+       if (!test_user_create(p, mem_ctx, &h, TEST_USERNAME, &rid)) {
                ret = False;
                goto done;
        }
@@ -341,7 +168,7 @@ bool torture_userinfo(struct torture_context *torture)
                goto done;
        }
 
-       if (!test_cleanup(p, mem_ctx, &h, TEST_USERNAME)) {
+       if (!test_user_cleanup(p, mem_ctx, &h, TEST_USERNAME)) {
                ret = False;
                goto done;
        }
@@ -354,7 +181,7 @@ bool torture_userinfo(struct torture_context *torture)
                goto done;
        }
 
-       if (!test_create(p, mem_ctx, &h, TEST_USERNAME, &rid)) {
+       if (!test_user_create(p, mem_ctx, &h, TEST_USERNAME, &rid)) {
                ret = False;
                goto done;
        }
@@ -364,7 +191,7 @@ bool torture_userinfo(struct torture_context *torture)
                goto done;
        }
 
-       if (!test_cleanup(p, mem_ctx, &h, TEST_USERNAME)) {
+       if (!test_user_cleanup(p, mem_ctx, &h, TEST_USERNAME)) {
                ret = False;
                goto done;
        }
index 51e0016ea09ace5cf3f1c69c6a035040b74377ca..fbd0a124f0a267ae75206aa22baa3f34c7cccc01 100644 (file)
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "param/param.h"
-
-
-static BOOL test_opendomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-                           struct policy_handle *handle, struct lsa_String *domname)
-{
-       NTSTATUS status;
-       struct policy_handle h, domain_handle;
-       struct samr_Connect r1;
-       struct samr_LookupDomain r2;
-       struct samr_OpenDomain r3;
-       
-       printf("connecting\n");
-       
-       r1.in.system_name = 0;
-       r1.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-       r1.out.connect_handle = &h;
-       
-       status = dcerpc_samr_Connect(p, mem_ctx, &r1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("Connect failed - %s\n", nt_errstr(status));
-               return False;
-       }
-       
-       r2.in.connect_handle = &h;
-       r2.in.domain_name = domname;
-
-       printf("domain lookup on %s\n", domname->string);
-
-       status = dcerpc_samr_LookupDomain(p, mem_ctx, &r2);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("LookupDomain failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       r3.in.connect_handle = &h;
-       r3.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-       r3.in.sid = r2.out.sid;
-       r3.out.domain_handle = &domain_handle;
-
-       printf("opening domain\n");
-
-       status = dcerpc_samr_OpenDomain(p, mem_ctx, &r3);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("OpenDomain failed - %s\n", nt_errstr(status));
-               return False;
-       } else {
-               *handle = domain_handle;
-       }
-
-       return True;
-}
+#include "torture/libnet/utils.h"
 
 
 static BOOL test_useradd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
@@ -92,7 +42,7 @@ static BOOL test_useradd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        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));
+               printf("Failed to call libnet_rpc_useradd - %s\n", nt_errstr(status));
                return False;
        }
        
@@ -100,19 +50,6 @@ static BOOL test_useradd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
-static void msg_handler(struct monitor_msg *m)
-{
-       struct msg_rpc_create_user *msg_create;
-
-       switch (m->type) {
-       case mon_SamrCreateUser:
-               msg_create = (struct msg_rpc_create_user*)m->data;
-               printf("monitor_msg: user created (rid=%d)\n", msg_create->rid);
-               break;
-       }
-}
-
-
 static BOOL test_useradd_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                               struct policy_handle *handle, const char* username)
 {
@@ -142,118 +79,6 @@ static BOOL test_useradd_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
-static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-                        struct policy_handle *domain_handle, const char *username)
-{
-       NTSTATUS status;
-       struct samr_LookupNames r1;
-       struct samr_OpenUser r2;
-       struct samr_DeleteUser r3;
-       struct lsa_String names[2];
-       uint32_t rid;
-       struct policy_handle user_handle;
-
-       names[0].string = username;
-
-       r1.in.domain_handle  = domain_handle;
-       r1.in.num_names      = 1;
-       r1.in.names          = names;
-       
-       printf("user account lookup '%s'\n", username);
-
-       status = dcerpc_samr_LookupNames(p, mem_ctx, &r1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("LookupNames failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       rid = r1.out.rids.ids[0];
-       
-       r2.in.domain_handle  = domain_handle;
-       r2.in.access_mask    = SEC_FLAG_MAXIMUM_ALLOWED;
-       r2.in.rid            = rid;
-       r2.out.user_handle   = &user_handle;
-
-       printf("opening user account\n");
-
-       status = dcerpc_samr_OpenUser(p, mem_ctx, &r2);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("OpenUser failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       r3.in.user_handle  = &user_handle;
-       r3.out.user_handle = &user_handle;
-
-       printf("deleting user account\n");
-       
-       status = dcerpc_samr_DeleteUser(p, mem_ctx, &r3);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("DeleteUser failed - %s\n", nt_errstr(status));
-               return False;
-       }
-       
-       return True;
-}
-
-
-static BOOL test_createuser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-                           struct policy_handle *handle, const char* user)
-{
-       NTSTATUS status;
-       struct policy_handle user_handle;
-       struct lsa_String username;
-       struct samr_CreateUser r1;
-       struct samr_Close r2;
-       uint32_t user_rid;
-
-       username.string = user;
-       
-       r1.in.domain_handle = handle;
-       r1.in.account_name = &username;
-       r1.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-       r1.out.user_handle = &user_handle;
-       r1.out.rid = &user_rid;
-
-       printf("creating user '%s'\n", username.string);
-       
-       status = dcerpc_samr_CreateUser(p, mem_ctx, &r1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("CreateUser failed - %s\n", nt_errstr(status));
-
-               if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
-                       printf("User (%s) already exists - attempting to delete and recreate account again\n", user);
-                       if (!test_cleanup(p, mem_ctx, handle, TEST_USERNAME)) {
-                               return False;
-                       }
-
-                       printf("creating user account\n");
-                       
-                       status = dcerpc_samr_CreateUser(p, mem_ctx, &r1);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               printf("CreateUser failed - %s\n", nt_errstr(status));
-                               return False;
-                       }
-                       return True;
-               }               
-               return False;
-       }
-
-       r2.in.handle = &user_handle;
-       r2.out.handle = &user_handle;
-       
-       printf("closing user '%s'\n", username.string);
-
-       status = dcerpc_samr_Close(p, mem_ctx, &r2);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("Close failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       return True;
-}
-
-
 static BOOL test_usermod(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                         struct policy_handle *handle, int num_changes,
                         struct libnet_rpc_usermod *mod, char **username)
@@ -422,8 +247,11 @@ static BOOL test_userdel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                nttime_to_timeval(&t, i->fld); \
                if (timeval_compare(&t, mod->in.change.fld)) { \
                        printf("'%s' field does not match\n", #fld); \
-                       printf("received: '%s (+%ld us)'\n", timestring(mem_ctx, t.tv_sec), t.tv_usec); \
-                       printf("expected: '%s (+%ld us)'\n", timestring(mem_ctx, mod->in.change.fld->tv_sec), mod->in.change.fld->tv_usec); \
+                       printf("received: '%s (+%ld us)'\n", \
+                              timestring(mem_ctx, t.tv_sec), t.tv_usec); \
+                       printf("expected: '%s (+%ld us)'\n", \
+                              timestring(mem_ctx, mod->in.change.fld->tv_sec), \
+                              mod->in.change.fld->tv_usec); \
                        return False; \
                } \
        }
@@ -482,6 +310,7 @@ BOOL torture_useradd(struct torture_context *torture)
        struct dcerpc_pipe *p;
        struct policy_handle h;
        struct lsa_String domain_name;
+       struct dom_sid2 sid;
        const char *name = TEST_USERNAME;
        TALLOC_CTX *mem_ctx;
        BOOL ret = True;
@@ -497,7 +326,7 @@ BOOL torture_useradd(struct torture_context *torture)
        }
 
        domain_name.string = lp_workgroup();
-       if (!test_opendomain(p, mem_ctx, &h, &domain_name)) {
+       if (!test_opendomain(p, mem_ctx, &h, &domain_name, &sid)) {
                ret = False;
                goto done;
        }
@@ -507,12 +336,12 @@ BOOL torture_useradd(struct torture_context *torture)
                goto done;
        }
 
-       if (!test_cleanup(p, mem_ctx, &h, name)) {
+       if (!test_user_cleanup(p, mem_ctx, &h, name)) {
                ret = False;
                goto done;
        }
 
-       if (!test_opendomain(p, mem_ctx, &h, &domain_name)) {
+       if (!test_opendomain(p, mem_ctx, &h, &domain_name, &sid)) {
                ret = False;
                goto done;
        }
@@ -522,7 +351,7 @@ BOOL torture_useradd(struct torture_context *torture)
                goto done;
        }
 
-       if (!test_cleanup(p, mem_ctx, &h, name)) {
+       if (!test_user_cleanup(p, mem_ctx, &h, name)) {
                ret = False;
                goto done;
        }
@@ -539,6 +368,8 @@ bool torture_userdel(struct torture_context *torture)
        struct dcerpc_pipe *p;
        struct policy_handle h;
        struct lsa_String domain_name;
+       struct dom_sid2 sid;
+       uint32_t rid;
        const char *name = TEST_USERNAME;
        TALLOC_CTX *mem_ctx;
        BOOL ret = True;
@@ -554,12 +385,12 @@ bool torture_userdel(struct torture_context *torture)
        }
 
        domain_name.string = lp_workgroup();
-       if (!test_opendomain(p, mem_ctx, &h, &domain_name)) {
+       if (!test_opendomain(p, mem_ctx, &h, &domain_name, &sid)) {
                ret = False;
                goto done;
        }
 
-       if (!test_createuser(p, mem_ctx, &h, name)) {
+       if (!test_user_create(p, mem_ctx, &h, name, &rid)) {
                ret = False;
                goto done;
        }
@@ -581,6 +412,8 @@ BOOL torture_usermod(struct torture_context *torture)
        struct dcerpc_pipe *p;
        struct policy_handle h;
        struct lsa_String domain_name;
+       struct dom_sid2 sid;
+       uint32_t rid;
        int i;
        char *name;
        TALLOC_CTX *mem_ctx;
@@ -600,12 +433,12 @@ BOOL torture_usermod(struct torture_context *torture)
        domain_name.string = lp_workgroup();
        name = talloc_strdup(mem_ctx, TEST_USERNAME);
 
-       if (!test_opendomain(p, mem_ctx, &h, &domain_name)) {
+       if (!test_opendomain(p, mem_ctx, &h, &domain_name, &sid)) {
                ret = False;
                goto done;
        }
 
-       if (!test_createuser(p, mem_ctx, &h, name)) {
+       if (!test_user_create(p, mem_ctx, &h, name, &rid)) {
                ret = False;
                goto done;
        }
@@ -625,7 +458,7 @@ BOOL torture_usermod(struct torture_context *torture)
        }
        
 cleanup:       
-       if (!test_cleanup(p, mem_ctx, &h, name)) {
+       if (!test_user_cleanup(p, mem_ctx, &h, name)) {
                ret = False;
                goto done;
        }