s4/drs: Propagate drsuapi_DsReplicaGetInfoRequest... changes into source code

diff --git a/source4/dsdb/kcc/kcc_drs_replica_info.c b/source4/dsdb/kcc/kcc_drs_replica_info.c
index e168fe5055533a325a452ad33704d075b851cc9f..4b5a25c0a693c29267a5e018ffa26bb0ccd7c441 100644 (file)
--- 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 24083bbe45788188f474579040eade5fe5ec0386..6d3c7c07c2a4e2fa5493548b75f2cbed56ef360a 100644 (file)
--- 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 418f5b45305e93b0188ec6b175e6db46e3f749c1..fbe4fa2d575fa87cd0222d4c83749badb5c95d48 100644 (file)
--- 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;