summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamen.mazdrashki@postpath.com>2010-02-14 02:40:07 +0200
committerAnatoliy Atanasov <anatoliy.atanasov@postpath.com>2010-02-24 14:14:08 +0200
commit30ac3caade8d204b859d9b3ed4c51bdbeaaa3cbf (patch)
tree83683ed7871f9e50a062066b2363d6fbe4b21458
parentfb9880d6e89a48d2588edbe753bbb4c90fb01173 (diff)
downloadsamba-30ac3caade8d204b859d9b3ed4c51bdbeaaa3cbf.tar.gz
samba-30ac3caade8d204b859d9b3ed4c51bdbeaaa3cbf.tar.bz2
samba-30ac3caade8d204b859d9b3ed4c51bdbeaaa3cbf.zip
s4/drs: Propagate drsuapi_DsReplicaGetInfoRequest... changes into source code
-rw-r--r--source4/dsdb/kcc/kcc_drs_replica_info.c4
-rw-r--r--source4/torture/rpc/drsuapi.c4
-rw-r--r--source4/torture/rpc/dsgetinfo.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/dsdb/kcc/kcc_drs_replica_info.c b/source4/dsdb/kcc/kcc_drs_replica_info.c
index e168fe5055..4b5a25c0a6 100644
--- a/source4/dsdb/kcc/kcc_drs_replica_info.c
+++ b/source4/dsdb/kcc/kcc_drs_replica_info.c
@@ -602,7 +602,7 @@ NTSTATUS kccdrs_replica_get_info(struct irpc_message *msg,
base_index = 0;
info_type = req1->info_type;
object_dn_str = req1->object_dn;
- req_src_dsa_guid = req1->guid1;
+ req_src_dsa_guid = req1->source_dsa_guid;
} else { /* r->in.level == DRSUAPI_DS_REPLICA_GET_INFO2 */
req2 = &req->in.req->req2;
@@ -615,7 +615,7 @@ NTSTATUS kccdrs_replica_get_info(struct irpc_message *msg,
base_index = req2->enumeration_context;
info_type = req2->info_type;
object_dn_str = req2->object_dn;
- req_src_dsa_guid = req2->guid1;
+ req_src_dsa_guid = req2->source_dsa_guid;
}
/* allocate the reply and fill in some fields */
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index 24083bbe45..6d3c7c07c2 100644
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -360,12 +360,12 @@ static bool test_DsReplicaGetInfo(struct torture_context *tctx,
case DRSUAPI_DS_REPLICA_GET_INFO:
r.in.req->req1.info_type = array[i].infotype;
r.in.req->req1.object_dn = object_dn;
- ZERO_STRUCT(r.in.req->req1.guid1);
+ ZERO_STRUCT(r.in.req->req1.source_dsa_guid);
break;
case DRSUAPI_DS_REPLICA_GET_INFO2:
r.in.req->req2.info_type = array[i].infotype;
r.in.req->req2.object_dn = object_dn;
- ZERO_STRUCT(r.in.req->req2.guid1);
+ ZERO_STRUCT(r.in.req->req2.source_dsa_guid);
r.in.req->req2.flags = 0;
r.in.req->req2.string1 = NULL;
r.in.req->req2.string2 = NULL;
diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c
index 418f5b4530..fbe4fa2d57 100644
--- a/source4/torture/rpc/dsgetinfo.c
+++ b/source4/torture/rpc/dsgetinfo.c
@@ -262,12 +262,12 @@ static bool test_getinfo(struct torture_context *tctx,
case DRSUAPI_DS_REPLICA_GET_INFO:
r.in.req->req1.info_type = array[i].infotype;
r.in.req->req1.object_dn = object_dn;
- ZERO_STRUCT(r.in.req->req1.guid1);
+ ZERO_STRUCT(r.in.req->req1.source_dsa_guid);
break;
case DRSUAPI_DS_REPLICA_GET_INFO2:
r.in.req->req2.info_type = array[i].infotype;
r.in.req->req2.object_dn = object_dn;
- ZERO_STRUCT(r.in.req->req2.guid1);
+ ZERO_STRUCT(r.in.req->req2.source_dsa_guid);
r.in.req->req2.flags = 0;
r.in.req->req2.string1 = NULL;
r.in.req->req2.string2 = NULL;