sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r21773: fix typo orginating -> originating

Browse Source 
and use the struct member names in all cases

metze
(This used to be commit c543ee5745)
This commit is contained in:
Stefan Metzmacher 2007-03-09 10:09:37 +00:00 committed by Gerald (Jerry) Carter
parent 4e7520f643
commit 3e697d5110
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source4/dsdb/repl/replicated_objects.c
View File

@ -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++;

14
source4/dsdb/samdb/ldb_modules/repl_meta_data.c
View File

@ -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,

6
source4/librpc/idl/drsblobs.idl
View File

@ -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;

28
source4/librpc/idl/drsuapi.idl
View File

@ -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 {