diff options
| author | Kamen Mazdrashki <kamenim@samba.org> | 2010-10-29 02:22:35 +0300 |
|---|---|---|
| committer | Kamen Mazdrashki <kamenim@samba.org> | 2010-10-31 23:54:04 +0000 |
| commit | 717b1158a6a4e94c0a37623731d398723a24eed8 (patch) | |
| tree | e0501a620359d08daaabba5607698571f0d6944a /source4/dsdb/samdb/ldb_modules/repl_meta_data.c | |
| parent | fb6f12be5c3d5ad3e22943a780576a08f794f6a4 (diff) | |
| download | samba-717b1158a6a4e94c0a37623731d398723a24eed8.tar.gz samba-717b1158a6a4e94c0a37623731d398723a24eed8.tar.bz2 samba-717b1158a6a4e94c0a37623731d398723a24eed8.zip | |
idl: Use DRSUAPI_ATTID_ prefix instead of DRSUAPI_ATTRIBUTE_ for ATTID values
Those values are actually ATTID values and such, they are used
for ATTIDs for Attributes, Classes and Syntaxes.
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/repl_meta_data.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 1544c89170..1eb4745987 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -2989,8 +2989,8 @@ static int replmd_replicated_handle_rename(struct replmd_replicated_request *ar, * received yet. We choose which one wins by looking at the * attribute stamps on the two objects, the newer one wins */ - md_remote = replmd_replPropertyMetaData1_find_attid(rmd, DRSUAPI_ATTRIBUTE_name); - md_local = replmd_replPropertyMetaData1_find_attid(omd, DRSUAPI_ATTRIBUTE_name); + md_remote = replmd_replPropertyMetaData1_find_attid(rmd, DRSUAPI_ATTID_name); + md_local = replmd_replPropertyMetaData1_find_attid(omd, DRSUAPI_ATTID_name); /* if there is no name attribute then we have to assume the object we've received is in fact newer */ if (!md_remote || !md_local || @@ -3095,7 +3095,7 @@ static int replmd_replicated_apply_merge(struct replmd_replicated_request *ar) break; } - if (rmd->ctr.ctr1.array[i].attid != DRSUAPI_ATTRIBUTE_instanceType) { + if (rmd->ctr.ctr1.array[i].attid != DRSUAPI_ATTID_instanceType) { DEBUG(3,("Discarding older DRS attribute update to %s on %s from %s\n", msg->elements[i-removed_attrs].name, ldb_dn_get_linearized(msg->dn), @@ -3848,7 +3848,7 @@ linked_attributes[0]: sid : S-0-0 __ndr_size_dn : 0x00000000 (0) dn : '' - attid : DRSUAPI_ATTRIBUTE_member (0x1F) + attid : DRSUAPI_ATTID_member (0x1F) value: struct drsuapi_DsAttributeValue __ndr_size : 0x0000007e (126) blob : * |