svn commit: samba r21773 - in branches/SAMBA_4_0/source: dsdb/repl
dsdb/samdb/ldb_modules librpc/idl
metze at samba.org
metze at samba.org
Fri Mar 9 10:09:38 GMT 2007
Author: metze
Date: 2007-03-09 10:09:37 +0000 (Fri, 09 Mar 2007)
New Revision: 21773
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21773
Log:
fix typo orginating -> originating
and use the struct member names in all cases
metze
Modified:
branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/repl_meta_data.c
branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c 2007-03-09 07:20:50 UTC (rev 21772)
+++ branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c 2007-03-09 10:09:37 UTC (rev 21773)
@@ -278,13 +278,13 @@
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 @@
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++;
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/repl_meta_data.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/repl_meta_data.c 2007-03-09 07:20:50 UTC (rev 21772)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/repl_meta_data.c 2007-03-09 10:09:37 UTC (rev 21773)
@@ -499,9 +499,9 @@
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 @@
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,
Modified: branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2007-03-09 07:20:50 UTC (rev 21772)
+++ branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2007-03-09 10:09:37 UTC (rev 21773)
@@ -21,9 +21,9 @@
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;
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl 2007-03-09 07:20:50 UTC (rev 21772)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl 2007-03-09 10:09:37 UTC (rev 21773)
@@ -482,9 +482,9 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 {
More information about the samba-cvs
mailing list