summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamen.mazdrashki@postpath.com>2009-11-14 03:56:21 +0200
committerAndrew Bartlett <abartlet@samba.org>2009-11-17 10:46:28 +1100
commitb0de5736290376b1b63375df94e480a60b4020b7 (patch)
treed25c358582ed976555526f543eb2cb945c4a2162
parentb13518e4e89f887d01cdc0a52f3288d6ee9e87a1 (diff)
downloadsamba-b0de5736290376b1b63375df94e480a60b4020b7.tar.gz
samba-b0de5736290376b1b63375df94e480a60b4020b7.tar.bz2
samba-b0de5736290376b1b63375df94e480a60b4020b7.zip
s4/drs(tort): 'DsPrivate.pipe' renamed - 'pipe' is a system call
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source4/torture/rpc/drsuapi.c20
-rw-r--r--source4/torture/rpc/drsuapi.h2
-rw-r--r--source4/torture/rpc/drsuapi_cracknames.c4
3 files changed, 13 insertions, 13 deletions
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index 5f23995c8c..42c88a5eb1 100644
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -91,7 +91,7 @@ static bool test_DsGetDomainControllerInfo(struct torture_context *tctx,
struct DsPrivate *priv)
{
NTSTATUS status;
- struct dcerpc_pipe *p = priv->pipe;
+ struct dcerpc_pipe *p = priv->drs_pipe;
struct drsuapi_DsGetDomainControllerInfo r;
union drsuapi_DsGetDCInfoCtr ctr;
int32_t level_out = 0;
@@ -225,7 +225,7 @@ static bool test_DsWriteAccountSpn(struct torture_context *tctx,
struct DsPrivate *priv)
{
NTSTATUS status;
- struct dcerpc_pipe *p = priv->pipe;
+ struct dcerpc_pipe *p = priv->drs_pipe;
struct drsuapi_DsWriteAccountSpn r;
union drsuapi_DsWriteAccountSpnRequest req;
struct drsuapi_DsNameString names[2];
@@ -265,7 +265,7 @@ static bool test_DsReplicaGetInfo(struct torture_context *tctx,
struct DsPrivate *priv)
{
NTSTATUS status;
- struct dcerpc_pipe *p = priv->pipe;
+ struct dcerpc_pipe *p = priv->drs_pipe;
struct drsuapi_DsReplicaGetInfo r;
union drsuapi_DsReplicaGetInfoRequest req;
union drsuapi_DsReplicaInfo info;
@@ -394,7 +394,7 @@ static bool test_DsReplicaSync(struct torture_context *tctx,
struct DsPrivate *priv)
{
NTSTATUS status;
- struct dcerpc_pipe *p = priv->pipe;
+ struct dcerpc_pipe *p = priv->drs_pipe;
int i;
struct drsuapi_DsReplicaSync r;
struct drsuapi_DsReplicaObjectIdentifier nc;
@@ -452,7 +452,7 @@ static bool test_DsReplicaUpdateRefs(struct torture_context *tctx,
struct DsPrivate *priv)
{
NTSTATUS status;
- struct dcerpc_pipe *p = priv->pipe;
+ struct dcerpc_pipe *p = priv->drs_pipe;
struct drsuapi_DsReplicaUpdateRefs r;
struct drsuapi_DsReplicaObjectIdentifier nc;
struct GUID null_guid;
@@ -519,7 +519,7 @@ static bool test_DsGetNCChanges(struct torture_context *tctx,
struct DsPrivate *priv)
{
NTSTATUS status;
- struct dcerpc_pipe *p = priv->pipe;
+ struct dcerpc_pipe *p = priv->drs_pipe;
int i;
struct drsuapi_DsGetNCChanges r;
union drsuapi_DsGetNCChangesRequest req;
@@ -629,7 +629,7 @@ bool test_QuerySitesByCost(struct torture_context *tctx,
struct DsPrivate *priv)
{
NTSTATUS status;
- struct dcerpc_pipe *p = priv->pipe;
+ struct dcerpc_pipe *p = priv->drs_pipe;
struct drsuapi_QuerySitesByCost r;
union drsuapi_QuerySitesByCostRequest req;
@@ -719,7 +719,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->pipe, torture, &r);
+ status = dcerpc_drsuapi_DsGetDomainControllerInfo(priv->drs_pipe, torture, &r);
if (!NT_STATUS_IS_OK(status)) {
continue;
}
@@ -753,7 +753,7 @@ bool torture_drsuapi_tcase_setup_common(struct torture_context *tctx, struct DsP
torture_comment(tctx, "Create DRSUAPI pipe\n");
status = torture_rpc_connection(tctx,
- &priv->pipe,
+ &priv->drs_pipe,
&ndr_table_drsuapi);
torture_assert(tctx, NT_STATUS_IS_OK(status), "Unable to connect to DRSUAPI pipe");
@@ -762,7 +762,7 @@ bool torture_drsuapi_tcase_setup_common(struct torture_context *tctx, struct DsP
&machine_credentials);
torture_assert(tctx, priv->join, "Failed to join as BDC");
- if (!test_DsBind(priv->pipe, tctx, priv)) {
+ if (!test_DsBind(priv->drs_pipe, tctx, priv)) {
/* clean up */
torture_drsuapi_tcase_teardown_common(tctx, priv);
torture_fail(tctx, "Failed execute test_DsBind()");
diff --git a/source4/torture/rpc/drsuapi.h b/source4/torture/rpc/drsuapi.h
index a10ea5068e..ba4c057873 100644
--- a/source4/torture/rpc/drsuapi.h
+++ b/source4/torture/rpc/drsuapi.h
@@ -27,7 +27,7 @@
* Data structure common for most of DRSUAPI tests
*/
struct DsPrivate {
- struct dcerpc_pipe *pipe;
+ struct dcerpc_pipe *drs_pipe;
struct policy_handle bind_handle;
struct GUID bind_guid;
struct drsuapi_DsBindInfo28 srv_bind_info;
diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index dad0d918ca..98b64b8746 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -46,7 +46,7 @@ static bool test_DsCrackNamesMatrix(struct torture_context *tctx,
union drsuapi_DsNameRequest req;
int32_t level_out;
union drsuapi_DsNameCtr ctr;
- struct dcerpc_pipe *p = priv->pipe;
+ struct dcerpc_pipe *p = priv->drs_pipe;
TALLOC_CTX *mem_ctx = priv;
enum drsuapi_DsNameFormat formats[] = {
@@ -256,7 +256,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
const char *canonical_ex_name;
const char *dom_sid;
const char *test_dc = torture_join_netbios_name(priv->join);
- struct dcerpc_pipe *p = priv->pipe;
+ struct dcerpc_pipe *p = priv->drs_pipe;
TALLOC_CTX *mem_ctx = priv;
ZERO_STRUCT(r);