[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Tue Mar 16 08:36:16 MDT 2010


The branch, master has been updated
       via  cb5805d... s4:torture/rpc/winreg.c: make use of dcerpc_binding_handle stubs
       via  bffe222... s4:torture/rpc/spoolss_win.c: make use of dcerpc_binding_handle stubs
       via  b01cd78... s4:torture/rpc/spoolss_notify.c: make use of dcerpc_binding_handle stubs
       via  97d74a4... s4:torture/rpc/spoolss_notify.c: fix compiler warnings
       via  c1bf324... s4:torture/rpc/spoolss.c: make use of dcerpc_binding_handle stubs
       via  28a6e53... s4:tortore/rpc/spoolss.c: fix compiler warning
       via  d7699cb... s4:torture/rpc/autoidl.c: make use of dcerpc_binding_handle stubs
       via  d03286e... s4:torture/rpc/mgmt.c: make use of dcerpc_binding_handle stubs
       via  87a5596... s4:torture/rpc/remact.c: make use of dcerpc_binding_handle stubs
       via  54ab68f... s4:torture/rpc/oxidresolve.c: make use of dcerpc_binding_handle stubs
       via  8bc8e6c... s4:torture/rpc/initshutdown.c: make use of dcerpc_binding_handle stubs
       via  004a841... s4:torture/rpc/epmapper.c: make use of dcerpc_binding_handle stubs
       via  8c9b9d3... s4:torture/rpc/eventlog.c: make use of dcerpc_binding_handle stubs
       via  bdb8f91... s4:tortore/rpc/eventlog.c: rename variable 'b' => 'br'
       via  dfa92d4... s4:torture/rpc/svcctl.c: make use of dcerpc_binding_handle stubs
       via  b0ea324... s4:torture/rpc/atsvc.c: make use of dcerpc_binding_handle stubs
       via  b8605cd... s4:torture/rpc/wkssvc.c: make use of dcerpc_binding_handle stubs
       via  119f151... s4:torture/rpc/srvsvc.c: make use of dcerpc_binding_handle stubs
       via  88ab666... s4:torture/rpc/dsgetinfo.c: make use of dcerpc_binding_handle stubs
       via  4434b39... s4:torture/rpc/dssync.c: make use of dcerpc_binding_handle stubs
       via  369def8... s4:torture/rpc/drsuapi*: make use of dcerpc_binding_handle stubs
       via  6591713... s4:torture/rpc/unixinfo.c: make use of dcerpc_binding_handle stubs
      from  e55a975... s4-smbtorture: remove NotifyChangeKeyValue s3 skip in RPC-WINREG:

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cb5805d789d276f4bf13db75491099c9dde0f660
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 15 17:56:14 2010 +0100

    s4:torture/rpc/winreg.c: make use of dcerpc_binding_handle stubs
    
    metze

commit bffe22223062549fcaa16338a626b6f7c906a7ba
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Mar 12 11:09:00 2010 +0100

    s4:torture/rpc/spoolss_win.c: make use of dcerpc_binding_handle stubs
    
    metze

commit b01cd7864d3865655320e3441c2804d5bc4b404a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Mar 12 10:53:54 2010 +0100

    s4:torture/rpc/spoolss_notify.c: make use of dcerpc_binding_handle stubs
    
    metze

commit 97d74a4407940da43e776e50d7695da5206bf15b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Mar 12 10:53:15 2010 +0100

    s4:torture/rpc/spoolss_notify.c: fix compiler warnings
    
    metze

commit c1bf3244df7ca5261e9b649588f5587dab3f486d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 16 11:45:51 2010 +0100

    s4:torture/rpc/spoolss.c: make use of dcerpc_binding_handle stubs
    
    metze

commit 28a6e5398d762b4ad69e9e3d5be6677746057538
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 16 10:27:42 2010 +0100

    s4:tortore/rpc/spoolss.c: fix compiler warning
    
    metze

commit d7699cb24a3dc57e45f3296372ed1e25e08167d9
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 16 10:55:12 2010 +0100

    s4:torture/rpc/autoidl.c: make use of dcerpc_binding_handle stubs
    
    metze

commit d03286e078e0544238212d81e3aa73c40acdca89
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 16 10:43:39 2010 +0100

    s4:torture/rpc/mgmt.c: make use of dcerpc_binding_handle stubs
    
    metze

commit 87a5596d4654aacbd7b7821cc2cc96c818c1b344
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 16 10:42:58 2010 +0100

    s4:torture/rpc/remact.c: make use of dcerpc_binding_handle stubs
    
    metze

commit 54ab68f04317d79ca2ea5c6815e96dce3a336725
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 16 10:36:19 2010 +0100

    s4:torture/rpc/oxidresolve.c: make use of dcerpc_binding_handle stubs
    
    metze

commit 8bc8e6ca0390d92ac536624c8ca02c247be23755
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 16 10:32:56 2010 +0100

    s4:torture/rpc/initshutdown.c: make use of dcerpc_binding_handle stubs
    
    metze

commit 004a8413178f14825d7c7ab0a9bdfc37592bfb64
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 15 10:59:05 2010 +0100

    s4:torture/rpc/epmapper.c: make use of dcerpc_binding_handle stubs
    
    metze

commit 8c9b9d3336b9a51203fcf336879a5de93f204cea
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 15 10:55:00 2010 +0100

    s4:torture/rpc/eventlog.c: make use of dcerpc_binding_handle stubs
    
    metze

commit bdb8f9131493ea33918a444f30fa87caca13c9bd
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 15 10:53:50 2010 +0100

    s4:tortore/rpc/eventlog.c: rename variable 'b' => 'br'
    
    metze

commit dfa92d445fb568c4cae9c9853d0cd320b4aa0e35
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 15 10:50:12 2010 +0100

    s4:torture/rpc/svcctl.c: make use of dcerpc_binding_handle stubs
    
    metze

commit b0ea3248a4e6d384608330e1033e7fd9cf92c5c6
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 15 10:49:02 2010 +0100

    s4:torture/rpc/atsvc.c: make use of dcerpc_binding_handle stubs
    
    metze

commit b8605cdd4ed58376e93b9ed9d4436b5c8e8fe15b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 15 10:19:02 2010 +0100

    s4:torture/rpc/wkssvc.c: make use of dcerpc_binding_handle stubs
    
    metze

commit 119f15132184bd3fdaa664182135db2dfe1cdc37
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 15 10:08:04 2010 +0100

    s4:torture/rpc/srvsvc.c: make use of dcerpc_binding_handle stubs
    
    metze

commit 88ab666f191ce36b13e6628ca39b34b0e09a4088
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Mar 11 13:03:26 2010 +0100

    s4:torture/rpc/dsgetinfo.c: make use of dcerpc_binding_handle stubs
    
    metze

commit 4434b3972d4971b17b4e45fc51d6f91536ed1b66
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Mar 11 12:55:46 2010 +0100

    s4:torture/rpc/dssync.c: make use of dcerpc_binding_handle stubs
    
    metze

commit 369def8a33eebb41a7d6cc2d1c10794ba3c49c32
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Mar 11 12:55:24 2010 +0100

    s4:torture/rpc/drsuapi*: make use of dcerpc_binding_handle stubs
    
    metze

commit 6591713d2679047e0551055960370ee8f47256cd
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Mar 12 11:25:01 2010 +0100

    s4:torture/rpc/unixinfo.c: make use of dcerpc_binding_handle stubs
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source4/torture/rpc/atsvc.c              |   12 +-
 source4/torture/rpc/autoidl.c            |   13 +-
 source4/torture/rpc/drsuapi.c            |   31 +-
 source4/torture/rpc/drsuapi_cracknames.c |   18 +-
 source4/torture/rpc/dsgetinfo.c          |    9 +-
 source4/torture/rpc/dssync.c             |   14 +-
 source4/torture/rpc/epmapper.c           |   30 +-
 source4/torture/rpc/eventlog.c           |   86 +++--
 source4/torture/rpc/initshutdown.c       |    9 +-
 source4/torture/rpc/mgmt.c               |   34 +-
 source4/torture/rpc/oxidresolve.c        |   22 +-
 source4/torture/rpc/remact.c             |    5 +-
 source4/torture/rpc/scanner.c            |    2 +-
 source4/torture/rpc/spoolss.c            |  653 ++++++++++++++++--------------
 source4/torture/rpc/spoolss_notify.c     |   40 ++-
 source4/torture/rpc/spoolss_win.c        |  175 ++++----
 source4/torture/rpc/srvsvc.c             |   65 ++-
 source4/torture/rpc/svcctl.c             |  143 ++++---
 source4/torture/rpc/unixinfo.c           |   15 +-
 source4/torture/rpc/winreg.c             |  319 ++++++++-------
 source4/torture/rpc/wkssvc.c             |   95 +++--
 21 files changed, 985 insertions(+), 805 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c
index 5b35797..4b6f67c 100644
--- a/source4/torture/rpc/atsvc.c
+++ b/source4/torture/rpc/atsvc.c
@@ -25,6 +25,7 @@
 static bool test_JobGetInfo(struct dcerpc_pipe *p, struct torture_context *tctx, uint32_t job_id)
 {
 	NTSTATUS status;
+	struct dcerpc_binding_handle *b = p->binding_handle;
 	struct atsvc_JobGetInfo r;
 	struct atsvc_JobInfo *info = talloc(tctx, struct atsvc_JobInfo);
 	if (!info) {
@@ -35,7 +36,7 @@ static bool test_JobGetInfo(struct dcerpc_pipe *p, struct torture_context *tctx,
 	r.in.job_id = job_id;
 	r.out.job_info = &info;
 
-	status = dcerpc_atsvc_JobGetInfo(p, tctx, &r);
+	status = dcerpc_atsvc_JobGetInfo_r(b, tctx, &r);
 
 	torture_assert_ntstatus_ok(tctx, status, "JobGetInfo failed");
 
@@ -46,13 +47,14 @@ static bool test_JobDel(struct dcerpc_pipe *p, struct torture_context *tctx, uin
 			uint32_t max_job_id)
 {
 	NTSTATUS status;
+	struct dcerpc_binding_handle *b = p->binding_handle;
 	struct atsvc_JobDel r;
 
 	r.in.servername = dcerpc_server_name(p);
 	r.in.min_job_id = min_job_id;
 	r.in.max_job_id = max_job_id;
 
-	status = dcerpc_atsvc_JobDel(p, tctx, &r);
+	status = dcerpc_atsvc_JobDel_r(b, tctx, &r);
 
 	torture_assert_ntstatus_ok(tctx, status, "JobDel failed");
 
@@ -62,6 +64,7 @@ static bool test_JobDel(struct dcerpc_pipe *p, struct torture_context *tctx, uin
 static bool test_JobEnum(struct torture_context *tctx, struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
+	struct dcerpc_binding_handle *b = p->binding_handle;
 	struct atsvc_JobEnum r;
 	struct atsvc_enum_ctr ctr;
 	uint32_t resume_handle = 0, i, total_entries = 0;
@@ -76,7 +79,7 @@ static bool test_JobEnum(struct torture_context *tctx, struct dcerpc_pipe *p)
 	r.in.resume_handle = r.out.resume_handle = &resume_handle;
 	r.out.total_entries = &total_entries;
 
-	status = dcerpc_atsvc_JobEnum(p, tctx, &r);
+	status = dcerpc_atsvc_JobEnum_r(b, tctx, &r);
 
 	torture_assert_ntstatus_ok(tctx, status, "JobEnum failed");
 
@@ -92,6 +95,7 @@ static bool test_JobEnum(struct torture_context *tctx, struct dcerpc_pipe *p)
 static bool test_JobAdd(struct torture_context *tctx, struct dcerpc_pipe *p)
 {
 	NTSTATUS status;
+	struct dcerpc_binding_handle *b = p->binding_handle;
 	struct atsvc_JobAdd r;
 	struct atsvc_JobInfo info;
 
@@ -103,7 +107,7 @@ static bool test_JobAdd(struct torture_context *tctx, struct dcerpc_pipe *p)
 	info.command = "foo.exe";
 	r.in.job_info = &info;
 
-	status = dcerpc_atsvc_JobAdd(p, tctx, &r);
+	status = dcerpc_atsvc_JobAdd_r(b, tctx, &r);
 
 	torture_assert_ntstatus_ok(tctx, status, "JobAdd failed");
 
diff --git a/source4/torture/rpc/autoidl.c b/source4/torture/rpc/autoidl.c
index 1b53b78..ee76ddd 100644
--- a/source4/torture/rpc/autoidl.c
+++ b/source4/torture/rpc/autoidl.c
@@ -29,8 +29,8 @@
 /*
   get a DRSUAPI policy handle
 */
-static bool get_policy_handle(struct dcerpc_pipe *p,
-			      TALLOC_CTX *mem_ctx, 
+static bool get_policy_handle(struct dcerpc_binding_handle *b,
+			      TALLOC_CTX *mem_ctx,
 			      struct policy_handle *handle)
 {
 	NTSTATUS status;
@@ -39,7 +39,7 @@ static bool get_policy_handle(struct dcerpc_pipe *p,
 	ZERO_STRUCT(r);
 	r.out.bind_handle = handle;
 
-	status = dcerpc_drsuapi_DsBind(p, mem_ctx, &r);
+	status = dcerpc_drsuapi_DsBind_r(b, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("drsuapi_DsBind failed - %s\n", nt_errstr(status));
 		return false;
@@ -51,7 +51,8 @@ static bool get_policy_handle(struct dcerpc_pipe *p,
 /*
   get a SAMR handle
 */
-static bool get_policy_handle(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool get_policy_handle(struct dcerpc_binding_handle *b,
+			      TALLOC_CTX *mem_ctx,
 			      struct policy_handle *handle)
 {
 	NTSTATUS status;
@@ -61,7 +62,7 @@ static bool get_policy_handle(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.connect_handle = handle;
 
-	status = dcerpc_samr_Connect(p, mem_ctx, &r);
+	status = dcerpc_samr_Connect_r(b, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("samr_Connect failed - %s\n", nt_errstr(status));
 		return false;
@@ -203,7 +204,7 @@ static void test_scan_call(struct torture_context *tctx, const struct ndr_interf
 
 	reopen(tctx, &p, iface);
 
-	get_policy_handle(p, tctx, &handle);
+	get_policy_handle(p->binding_handle, tctx, &handle);
 
 	/* work out the minimum amount of input data */
 	for (i=0;i<2000;i++) {
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index 101fac8..42d2d12 100644
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -78,7 +78,7 @@ bool test_DsBind(struct dcerpc_pipe *p,
 
 	torture_comment(tctx, "testing DsBind\n");
 
-	status = dcerpc_drsuapi_DsBind(p, tctx, &r);
+	status = dcerpc_drsuapi_DsBind_r(p->binding_handle, tctx, &r);
 	torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsBind");
 
 	/* cache server supported extensions, i.e. bind_info */
@@ -140,7 +140,7 @@ static bool test_DsGetDomainControllerInfo(struct torture_context *tctx,
 				   "testing DsGetDomainControllerInfo level %d on domainname '%s'\n",
 			       r.in.req->req1.level, r.in.req->req1.domain_name);
 		
-			status = dcerpc_drsuapi_DsGetDomainControllerInfo(p, tctx, &r);
+			status = dcerpc_drsuapi_DsGetDomainControllerInfo_r(p->binding_handle, tctx, &r);
 			torture_assert_ntstatus_ok(tctx, status,
 				   "dcerpc_drsuapi_DsGetDomainControllerInfo with dns domain failed");
 			torture_assert_werr_equal(tctx,
@@ -194,7 +194,7 @@ static bool test_DsGetDomainControllerInfo(struct torture_context *tctx,
 	torture_comment(tctx, "testing DsGetDomainControllerInfo level %d on domainname '%s'\n",
 			r.in.req->req1.level, r.in.req->req1.domain_name);
 	
-	status = dcerpc_drsuapi_DsGetDomainControllerInfo(p, tctx, &r);
+	status = dcerpc_drsuapi_DsGetDomainControllerInfo_r(p->binding_handle, tctx, &r);
 
 	torture_assert_ntstatus_ok(tctx, status,
 				   "dcerpc_drsuapi_DsGetDomainControllerInfo with dns domain failed");
@@ -249,13 +249,13 @@ static bool test_DsWriteAccountSpn(struct torture_context *tctx,
 	r.out.res			= &res;
 	r.out.level_out			= &level_out;
 
-	status = dcerpc_drsuapi_DsWriteAccountSpn(p, tctx, &r);
+	status = dcerpc_drsuapi_DsWriteAccountSpn_r(p->binding_handle, tctx, &r);
 	torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsWriteAccountSpn");
 
 	r.in.req->req1.operation	= DRSUAPI_DS_SPN_OPERATION_DELETE;
 	r.in.req->req1.unknown1		= 0;
 
-	status = dcerpc_drsuapi_DsWriteAccountSpn(p, tctx, &r);
+	status = dcerpc_drsuapi_DsWriteAccountSpn_r(p->binding_handle, tctx, &r);
 	torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsWriteAccountSpn");
 
 	return true;
@@ -376,7 +376,7 @@ static bool test_DsReplicaGetInfo(struct torture_context *tctx,
 		r.out.info		= &info;
 		r.out.info_type		= &info_type;
 
-		status = dcerpc_drsuapi_DsReplicaGetInfo(p, tctx, &r);
+		status = dcerpc_drsuapi_DsReplicaGetInfo_r(p->binding_handle, tctx, &r);
 		torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsReplicaGetInfo");
 		if (!NT_STATUS_IS_OK(status) && p->last_fault_code == DCERPC_FAULT_INVALID_TAG) {
 			torture_comment(tctx,
@@ -444,7 +444,7 @@ static bool test_DsReplicaSync(struct torture_context *tctx,
 			break;
 		}
 
-		status = dcerpc_drsuapi_DsReplicaSync(p, tctx, &r);
+		status = dcerpc_drsuapi_DsReplicaSync_r(p->binding_handle, tctx, &r);
 		torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsReplicaSync");
 	}
 
@@ -486,7 +486,7 @@ static bool test_DsReplicaUpdateRefs(struct torture_context *tctx,
 	/* 1. deleting replica dest should fail */
 	torture_comment(tctx, "delete: %s\n", r.in.req.req1.dest_dsa_dns_name);
 	r.in.req.req1.options		= DRSUAPI_DRS_DEL_REF;
-	status = dcerpc_drsuapi_DsReplicaUpdateRefs(p, tctx, &r);
+	status = dcerpc_drsuapi_DsReplicaUpdateRefs_r(p->binding_handle, tctx, &r);
 	torture_drsuapi_assert_call_werr(tctx, p,
 					 status, WERR_DS_DRA_REF_NOT_FOUND, &r,
 					 "dcerpc_drsuapi_DsReplicaUpdateRefs");
@@ -494,7 +494,7 @@ static bool test_DsReplicaUpdateRefs(struct torture_context *tctx,
 	/* 2. hopefully adding random replica dest should succeed */
 	torture_comment(tctx, "add   : %s\n", r.in.req.req1.dest_dsa_dns_name);
 	r.in.req.req1.options		= DRSUAPI_DRS_ADD_REF;
-	status = dcerpc_drsuapi_DsReplicaUpdateRefs(p, tctx, &r);
+	status = dcerpc_drsuapi_DsReplicaUpdateRefs_r(p->binding_handle, tctx, &r);
 	torture_drsuapi_assert_call_werr(tctx, p,
 					 status, WERR_OK, &r,
 					 "dcerpc_drsuapi_DsReplicaUpdateRefs");
@@ -502,7 +502,7 @@ static bool test_DsReplicaUpdateRefs(struct torture_context *tctx,
 	/* 3. try adding same replica dest - should fail */
 	torture_comment(tctx, "add   : %s\n", r.in.req.req1.dest_dsa_dns_name);
 	r.in.req.req1.options		= DRSUAPI_DRS_ADD_REF;
-	status = dcerpc_drsuapi_DsReplicaUpdateRefs(p, tctx, &r);
+	status = dcerpc_drsuapi_DsReplicaUpdateRefs_r(p->binding_handle, tctx, &r);
 	torture_drsuapi_assert_call_werr(tctx, p,
 					 status, WERR_DS_DRA_REF_ALREADY_EXISTS, &r,
 					 "dcerpc_drsuapi_DsReplicaUpdateRefs");
@@ -510,7 +510,7 @@ static bool test_DsReplicaUpdateRefs(struct torture_context *tctx,
 	/* 4. delete random replicate added at step 2. */
 	torture_comment(tctx, "delete: %s\n", r.in.req.req1.dest_dsa_dns_name);
 	r.in.req.req1.options		= DRSUAPI_DRS_DEL_REF;
-	status = dcerpc_drsuapi_DsReplicaUpdateRefs(p, tctx, &r);
+	status = dcerpc_drsuapi_DsReplicaUpdateRefs_r(p->binding_handle, tctx, &r);
 	torture_drsuapi_assert_call_werr(tctx, p,
 					 status, WERR_OK, &r,
 					 "dcerpc_drsuapi_DsReplicaUpdateRefs");
@@ -621,7 +621,7 @@ static bool test_DsGetNCChanges(struct torture_context *tctx,
 			break;
 		}
 
-		status = dcerpc_drsuapi_DsGetNCChanges(p, tctx, &r);
+		status = dcerpc_drsuapi_DsGetNCChanges_r(p->binding_handle, tctx, &r);
 		torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsGetNCChanges");
 	}
 
@@ -651,7 +651,7 @@ bool test_QuerySitesByCost(struct torture_context *tctx,
 	r.in.level = 1;
 	r.in.req = &req;
 
-	status = dcerpc_drsuapi_QuerySitesByCost(p, tctx, &r);
+	status = dcerpc_drsuapi_QuerySitesByCost_r(p->binding_handle, tctx, &r);
 	torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_QuerySitesByCost");
 
 	if (W_ERROR_IS_OK(r.out.result)) {
@@ -687,7 +687,7 @@ bool test_DsUnbind(struct dcerpc_pipe *p,
 
 	torture_comment(tctx, "testing DsUnbind\n");
 
-	status = dcerpc_drsuapi_DsUnbind(p, tctx, &r);
+	status = dcerpc_drsuapi_DsUnbind_r(p->binding_handle, tctx, &r);
 	torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsUnbind");
 
 	return true;
@@ -712,6 +712,7 @@ bool torture_rpc_drsuapi_get_dcinfo(struct torture_context *torture,
 
 	for (j=0; j < ARRAY_SIZE(names); j++) {
 		union drsuapi_DsGetDCInfoRequest req;
+		struct dcerpc_binding_handle *b = priv->drs_pipe->binding_handle;
 		r.in.bind_handle = &priv->bind_handle;
 		r.in.level = 1;
 		r.in.req = &req;
@@ -722,7 +723,7 @@ bool torture_rpc_drsuapi_get_dcinfo(struct torture_context *torture,
 		r.out.ctr = &ctr;
 		r.out.level_out = &level_out;
 
-		status = dcerpc_drsuapi_DsGetDomainControllerInfo(priv->drs_pipe, torture, &r);
+		status = dcerpc_drsuapi_DsGetDomainControllerInfo_r(b, torture, &r);
 		if (!NT_STATUS_IS_OK(status)) {
 			continue;
 		}
diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index c4acd6a..2a49fb3 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -87,7 +87,7 @@ static bool test_DsCrackNamesMatrix(struct torture_context *tctx,
 		r.in.req->req1.format_offered	= DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
 		r.in.req->req1.format_desired	= formats[i];
 		names[0].str = dn;
-		status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+		status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
 		if (!NT_STATUS_IS_OK(status)) {
 			const char *errstr = nt_errstr(status);
 			if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
@@ -172,7 +172,7 @@ static bool test_DsCrackNamesMatrix(struct torture_context *tctx,
 				continue;
 			}
 			names[0].str = n_from[i];
-			status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+			status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
 			if (!NT_STATUS_IS_OK(status)) {
 				const char *errstr = nt_errstr(status);
 				if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
@@ -282,7 +282,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 	torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n",
 			names[0].str, r.in.req->req1.format_desired);
 
-	status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+	status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		const char *errstr = nt_errstr(status);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
@@ -307,7 +307,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 	torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n",
 			names[0].str, r.in.req->req1.format_desired);
 
-	status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+	status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		const char *errstr = nt_errstr(status);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
@@ -333,7 +333,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 	torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n",
 			names[0].str, r.in.req->req1.format_desired);
 
-	status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+	status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		const char *errstr = nt_errstr(status);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
@@ -381,7 +381,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 	torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n",
 			names[0].str, r.in.req->req1.format_desired);
 
-	status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+	status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		const char *errstr = nt_errstr(status);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
@@ -407,7 +407,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 	torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n",
 			names[0].str, r.in.req->req1.format_desired);
 
-	status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+	status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		const char *errstr = nt_errstr(status);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
@@ -433,7 +433,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 	torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n",
 			names[0].str, r.in.req->req1.format_desired);
 
-	status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+	status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		const char *errstr = nt_errstr(status);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
@@ -953,7 +953,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 				torture_comment(tctx, "skipping: %s", comment);
 				continue;
 			}
-			status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, &r);
+			status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r);
 			if (!NT_STATUS_IS_OK(status)) {
 				const char *errstr = nt_errstr(status);
 				if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c
index 3c3e293..7fdbdc4 100644
--- a/source4/torture/rpc/dsgetinfo.c
+++ b/source4/torture/rpc/dsgetinfo.c
@@ -36,6 +36,7 @@
 
 struct DsGetinfoBindInfo {
 	struct dcerpc_pipe *drs_pipe;
+	struct dcerpc_binding_handle *drs_handle;
 	struct drsuapi_DsBind req;
 	struct GUID bind_guid;
 	struct drsuapi_DsBindInfoCtr our_bind_info_ctr;
@@ -164,8 +165,9 @@ static bool _test_DsBind(struct torture_context *tctx,
 		printf("Failed to connect to server as a BDC: %s\n", nt_errstr(status));
 		return false;
 	}
+	b->drs_handle = b->drs_pipe->binding_handle;
 
-	status = dcerpc_drsuapi_DsBind(b->drs_pipe, ctx, &b->req);
+	status = dcerpc_drsuapi_DsBind_r(b->drs_handle, ctx, &b->req);
 	if (!NT_STATUS_IS_OK(status)) {
 		const char *errstr = nt_errstr(status);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
@@ -217,6 +219,7 @@ static bool test_getinfo(struct torture_context *tctx,
 {
 	NTSTATUS status;
 	struct dcerpc_pipe *p = ctx->admin.drsuapi.drs_pipe;
+	struct dcerpc_binding_handle *b = ctx->admin.drsuapi.drs_handle;
 	struct drsuapi_DsReplicaGetInfo r;
 	union drsuapi_DsReplicaGetInfoRequest req;
 	union drsuapi_DsReplicaInfo info;
@@ -341,7 +344,7 @@ static bool test_getinfo(struct torture_context *tctx,
 		r.out.info		= &info;
 		r.out.info_type		= &info_type;
 
-		status = dcerpc_drsuapi_DsReplicaGetInfo(p, tctx, &r);
+		status = dcerpc_drsuapi_DsReplicaGetInfo_r(b, tctx, &r);
 
 		if (W_ERROR_EQUAL(r.out.result, WERR_INVALID_LEVEL)) {
 			/* this is a not yet supported level */
@@ -398,7 +401,7 @@ static bool torture_dsgetinfo_tcase_teardown(struct torture_context *tctx, void
 
 	/* Unbing admin handle */
 	r.in.bind_handle = &ctx->admin.drsuapi.bind_handle;
-	dcerpc_drsuapi_DsUnbind(ctx->admin.drsuapi.drs_pipe, ctx, &r);
+	dcerpc_drsuapi_DsUnbind_r(ctx->admin.drsuapi.drs_handle, ctx, &r);
 
 	talloc_free(ctx);
 
diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index 406b76e..337f5e3 100644
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -38,6 +38,7 @@
 
 struct DsSyncBindInfo {
 	struct dcerpc_pipe *drs_pipe;
+	struct dcerpc_binding_handle *drs_handle;
 	struct drsuapi_DsBind req;
 	struct GUID bind_guid;
 	struct drsuapi_DsBindInfoCtr our_bind_info_ctr;
@@ -203,8 +204,9 @@ static bool _test_DsBind(struct torture_context *tctx,
 		printf("Failed to connect to server as a BDC: %s\n", nt_errstr(status));
 		return false;
 	}
+	b->drs_handle = b->drs_pipe->binding_handle;
 
-	status = dcerpc_drsuapi_DsBind(b->drs_pipe, ctx, &b->req);
+	status = dcerpc_drsuapi_DsBind_r(b->drs_handle, ctx, &b->req);
 	if (!NT_STATUS_IS_OK(status)) {
 		const char *errstr = nt_errstr(status);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
@@ -344,7 +346,7 @@ static bool test_GetInfo(struct torture_context *tctx, struct DsSyncTest *ctx)
 	r.out.level_out			= &level_out;
 	r.out.ctr			= &ctr;
 
-	status = dcerpc_drsuapi_DsCrackNames(ctx->admin.drsuapi.drs_pipe, ctx, &r);
+	status = dcerpc_drsuapi_DsCrackNames_r(ctx->admin.drsuapi.drs_handle, ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		const char *errstr = nt_errstr(status);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
@@ -907,7 +909,7 @@ static bool test_FetchData(struct torture_context *tctx, struct DsSyncTest *ctx)
 						r.in.req->req8.highwatermark.highest_usn);
 			}
 
-			status = dcerpc_drsuapi_DsGetNCChanges(ctx->new_dc.drsuapi.drs_pipe, ctx, &r);
+			status = dcerpc_drsuapi_DsGetNCChanges_r(ctx->new_dc.drsuapi.drs_handle, ctx, &r);
 			torture_drsuapi_assert_call(tctx, ctx->new_dc.drsuapi.drs_pipe, status,
 						    &r, "dcerpc_drsuapi_DsGetNCChanges");
 
@@ -1016,7 +1018,7 @@ static bool test_FetchNT4Data(struct torture_context *tctx,
 
 		r.in.req = &req;
 
-		status = dcerpc_drsuapi_DsGetNT4ChangeLog(ctx->new_dc.drsuapi.drs_pipe, ctx, &r);
+		status = dcerpc_drsuapi_DsGetNT4ChangeLog_r(ctx->new_dc.drsuapi.drs_handle, ctx, &r);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)) {
 			torture_skip(tctx, "DsGetNT4ChangeLog not supported by target server");
 		} else if (!NT_STATUS_IS_OK(status)) {
@@ -1100,11 +1102,11 @@ static bool torture_dssync_tcase_teardown(struct torture_context *tctx, void *da
 
 	/* Unbing admin handle */
 	r.in.bind_handle = &ctx->admin.drsuapi.bind_handle;
-	dcerpc_drsuapi_DsUnbind(ctx->admin.drsuapi.drs_pipe, ctx, &r);
+	dcerpc_drsuapi_DsUnbind_r(ctx->admin.drsuapi.drs_handle, ctx, &r);
 
 	/* Unbing new_dc handle */
 	r.in.bind_handle = &ctx->new_dc.drsuapi.bind_handle;
-	dcerpc_drsuapi_DsUnbind(ctx->new_dc.drsuapi.drs_pipe, ctx, &r);
+	dcerpc_drsuapi_DsUnbind_r(ctx->new_dc.drsuapi.drs_handle, ctx, &r);
 
 	talloc_free(ctx);
 
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index 37a55d1..024ef3e 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -39,7 +39,8 @@ static void display_tower(TALLOC_CTX *mem_ctx, struct epm_tower *twr)
 }
 
 
-static bool test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_Map(struct dcerpc_binding_handle *b,
+		     TALLOC_CTX *mem_ctx,
 		     struct epm_twr_t *twr)
 {
 	NTSTATUS status;
@@ -77,7 +78,7 @@ static bool test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	twr->tower.floors[4].lhs.lhs_data = data_blob(NULL, 0);
 	twr->tower.floors[4].rhs.ip.ipaddr = "0.0.0.0";
 
-	status = dcerpc_epm_Map(p, mem_ctx, &r);
+	status = dcerpc_epm_Map_r(b, mem_ctx, &r);
 	if (NT_STATUS_IS_OK(status) && r.out.result == 0) {
 		for (i=0;i<*r.out.num_towers;i++) {
 			if (r.out.towers[i].twr) {
@@ -90,7 +91,7 @@ static bool test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	twr->tower.floors[3].lhs.lhs_data = data_blob(NULL, 0);
 	twr->tower.floors[3].rhs.http.port = 0;
 
-	status = dcerpc_epm_Map(p, mem_ctx, &r);
+	status = dcerpc_epm_Map_r(b, mem_ctx, &r);
 	if (NT_STATUS_IS_OK(status) && r.out.result == 0) {
 		for (i=0;i<*r.out.num_towers;i++) {
 			if (r.out.towers[i].twr) {
@@ -103,7 +104,7 @@ static bool test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	twr->tower.floors[3].lhs.lhs_data = data_blob(NULL, 0);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list