diff options
| -rw-r--r-- | source4/dsdb/repl/replicated_objects.c | 16 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 14 | ||||
| -rw-r--r-- | source4/librpc/idl/drsblobs.idl | 6 | ||||
| -rw-r--r-- | source4/librpc/idl/drsuapi.idl | 28 |
4 files changed, 32 insertions, 32 deletions
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index b8456a05567..5f253ea2f46 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -278,13 +278,13 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, m->attid = a->attid; m->version = d->version; - m->orginating_time = d->orginating_time; - m->orginating_invocation_id = d->orginating_invocation_id; - m->orginating_usn = d->orginating_usn; + m->originating_change_time = d->originating_change_time; + m->originating_invocation_id = d->originating_invocation_id; + m->originating_usn = d->originating_usn; m->local_usn = 0; - if (d->orginating_time > whenChanged) { - whenChanged = d->orginating_time; + if (d->originating_change_time > whenChanged) { + whenChanged = d->originating_change_time; } if (a->attid == DRSUAPI_ATTRIBUTE_name) { @@ -302,9 +302,9 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, rdn_m->attid = rdn_attid; rdn_m->version = name_d->version; - rdn_m->orginating_time = name_d->orginating_time; - rdn_m->orginating_invocation_id = name_d->orginating_invocation_id; - rdn_m->orginating_usn = name_d->orginating_usn; + rdn_m->originating_change_time = name_d->originating_change_time; + rdn_m->originating_invocation_id = name_d->originating_invocation_id; + rdn_m->originating_usn = name_d->originating_usn; rdn_m->local_usn = 0; md->ctr.ctr1.count++; diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 10f3da243b5..01f1979eb03 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -499,9 +499,9 @@ static int replmd_add_originating(struct ldb_module *module, m->attid = sa->attributeID_id; m->version = 1; - m->orginating_time = now; - m->orginating_invocation_id = *our_invocation_id; - m->orginating_usn = seq_num; + m->originating_change_time = now; + m->originating_invocation_id = *our_invocation_id; + m->originating_usn = seq_num; m->local_usn = seq_num; ni++; } @@ -821,16 +821,16 @@ static int replmd_replPropertyMetaData1_conflict_compare(struct replPropertyMeta return m1->version - m2->version; } - if (m1->orginating_time != m2->orginating_time) { - return m1->orginating_time - m2->orginating_time; + if (m1->originating_change_time != m2->originating_change_time) { + return m1->originating_change_time - m2->originating_change_time; } - ret = GUID_compare(&m1->orginating_invocation_id, &m2->orginating_invocation_id); + ret = GUID_compare(&m1->originating_invocation_id, &m2->originating_invocation_id); if (ret != 0) { return ret; } - return m1->orginating_usn - m2->orginating_usn; + return m1->originating_usn - m2->originating_usn; } static int replmd_replicated_apply_merge_callback(struct ldb_context *ldb, diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl index 396332107d9..41016d65a94 100644 --- a/source4/librpc/idl/drsblobs.idl +++ b/source4/librpc/idl/drsblobs.idl @@ -21,9 +21,9 @@ interface drsblobs { typedef struct { drsuapi_DsAttributeId attid; uint32 version; - NTTIME_1sec orginating_time; - GUID orginating_invocation_id; - hyper orginating_usn; + NTTIME_1sec originating_change_time; + GUID originating_invocation_id; + hyper originating_usn; hyper local_usn; } replPropertyMetaData1; diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl index a0cda126403..c1c9821d9b8 100644 --- a/source4/librpc/idl/drsuapi.idl +++ b/source4/librpc/idl/drsuapi.idl @@ -482,9 +482,9 @@ interface drsuapi typedef struct { uint32 version; - NTTIME_1sec orginating_time; - GUID orginating_invocation_id; - hyper orginating_usn; + NTTIME_1sec originating_change_time; + GUID originating_invocation_id; + hyper originating_usn; } drsuapi_DsReplicaMetaData; typedef [public] struct { @@ -529,7 +529,7 @@ interface drsuapi drsuapi_DsAttributeId attid; drsuapi_DsAttributeValue value; drsuapi_DsLinkedAttributeFlags flags; - NTTIME_1sec orginating_add_time; + NTTIME_1sec originating_add_time; drsuapi_DsReplicaMetaData meta_data; } drsuapi_DsReplicaLinkedAttribute; @@ -1217,8 +1217,8 @@ interface drsuapi typedef struct { [charset(UTF16),string] uint16 *attribute_name; uint32 version; - NTTIME originating_last_changed; - GUID originating_dsa_invocation_id; + NTTIME originating_change_time; + GUID originating_invocation_id; hyper originating_usn; hyper local_usn; } drsuapi_DsReplicaObjMetaData; @@ -1287,8 +1287,8 @@ interface drsuapi NTTIME deleted; NTTIME created; uint32 version; - NTTIME originating_last_changed; - GUID originating_dsa_invocation_id; + NTTIME originating_change_time; + GUID originating_invocation_id; hyper originating_usn; hyper local_usn; } drsuapi_DsReplicaAttrValMetaData; @@ -1321,11 +1321,11 @@ interface drsuapi typedef struct { [charset(UTF16),string] uint16 *attribute_name; uint32 version; - NTTIME originating_last_changed; - GUID originating_dsa_invocation_id; + NTTIME originating_change_time; + GUID originating_invocation_id; hyper originating_usn; hyper local_usn; - [charset(UTF16),string] uint16 *originating_dsa_obj_dn; + [charset(UTF16),string] uint16 *originating_dsa_dn; } drsuapi_DsReplicaObjMetaData2; typedef struct { @@ -1342,11 +1342,11 @@ interface drsuapi NTTIME deleted; NTTIME created; uint32 version; - NTTIME originating_last_changed; - GUID originating_dsa_invocation_id; + NTTIME originating_change_time; + GUID originating_invocation_id; hyper originating_usn; hyper local_usn; - [charset(UTF16),string] uint16 *originating_dsa_obj_dn; + [charset(UTF16),string] uint16 *originating_dsa_dn; } drsuapi_DsReplicaAttrValMetaData2; typedef struct { |