diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-03-09 10:09:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:49:24 -0500 |
| commit | 3e697d5110653d22bebade0da8f0c6c3749a2d09 (patch) | |
| tree | 503a642e882bfe0255c2b52664a403ff1d5cd399 /source4/dsdb | |
| parent | 4e7520f643c5d5c4d8f938fafdf490b77204c0a7 (diff) | |
| download | samba-3e697d5110653d22bebade0da8f0c6c3749a2d09.tar.gz samba-3e697d5110653d22bebade0da8f0c6c3749a2d09.tar.bz2 samba-3e697d5110653d22bebade0da8f0c6c3749a2d09.zip | |
r21773: fix typo orginating -> originating
and use the struct member names in all cases
metze
(This used to be commit c543ee57454d006c545e3e9e20c9ac0114081d3d)
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/repl/replicated_objects.c | 16 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index b8456a0556..5f253ea2f4 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 10f3da243b..01f1979eb0 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, |