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

idl: Use DRSUAPI_ATTID_ prefix instead of DRSUAPI_ATTRIBUTE_ for ATTID values

Browse Source 
Those values are actually ATTID values and such, they are used
for ATTIDs for Attributes, Classes and Syntaxes.
This commit is contained in:
Kamen Mazdrashki 2010-10-29 02:22:35 +03:00
parent fb6f12be5c
commit 717b1158a6
13 changed files with 240 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libcli/drsuapi/repl_decrypt.c
View File

@ -146,19 +146,19 @@ WERROR drsuapi_decrypt_attribute(TALLOC_CTX *mem_ctx,
}
switch (attr->attid) {
case DRSUAPI_ATTRIBUTE_dBCSPwd:
case DRSUAPI_ATTRIBUTE_unicodePwd:
case DRSUAPI_ATTRIBUTE_ntPwdHistory:
case DRSUAPI_ATTRIBUTE_lmPwdHistory:
case DRSUAPI_ATTID_dBCSPwd:
case DRSUAPI_ATTID_unicodePwd:
case DRSUAPI_ATTID_ntPwdHistory:
case DRSUAPI_ATTID_lmPwdHistory:
rid_crypt = true;
break;
case DRSUAPI_ATTRIBUTE_supplementalCredentials:
case DRSUAPI_ATTRIBUTE_priorValue:
case DRSUAPI_ATTRIBUTE_currentValue:
case DRSUAPI_ATTRIBUTE_trustAuthOutgoing:
case DRSUAPI_ATTRIBUTE_trustAuthIncoming:
case DRSUAPI_ATTRIBUTE_initialAuthOutgoing:
case DRSUAPI_ATTRIBUTE_initialAuthIncoming:
case DRSUAPI_ATTID_supplementalCredentials:
case DRSUAPI_ATTID_priorValue:
case DRSUAPI_ATTID_currentValue:
case DRSUAPI_ATTID_trustAuthOutgoing:
case DRSUAPI_ATTID_trustAuthIncoming:
case DRSUAPI_ATTID_initialAuthOutgoing:
case DRSUAPI_ATTID_initialAuthIncoming:
break;
default:
return WERR_OK;
@ -308,19 +308,19 @@ WERROR drsuapi_encrypt_attribute(TALLOC_CTX *mem_ctx,
}
switch (attr->attid) {
case DRSUAPI_ATTRIBUTE_dBCSPwd:
case DRSUAPI_ATTRIBUTE_unicodePwd:
case DRSUAPI_ATTRIBUTE_ntPwdHistory:
case DRSUAPI_ATTRIBUTE_lmPwdHistory:
case DRSUAPI_ATTID_dBCSPwd:
case DRSUAPI_ATTID_unicodePwd:
case DRSUAPI_ATTID_ntPwdHistory:
case DRSUAPI_ATTID_lmPwdHistory:
rid_crypt = true;
break;
case DRSUAPI_ATTRIBUTE_supplementalCredentials:
case DRSUAPI_ATTRIBUTE_priorValue:
case DRSUAPI_ATTRIBUTE_currentValue:
case DRSUAPI_ATTRIBUTE_trustAuthOutgoing:
case DRSUAPI_ATTRIBUTE_trustAuthIncoming:
case DRSUAPI_ATTRIBUTE_initialAuthOutgoing:
case DRSUAPI_ATTRIBUTE_initialAuthIncoming:
case DRSUAPI_ATTID_supplementalCredentials:
case DRSUAPI_ATTID_priorValue:
case DRSUAPI_ATTID_currentValue:
case DRSUAPI_ATTID_trustAuthOutgoing:
case DRSUAPI_ATTID_trustAuthIncoming:
case DRSUAPI_ATTID_initialAuthOutgoing:
case DRSUAPI_ATTID_initialAuthIncoming:
break;
default:
return WERR_OK;

172
librpc/idl/drsuapi.idl
View File

@ -382,92 +382,92 @@ interface drsuapi
} drsuapi_DsObjectClassId;
typedef [flag(NDR_PAHEX),v1_enum,public] enum {
DRSUAPI_ATTRIBUTE_objectClass = 0x00000000,
DRSUAPI_ATTRIBUTE_cn = 0x00000003,
DRSUAPI_ATTRIBUTE_ou = 0x0000000b,
DRSUAPI_ATTRIBUTE_description = 0x0000000d,
DRSUAPI_ATTRIBUTE_member = 0x0000001f,
DRSUAPI_ATTRIBUTE_instanceType = 0x00020001,
DRSUAPI_ATTRIBUTE_whenCreated = 0x00020002,
DRSUAPI_ATTRIBUTE_possSuperiors = 0x00020008,
DRSUAPI_ATTRIBUTE_displayName = 0x0002000d,
DRSUAPI_ATTRIBUTE_hasMasterNCs = 0x0002000e,
DRSUAPI_ATTRIBUTE_subClassOf = 0x00020015,
DRSUAPI_ATTRIBUTE_governsID = 0x00020016,
DRSUAPI_ATTRIBUTE_mustContain = 0x00020018,
DRSUAPI_ATTRIBUTE_mayContain = 0x00020019,
DRSUAPI_ATTRIBUTE_rDNAttId = 0x0002001A,
DRSUAPI_ATTRIBUTE_attributeID = 0x0002001e,
DRSUAPI_ATTRIBUTE_attributeSyntax = 0x00020020,
DRSUAPI_ATTRIBUTE_isSingleValued = 0x00020021,
DRSUAPI_ATTRIBUTE_rangeLower = 0x00020022,
DRSUAPI_ATTRIBUTE_rangeUpper = 0x00020023,
DRSUAPI_ATTRIBUTE_dMDLocation = 0x00020024,
DRSUAPI_ATTRIBUTE_isDeleted = 0x00020030,
DRSUAPI_ATTRIBUTE_objectVersion = 0x0002004c,
DRSUAPI_ATTRIBUTE_invocationId = 0x00020073,
DRSUAPI_ATTRIBUTE_showInAdvancedViewOnly = 0x000200a9,
DRSUAPI_ATTRIBUTE_adminDisplayName = 0x000200c2,
DRSUAPI_ATTRIBUTE_adminDescription = 0x000200e2,
DRSUAPI_ATTRIBUTE_oMSyntax = 0x000200e7,
DRSUAPI_ATTRIBUTE_ntSecurityDescriptor = 0x00020119,
DRSUAPI_ATTRIBUTE_searchFlags = 0x0002014e,
DRSUAPI_ATTRIBUTE_auxiliaryClass = 0x0002015f,
DRSUAPI_ATTRIBUTE_lDAPDisplayName = 0x000201cc,
DRSUAPI_ATTRIBUTE_name = 0x00090001,
DRSUAPI_ATTRIBUTE_userAccountControl = 0x00090008,
DRSUAPI_ATTRIBUTE_codePage = 0x00090010,
DRSUAPI_ATTRIBUTE_countryCode = 0x00090019,
DRSUAPI_ATTRIBUTE_currentValue = 0x0009001b,
DRSUAPI_ATTRIBUTE_homeDirectory = 0x0009002c,
DRSUAPI_ATTRIBUTE_homeDrive = 0x0009002d,
DRSUAPI_ATTRIBUTE_dBCSPwd = 0x00090037,/* lmPwdHash */
DRSUAPI_ATTRIBUTE_scriptPath = 0x0009003e,
DRSUAPI_ATTRIBUTE_logonHours = 0x00090040,
DRSUAPI_ATTRIBUTE_userWorkstations = 0x00090056,
DRSUAPI_ATTRIBUTE_unicodePwd = 0x0009005a,/* ntPwdHash */
DRSUAPI_ATTRIBUTE_ntPwdHistory = 0x0009005e,
DRSUAPI_ATTRIBUTE_pwdLastSet = 0x00090060,
DRSUAPI_ATTRIBUTE_primaryGroupID = 0x00090062,
DRSUAPI_ATTRIBUTE_priorValue = 0x00090064,
DRSUAPI_ATTRIBUTE_supplementalCredentials = 0x0009007d,
DRSUAPI_ATTRIBUTE_trustAuthIncoming = 0x00090081,
DRSUAPI_ATTRIBUTE_trustAuthOutgoing = 0x00090087,
DRSUAPI_ATTRIBUTE_profilePath = 0x0009008b,
DRSUAPI_ATTRIBUTE_objectSid = 0x00090092,
DRSUAPI_ATTRIBUTE_schemaIDGUID = 0x00090094,
DRSUAPI_ATTRIBUTE_comment = 0x0009009C,/* User-Comment */
DRSUAPI_ATTRIBUTE_accountExpires = 0x0009009f,
DRSUAPI_ATTRIBUTE_lmPwdHistory = 0x000900a0,
DRSUAPI_ATTRIBUTE_systemPossSuperiors = 0x000900c3,
DRSUAPI_ATTRIBUTE_systemMayContain = 0x000900c4,
DRSUAPI_ATTRIBUTE_systemMustContain = 0x000900c5,
DRSUAPI_ATTRIBUTE_systemAuxiliaryClass = 0x000900c6,
DRSUAPI_ATTRIBUTE_sAMAccountName = 0x000900dd,
DRSUAPI_ATTRIBUTE_sAMAccountType = 0x0009012e,
DRSUAPI_ATTRIBUTE_options = 0x00090133,
DRSUAPI_ATTRIBUTE_fSMORoleOwner = 0x00090171,
DRSUAPI_ATTRIBUTE_systemFlags = 0x00090177,
DRSUAPI_ATTRIBUTE_serverReference = 0x00090203,
DRSUAPI_ATTRIBUTE_serverReferenceBL = 0x00090204,
DRSUAPI_ATTRIBUTE_initialAuthIncoming = 0x0009021b,
DRSUAPI_ATTRIBUTE_initialAuthOutgoing = 0x0009021c,
DRSUAPI_ATTRIBUTE_wellKnownObjects = 0x0009026a,
DRSUAPI_ATTRIBUTE_dNSHostName = 0x0009026b,
DRSUAPI_ATTRIBUTE_isMemberOfPartialAttributeSet = 0x0009027f,
DRSUAPI_ATTRIBUTE_userPrincipalName = 0x00090290,
DRSUAPI_ATTRIBUTE_groupType = 0x000902ee,
DRSUAPI_ATTRIBUTE_servicePrincipalName = 0x00090303,
DRSUAPI_ATTRIBUTE_lastKnownParent = 0x0009030d,
DRSUAPI_ATTRIBUTE_objectCategory = 0x0009030e,
DRSUAPI_ATTRIBUTE_gPLink = 0x0009037b,
DRSUAPI_ATTRIBUTE_transportAddressAttribute = 0x0009037f,
DRSUAPI_ATTRIBUTE_msDS_Behavior_Version = 0x000905b3,
DRSUAPI_ATTRIBUTE_msDS_KeyVersionNumber = 0x000906f6,
DRSUAPI_ATTRIBUTE_msDS_HasDomainNCs = 0x0009071c,
DRSUAPI_ATTRIBUTE_msDS_hasMasterNCs = 0x0009072c,
DRSUAPI_ATTRIBUTE_isRecycled = 0x0009080a,
DRSUAPI_ATTRIBUTE_NONE = 0xFFFFFFFF
DRSUAPI_ATTID_objectClass = 0x00000000,
DRSUAPI_ATTID_cn = 0x00000003,
DRSUAPI_ATTID_ou = 0x0000000b,
DRSUAPI_ATTID_description = 0x0000000d,
DRSUAPI_ATTID_member = 0x0000001f,
DRSUAPI_ATTID_instanceType = 0x00020001,
DRSUAPI_ATTID_whenCreated = 0x00020002,
DRSUAPI_ATTID_possSuperiors = 0x00020008,
DRSUAPI_ATTID_displayName = 0x0002000d,
DRSUAPI_ATTID_hasMasterNCs = 0x0002000e,
DRSUAPI_ATTID_subClassOf = 0x00020015,
DRSUAPI_ATTID_governsID = 0x00020016,
DRSUAPI_ATTID_mustContain = 0x00020018,
DRSUAPI_ATTID_mayContain = 0x00020019,
DRSUAPI_ATTID_rDNAttId = 0x0002001A,
DRSUAPI_ATTID_attributeID = 0x0002001e,
DRSUAPI_ATTID_attributeSyntax = 0x00020020,
DRSUAPI_ATTID_isSingleValued = 0x00020021,
DRSUAPI_ATTID_rangeLower = 0x00020022,
DRSUAPI_ATTID_rangeUpper = 0x00020023,
DRSUAPI_ATTID_dMDLocation = 0x00020024,
DRSUAPI_ATTID_isDeleted = 0x00020030,
DRSUAPI_ATTID_objectVersion = 0x0002004c,
DRSUAPI_ATTID_invocationId = 0x00020073,
DRSUAPI_ATTID_showInAdvancedViewOnly = 0x000200a9,
DRSUAPI_ATTID_adminDisplayName = 0x000200c2,
DRSUAPI_ATTID_adminDescription = 0x000200e2,
DRSUAPI_ATTID_oMSyntax = 0x000200e7,
DRSUAPI_ATTID_ntSecurityDescriptor = 0x00020119,
DRSUAPI_ATTID_searchFlags = 0x0002014e,
DRSUAPI_ATTID_auxiliaryClass = 0x0002015f,
DRSUAPI_ATTID_lDAPDisplayName = 0x000201cc,
DRSUAPI_ATTID_name = 0x00090001,
DRSUAPI_ATTID_userAccountControl = 0x00090008,
DRSUAPI_ATTID_codePage = 0x00090010,
DRSUAPI_ATTID_countryCode = 0x00090019,
DRSUAPI_ATTID_currentValue = 0x0009001b,
DRSUAPI_ATTID_homeDirectory = 0x0009002c,
DRSUAPI_ATTID_homeDrive = 0x0009002d,
DRSUAPI_ATTID_dBCSPwd = 0x00090037,/* lmPwdHash */
DRSUAPI_ATTID_scriptPath = 0x0009003e,
DRSUAPI_ATTID_logonHours = 0x00090040,
DRSUAPI_ATTID_userWorkstations = 0x00090056,
DRSUAPI_ATTID_unicodePwd = 0x0009005a,/* ntPwdHash */
DRSUAPI_ATTID_ntPwdHistory = 0x0009005e,
DRSUAPI_ATTID_pwdLastSet = 0x00090060,
DRSUAPI_ATTID_primaryGroupID = 0x00090062,
DRSUAPI_ATTID_priorValue = 0x00090064,
DRSUAPI_ATTID_supplementalCredentials = 0x0009007d,
DRSUAPI_ATTID_trustAuthIncoming = 0x00090081,
DRSUAPI_ATTID_trustAuthOutgoing = 0x00090087,
DRSUAPI_ATTID_profilePath = 0x0009008b,
DRSUAPI_ATTID_objectSid = 0x00090092,
DRSUAPI_ATTID_schemaIDGUID = 0x00090094,
DRSUAPI_ATTID_comment = 0x0009009C,/* User-Comment */
DRSUAPI_ATTID_accountExpires = 0x0009009f,
DRSUAPI_ATTID_lmPwdHistory = 0x000900a0,
DRSUAPI_ATTID_systemPossSuperiors = 0x000900c3,
DRSUAPI_ATTID_systemMayContain = 0x000900c4,
DRSUAPI_ATTID_systemMustContain = 0x000900c5,
DRSUAPI_ATTID_systemAuxiliaryClass = 0x000900c6,
DRSUAPI_ATTID_sAMAccountName = 0x000900dd,
DRSUAPI_ATTID_sAMAccountType = 0x0009012e,
DRSUAPI_ATTID_options = 0x00090133,
DRSUAPI_ATTID_fSMORoleOwner = 0x00090171,
DRSUAPI_ATTID_systemFlags = 0x00090177,
DRSUAPI_ATTID_serverReference = 0x00090203,
DRSUAPI_ATTID_serverReferenceBL = 0x00090204,
DRSUAPI_ATTID_initialAuthIncoming = 0x0009021b,
DRSUAPI_ATTID_initialAuthOutgoing = 0x0009021c,
DRSUAPI_ATTID_wellKnownObjects = 0x0009026a,
DRSUAPI_ATTID_dNSHostName = 0x0009026b,
DRSUAPI_ATTID_isMemberOfPartialAttributeSet = 0x0009027f,
DRSUAPI_ATTID_userPrincipalName = 0x00090290,
DRSUAPI_ATTID_groupType = 0x000902ee,
DRSUAPI_ATTID_servicePrincipalName = 0x00090303,
DRSUAPI_ATTID_lastKnownParent = 0x0009030d,
DRSUAPI_ATTID_objectCategory = 0x0009030e,
DRSUAPI_ATTID_gPLink = 0x0009037b,
DRSUAPI_ATTID_transportAddressAttribute = 0x0009037f,
DRSUAPI_ATTID_msDS_Behavior_Version = 0x000905b3,
DRSUAPI_ATTID_msDS_KeyVersionNumber = 0x000906f6,
DRSUAPI_ATTID_msDS_HasDomainNCs = 0x0009071c,
DRSUAPI_ATTID_msDS_hasMasterNCs = 0x0009072c,
DRSUAPI_ATTID_isRecycled = 0x0009080a,
DRSUAPI_ATTID_NONE = 0xFFFFFFFF
} drsuapi_DsAttributeId;
typedef struct {

48
librpc/ndr/ndr_drsuapi.c
View File

@ -154,34 +154,34 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaAttribute(struct ndr_print *ndr,
ndr->depth++;
ndr_print_drsuapi_DsAttributeId(ndr, "attid", r->attid);
switch (r->attid) {
case DRSUAPI_ATTRIBUTE_objectClass:
case DRSUAPI_ATTRIBUTE_possSuperiors:
case DRSUAPI_ATTRIBUTE_subClassOf:
case DRSUAPI_ATTRIBUTE_governsID:
case DRSUAPI_ATTRIBUTE_mustContain:
case DRSUAPI_ATTRIBUTE_mayContain:
case DRSUAPI_ATTRIBUTE_rDNAttId:
case DRSUAPI_ATTRIBUTE_attributeID:
case DRSUAPI_ATTRIBUTE_attributeSyntax:
case DRSUAPI_ATTRIBUTE_auxiliaryClass:
case DRSUAPI_ATTRIBUTE_systemPossSuperiors:
case DRSUAPI_ATTRIBUTE_systemMayContain:
case DRSUAPI_ATTRIBUTE_systemMustContain:
case DRSUAPI_ATTRIBUTE_systemAuxiliaryClass:
case DRSUAPI_ATTRIBUTE_transportAddressAttribute:
case DRSUAPI_ATTID_objectClass:
case DRSUAPI_ATTID_possSuperiors:
case DRSUAPI_ATTID_subClassOf:
case DRSUAPI_ATTID_governsID:
case DRSUAPI_ATTID_mustContain:
case DRSUAPI_ATTID_mayContain:
case DRSUAPI_ATTID_rDNAttId:
case DRSUAPI_ATTID_attributeID:
case DRSUAPI_ATTID_attributeSyntax:
case DRSUAPI_ATTID_auxiliaryClass:
case DRSUAPI_ATTID_systemPossSuperiors:
case DRSUAPI_ATTID_systemMayContain:
case DRSUAPI_ATTID_systemMustContain:
case DRSUAPI_ATTID_systemAuxiliaryClass:
case DRSUAPI_ATTID_transportAddressAttribute:
/* ATTIDs for classSchema and attributeSchema */
_print_drsuapi_DsAttributeValueCtr(ndr, "value_ctr", &r->value_ctr,
_print_drsuapi_DsAttributeValue_attid);
break;
case DRSUAPI_ATTRIBUTE_cn:
case DRSUAPI_ATTRIBUTE_ou:
case DRSUAPI_ATTRIBUTE_description:
case DRSUAPI_ATTRIBUTE_displayName:
case DRSUAPI_ATTRIBUTE_dMDLocation:
case DRSUAPI_ATTRIBUTE_adminDisplayName:
case DRSUAPI_ATTRIBUTE_adminDescription:
case DRSUAPI_ATTRIBUTE_lDAPDisplayName:
case DRSUAPI_ATTRIBUTE_name:
case DRSUAPI_ATTID_cn:
case DRSUAPI_ATTID_ou:
case DRSUAPI_ATTID_description:
case DRSUAPI_ATTID_displayName:
case DRSUAPI_ATTID_dMDLocation:
case DRSUAPI_ATTID_adminDisplayName:
case DRSUAPI_ATTID_adminDescription:
case DRSUAPI_ATTID_lDAPDisplayName:
case DRSUAPI_ATTID_name:
_print_drsuapi_DsAttributeValueCtr(ndr, "value_ctr", &r->value_ctr,
_print_drsuapi_DsAttributeValue_str);
break;

16
source3/libnet/libnet_dssync_keytab.c
View File

@ -273,7 +273,7 @@ static NTSTATUS parse_object(TALLOC_CTX *mem_ctx,
attr = &cur->object.attribute_ctr.attributes[i];
if (attr->attid == DRSUAPI_ATTRIBUTE_servicePrincipalName) {
if (attr->attid == DRSUAPI_ATTID_servicePrincipalName) {
uint32_t count;
num_spns = attr->value_ctr.num_values;
spn = TALLOC_ARRAY(mem_ctx, char *, num_spns);
@ -297,7 +297,7 @@ static NTSTATUS parse_object(TALLOC_CTX *mem_ctx,
blob = attr->value_ctr.values[0].blob;
switch (attr->attid) {
case DRSUAPI_ATTRIBUTE_unicodePwd:
case DRSUAPI_ATTID_unicodePwd:
if (blob->length != 16) {
break;
@ -318,27 +318,27 @@ static NTSTATUS parse_object(TALLOC_CTX *mem_ctx,
}
kvno = cur->meta_data_ctr->meta_data[i].version;
break;
case DRSUAPI_ATTRIBUTE_ntPwdHistory:
case DRSUAPI_ATTID_ntPwdHistory:
pwd_history_len = blob->length / 16;
pwd_history = blob->data;
break;
case DRSUAPI_ATTRIBUTE_userPrincipalName:
case DRSUAPI_ATTID_userPrincipalName:
pull_string_talloc(mem_ctx, NULL, 0, &upn,
blob->data, blob->length,
STR_UNICODE);
break;
case DRSUAPI_ATTRIBUTE_sAMAccountName:
case DRSUAPI_ATTID_sAMAccountName:
pull_string_talloc(mem_ctx, NULL, 0, &name,
blob->data, blob->length,
STR_UNICODE);
break;
case DRSUAPI_ATTRIBUTE_sAMAccountType:
case DRSUAPI_ATTID_sAMAccountType:
sam_type = IVAL(blob->data, 0);
break;
case DRSUAPI_ATTRIBUTE_userAccountControl:
case DRSUAPI_ATTID_userAccountControl:
uacc = IVAL(blob->data, 0);
break;
case DRSUAPI_ATTRIBUTE_supplementalCredentials:
case DRSUAPI_ATTID_supplementalCredentials:
status = parse_supplemental_credentials(mem_ctx,
blob,
&pkb3,

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

@ -141,7 +141,7 @@ WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
whenChanged = d->originating_change_time;
}
if (a->attid == DRSUAPI_ATTRIBUTE_name) {
if (a->attid == DRSUAPI_ATTID_name) {
name_a = a;
name_d = d;
rdn_m = &md->ctr.ctr1.array[md->ctr.ctr1.count];

2
source4/dsdb/samdb/ldb_modules/operational.c
View File

@ -486,7 +486,7 @@ static int construct_msds_keyversionnumber(struct ldb_module *module,
return LDB_SUCCESS;
}
for (i=0; i<omd->ctr.ctr1.count; i++) {
if (omd->ctr.ctr1.array[i].attid == DRSUAPI_ATTRIBUTE_unicodePwd) {
if (omd->ctr.ctr1.array[i].attid == DRSUAPI_ATTID_unicodePwd) {
ret = samdb_msg_add_uint(ldb_module_get_ctx(module),
msg, msg,
"msDS-KeyVersionNumber",

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

@ -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 : *

48
source4/dsdb/samdb/ldb_modules/resolve_oids.c
View File

@ -46,11 +46,11 @@ static int resolve_oids_need_value(struct ldb_context *ldb,
}
switch (a->attributeID_id) {
case DRSUAPI_ATTRIBUTE_objectClass:
case DRSUAPI_ATTRIBUTE_subClassOf:
case DRSUAPI_ATTRIBUTE_auxiliaryClass:
case DRSUAPI_ATTRIBUTE_systemPossSuperiors:
case DRSUAPI_ATTRIBUTE_possSuperiors:
case DRSUAPI_ATTID_objectClass:
case DRSUAPI_ATTID_subClassOf:
case DRSUAPI_ATTID_auxiliaryClass:
case DRSUAPI_ATTID_systemPossSuperiors:
case DRSUAPI_ATTID_possSuperiors:
str = talloc_strndup(ldb, (char *)valp->data, valp->length);
if (!str) {
return ldb_oom(ldb);
@ -61,10 +61,10 @@ static int resolve_oids_need_value(struct ldb_context *ldb,
return LDB_ERR_COMPARE_FALSE;
}
return LDB_ERR_COMPARE_TRUE;
case DRSUAPI_ATTRIBUTE_systemMustContain:
case DRSUAPI_ATTRIBUTE_systemMayContain:
case DRSUAPI_ATTRIBUTE_mustContain:
case DRSUAPI_ATTRIBUTE_mayContain:
case DRSUAPI_ATTID_systemMustContain:
case DRSUAPI_ATTID_systemMayContain:
case DRSUAPI_ATTID_mustContain:
case DRSUAPI_ATTID_mayContain:
str = talloc_strndup(ldb, (char *)valp->data, valp->length);
if (!str) {
return ldb_oom(ldb);
@ -75,9 +75,9 @@ static int resolve_oids_need_value(struct ldb_context *ldb,
return LDB_ERR_COMPARE_FALSE;
}
return LDB_ERR_COMPARE_TRUE;
case DRSUAPI_ATTRIBUTE_governsID:
case DRSUAPI_ATTRIBUTE_attributeID:
case DRSUAPI_ATTRIBUTE_attributeSyntax:
case DRSUAPI_ATTID_governsID:
case DRSUAPI_ATTID_attributeID:
case DRSUAPI_ATTID_attributeSyntax:
return LDB_ERR_COMPARE_FALSE;
}
@ -233,11 +233,11 @@ static int resolve_oids_replace_value(struct ldb_context *ldb,
}
switch (a->attributeID_id) {
case DRSUAPI_ATTRIBUTE_objectClass:
case DRSUAPI_ATTRIBUTE_subClassOf:
case DRSUAPI_ATTRIBUTE_auxiliaryClass:
case DRSUAPI_ATTRIBUTE_systemPossSuperiors:
case DRSUAPI_ATTRIBUTE_possSuperiors:
case DRSUAPI_ATTID_objectClass:
case DRSUAPI_ATTID_subClassOf:
case DRSUAPI_ATTID_auxiliaryClass:
case DRSUAPI_ATTID_systemPossSuperiors:
case DRSUAPI_ATTID_possSuperiors:
str = talloc_strndup(schema, (char *)valp->data, valp->length);
if (!str) {
return ldb_oom(ldb);
@ -249,10 +249,10 @@ static int resolve_oids_replace_value(struct ldb_context *ldb,
}
*valp = data_blob_string_const(vo->lDAPDisplayName);
return LDB_SUCCESS;
case DRSUAPI_ATTRIBUTE_systemMustContain:
case DRSUAPI_ATTRIBUTE_systemMayContain:
case DRSUAPI_ATTRIBUTE_mustContain:
case DRSUAPI_ATTRIBUTE_mayContain:
case DRSUAPI_ATTID_systemMustContain:
case DRSUAPI_ATTID_systemMayContain:
case DRSUAPI_ATTID_mustContain:
case DRSUAPI_ATTID_mayContain:
str = talloc_strndup(schema, (char *)valp->data, valp->length);
if (!str) {
return ldb_oom(ldb);
@ -264,9 +264,9 @@ static int resolve_oids_replace_value(struct ldb_context *ldb,
}
*valp = data_blob_string_const(va->lDAPDisplayName);
return LDB_SUCCESS;
case DRSUAPI_ATTRIBUTE_governsID:
case DRSUAPI_ATTRIBUTE_attributeID:
case DRSUAPI_ATTRIBUTE_attributeSyntax:
case DRSUAPI_ATTID_governsID:
case DRSUAPI_ATTID_attributeID:
case DRSUAPI_ATTID_attributeSyntax:
return LDB_SUCCESS;
}

66
source4/dsdb/schema/schema_syntax.c
View File

@ -1230,25 +1230,25 @@ static WERROR dsdb_syntax_OID_drsuapi_to_ldb(const struct dsdb_syntax_ctx *ctx,
WERROR werr;
switch (attr->attributeID_id) {
case DRSUAPI_ATTRIBUTE_objectClass:
case DRSUAPI_ATTRIBUTE_subClassOf:
case DRSUAPI_ATTRIBUTE_auxiliaryClass:
case DRSUAPI_ATTRIBUTE_systemAuxiliaryClass:
case DRSUAPI_ATTRIBUTE_systemPossSuperiors:
case DRSUAPI_ATTRIBUTE_possSuperiors:
case DRSUAPI_ATTID_objectClass:
case DRSUAPI_ATTID_subClassOf:
case DRSUAPI_ATTID_auxiliaryClass:
case DRSUAPI_ATTID_systemAuxiliaryClass:
case DRSUAPI_ATTID_systemPossSuperiors:
case DRSUAPI_ATTID_possSuperiors:
werr = _dsdb_syntax_OID_obj_drsuapi_to_ldb(ctx, attr, in, mem_ctx, out);
break;
case DRSUAPI_ATTRIBUTE_systemMustContain:
case DRSUAPI_ATTRIBUTE_systemMayContain:
case DRSUAPI_ATTRIBUTE_mustContain:
case DRSUAPI_ATTRIBUTE_rDNAttId:
case DRSUAPI_ATTRIBUTE_transportAddressAttribute:
case DRSUAPI_ATTRIBUTE_mayContain:
case DRSUAPI_ATTID_systemMustContain:
case DRSUAPI_ATTID_systemMayContain:
case DRSUAPI_ATTID_mustContain:
case DRSUAPI_ATTID_rDNAttId:
case DRSUAPI_ATTID_transportAddressAttribute:
case DRSUAPI_ATTID_mayContain:
werr = _dsdb_syntax_OID_attr_drsuapi_to_ldb(ctx, attr, in, mem_ctx, out);
break;
case DRSUAPI_ATTRIBUTE_governsID:
case DRSUAPI_ATTRIBUTE_attributeID:
case DRSUAPI_ATTRIBUTE_attributeSyntax:
case DRSUAPI_ATTID_governsID:
case DRSUAPI_ATTID_attributeID:
case DRSUAPI_ATTID_attributeSyntax:
werr = _dsdb_syntax_OID_oid_drsuapi_to_ldb(ctx, attr, in, mem_ctx, out);
break;
default:
@ -1278,23 +1278,23 @@ static WERROR dsdb_syntax_OID_ldb_to_drsuapi(const struct dsdb_syntax_ctx *ctx,
}
switch (attr->attributeID_id) {
case DRSUAPI_ATTRIBUTE_objectClass:
case DRSUAPI_ATTRIBUTE_subClassOf:
case DRSUAPI_ATTRIBUTE_auxiliaryClass:
case DRSUAPI_ATTRIBUTE_systemAuxiliaryClass:
case DRSUAPI_ATTRIBUTE_systemPossSuperiors:
case DRSUAPI_ATTRIBUTE_possSuperiors:
case DRSUAPI_ATTID_objectClass:
case DRSUAPI_ATTID_subClassOf:
case DRSUAPI_ATTID_auxiliaryClass:
case DRSUAPI_ATTID_systemAuxiliaryClass:
case DRSUAPI_ATTID_systemPossSuperiors:
case DRSUAPI_ATTID_possSuperiors:
return _dsdb_syntax_OID_obj_ldb_to_drsuapi(ctx, attr, in, mem_ctx, out);
case DRSUAPI_ATTRIBUTE_systemMustContain:
case DRSUAPI_ATTRIBUTE_systemMayContain:
case DRSUAPI_ATTRIBUTE_mustContain:
case DRSUAPI_ATTRIBUTE_rDNAttId:
case DRSUAPI_ATTRIBUTE_transportAddressAttribute:
case DRSUAPI_ATTRIBUTE_mayContain:
case DRSUAPI_ATTID_systemMustContain:
case DRSUAPI_ATTID_systemMayContain:
case DRSUAPI_ATTID_mustContain:
case DRSUAPI_ATTID_rDNAttId:
case DRSUAPI_ATTID_transportAddressAttribute:
case DRSUAPI_ATTID_mayContain:
return _dsdb_syntax_OID_attr_ldb_to_drsuapi(ctx, attr, in, mem_ctx, out);
case DRSUAPI_ATTRIBUTE_governsID:
case DRSUAPI_ATTRIBUTE_attributeID:
case DRSUAPI_ATTRIBUTE_attributeSyntax:
case DRSUAPI_ATTID_governsID:
case DRSUAPI_ATTID_attributeID:
case DRSUAPI_ATTID_attributeSyntax:
return _dsdb_syntax_OID_oid_ldb_to_drsuapi(ctx, attr, in, mem_ctx, out);
}
@ -1356,9 +1356,9 @@ static WERROR dsdb_syntax_OID_validate_ldb(const struct dsdb_syntax_ctx *ctx,
}
switch (attr->attributeID_id) {
case DRSUAPI_ATTRIBUTE_governsID:
case DRSUAPI_ATTRIBUTE_attributeID:
case DRSUAPI_ATTRIBUTE_attributeSyntax:
case DRSUAPI_ATTID_governsID:
case DRSUAPI_ATTID_attributeID:
case DRSUAPI_ATTID_attributeSyntax:
return _dsdb_syntax_OID_validate_numericoid(ctx, attr, in);
}

24
source4/libnet/libnet_become_dc.c
View File

@ -1837,7 +1837,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s)
vs[0].blob = &vd[0];
attrs[i].attid = DRSUAPI_ATTRIBUTE_ntSecurityDescriptor;
attrs[i].attid = DRSUAPI_ATTID_ntSecurityDescriptor;
attrs[i].value_ctr.num_values = 1;
attrs[i].value_ctr.values = vs;
@ -1863,7 +1863,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s)
vs[0].blob = &vd[0];
attrs[i].attid = DRSUAPI_ATTRIBUTE_objectClass;
attrs[i].attid = DRSUAPI_ATTID_objectClass;
attrs[i].value_ctr.num_values = 1;
attrs[i].value_ctr.values = vs;
@ -1903,7 +1903,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s)
vs[0].blob = &vd[0];
attrs[i].attid = DRSUAPI_ATTRIBUTE_objectCategory;
attrs[i].attid = DRSUAPI_ATTID_objectCategory;
attrs[i].value_ctr.num_values = 1;
attrs[i].value_ctr.values = vs;
@ -1929,7 +1929,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s)
vs[0].blob = &vd[0];
attrs[i].attid = DRSUAPI_ATTRIBUTE_invocationId;
attrs[i].attid = DRSUAPI_ATTID_invocationId;
attrs[i].value_ctr.num_values = 1;
attrs[i].value_ctr.values = vs;
@ -1985,7 +1985,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s)
vs[1].blob = &vd[1];
vs[2].blob = &vd[2];
attrs[i].attid = DRSUAPI_ATTRIBUTE_hasMasterNCs;
attrs[i].attid = DRSUAPI_ATTID_hasMasterNCs;
attrs[i].value_ctr.num_values = 3;
attrs[i].value_ctr.values = vs;
@ -2041,7 +2041,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s)
vs[1].blob = &vd[1];
vs[2].blob = &vd[2];
attrs[i].attid = DRSUAPI_ATTRIBUTE_msDS_hasMasterNCs;
attrs[i].attid = DRSUAPI_ATTID_msDS_hasMasterNCs;
attrs[i].value_ctr.num_values = 3;
attrs[i].value_ctr.values = vs;
@ -2073,7 +2073,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s)
vs[0].blob = &vd[0];
attrs[i].attid = DRSUAPI_ATTRIBUTE_dMDLocation;
attrs[i].attid = DRSUAPI_ATTID_dMDLocation;
attrs[i].value_ctr.num_values = 1;
attrs[i].value_ctr.values = vs;
@ -2105,7 +2105,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s)
vs[0].blob = &vd[0];
attrs[i].attid = DRSUAPI_ATTRIBUTE_msDS_HasDomainNCs;
attrs[i].attid = DRSUAPI_ATTID_msDS_HasDomainNCs;
attrs[i].value_ctr.num_values = 1;
attrs[i].value_ctr.values = vs;
@ -2130,7 +2130,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s)
vs[0].blob = &vd[0];
attrs[i].attid = DRSUAPI_ATTRIBUTE_msDS_Behavior_Version;
attrs[i].attid = DRSUAPI_ATTID_msDS_Behavior_Version;
attrs[i].value_ctr.num_values = 1;
attrs[i].value_ctr.values = vs;
@ -2159,7 +2159,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s)
vs[0].blob = &vd[0];
attrs[i].attid = DRSUAPI_ATTRIBUTE_systemFlags;
attrs[i].attid = DRSUAPI_ATTID_systemFlags;
attrs[i].value_ctr.num_values = 1;
attrs[i].value_ctr.values = vs;
@ -2191,7 +2191,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s)
vs[0].blob = &vd[0];
attrs[i].attid = DRSUAPI_ATTRIBUTE_serverReference;
attrs[i].attid = DRSUAPI_ATTID_serverReference;
attrs[i].value_ctr.num_values = 1;
attrs[i].value_ctr.values = vs;
@ -2216,7 +2216,7 @@ static void becomeDC_drsuapi1_add_entry_send(struct libnet_BecomeDC_state *s)
vs[0].blob = &vd[0];
attrs[i].attid = DRSUAPI_ATTRIBUTE_options;
attrs[i].attid = DRSUAPI_ATTID_options;
attrs[i].value_ctr.num_values = 1;
attrs[i].value_ctr.values = vs;

22
source4/rpc_server/drsuapi/drsutil.c
View File

@ -119,17 +119,17 @@ void drsuapi_process_secret_attribute(struct drsuapi_DsReplicaAttribute *attr,
}
switch (attr->attid) {
case DRSUAPI_ATTRIBUTE_dBCSPwd:
case DRSUAPI_ATTRIBUTE_unicodePwd:
case DRSUAPI_ATTRIBUTE_ntPwdHistory:
case DRSUAPI_ATTRIBUTE_lmPwdHistory:
case DRSUAPI_ATTRIBUTE_supplementalCredentials:
case DRSUAPI_ATTRIBUTE_priorValue:
case DRSUAPI_ATTRIBUTE_currentValue:
case DRSUAPI_ATTRIBUTE_trustAuthOutgoing:
case DRSUAPI_ATTRIBUTE_trustAuthIncoming:
case DRSUAPI_ATTRIBUTE_initialAuthOutgoing:
case DRSUAPI_ATTRIBUTE_initialAuthIncoming:
case DRSUAPI_ATTID_dBCSPwd:
case DRSUAPI_ATTID_unicodePwd:
case DRSUAPI_ATTID_ntPwdHistory:
case DRSUAPI_ATTID_lmPwdHistory:
case DRSUAPI_ATTID_supplementalCredentials:
case DRSUAPI_ATTID_priorValue:
case DRSUAPI_ATTID_currentValue:
case DRSUAPI_ATTID_trustAuthOutgoing:
case DRSUAPI_ATTID_trustAuthIncoming:
case DRSUAPI_ATTID_initialAuthOutgoing:
case DRSUAPI_ATTID_initialAuthIncoming:
/*set value to null*/
attr->value_ctr.num_values = 0;
talloc_free(attr->value_ctr.values);

6
source4/rpc_server/drsuapi/getncchanges.c
View File

@ -207,7 +207,7 @@ static WERROR get_nc_changes_build_object(struct drsuapi_DsReplicaObjectListItem
instanceType then don't include it */
if (md.ctr.ctr1.array[i].local_usn < highest_usn &&
extended_op != DRSUAPI_EXOP_REPL_SECRET &&
md.ctr.ctr1.array[i].attid != DRSUAPI_ATTRIBUTE_instanceType) continue;
md.ctr.ctr1.array[i].attid != DRSUAPI_ATTID_instanceType) continue;
/* don't include the rDN */
if (md.ctr.ctr1.array[i].attid == rdn_sa->attributeID_id) continue;
@ -237,7 +237,7 @@ static WERROR get_nc_changes_build_object(struct drsuapi_DsReplicaObjectListItem
}
/* filter by uptodateness_vector */
if (md.ctr.ctr1.array[i].attid != DRSUAPI_ATTRIBUTE_instanceType &&
if (md.ctr.ctr1.array[i].attid != DRSUAPI_ATTID_instanceType &&
!force_attribute &&
udv_filter(uptodateness_vector,
&md.ctr.ctr1.array[i].originating_invocation_id,
@ -262,7 +262,7 @@ static WERROR get_nc_changes_build_object(struct drsuapi_DsReplicaObjectListItem
* change the 'name' attribute, so they won't be ignored by
* this */
if (n == 0 ||
(n == 1 && attids[0] == DRSUAPI_ATTRIBUTE_instanceType)) {
(n == 1 && attids[0] == DRSUAPI_ATTID_instanceType)) {
talloc_free(obj->meta_data_ctr);
obj->meta_data_ctr = NULL;
return WERR_OK;

22
source4/torture/drs/rpc/dssync.c
View File

@ -544,50 +544,50 @@ static bool test_analyse_objects(struct torture_context *tctx,
attr = &cur->object.attribute_ctr.attributes[i];
switch (attr->attid) {
case DRSUAPI_ATTRIBUTE_dBCSPwd:
case DRSUAPI_ATTID_dBCSPwd:
name = "dBCSPwd";
rcrypt = true;
break;
case DRSUAPI_ATTRIBUTE_unicodePwd:
case DRSUAPI_ATTID_unicodePwd:
name = "unicodePwd";
rcrypt = true;
break;
case DRSUAPI_ATTRIBUTE_ntPwdHistory:
case DRSUAPI_ATTID_ntPwdHistory:
name = "ntPwdHistory";
rcrypt = true;
break;
case DRSUAPI_ATTRIBUTE_lmPwdHistory:
case DRSUAPI_ATTID_lmPwdHistory:
name = "lmPwdHistory";
rcrypt = true;
break;
case DRSUAPI_ATTRIBUTE_supplementalCredentials:
case DRSUAPI_ATTID_supplementalCredentials:
name = "supplementalCredentials";
pull_fn = (ndr_pull_flags_fn_t)ndr_pull_supplementalCredentialsBlob;
print_fn = (ndr_print_fn_t)ndr_print_supplementalCredentialsBlob;
ptr = talloc(ctx, struct supplementalCredentialsBlob);
break;
case DRSUAPI_ATTRIBUTE_priorValue:
case DRSUAPI_ATTID_priorValue:
name = "priorValue";
break;
case DRSUAPI_ATTRIBUTE_currentValue:
case DRSUAPI_ATTID_currentValue:
name = "currentValue";
break;
case DRSUAPI_ATTRIBUTE_trustAuthOutgoing:
case DRSUAPI_ATTID_trustAuthOutgoing:
name = "trustAuthOutgoing";
pull_fn = (ndr_pull_flags_fn_t)ndr_pull_trustAuthInOutBlob;
print_fn = (ndr_print_fn_t)ndr_print_trustAuthInOutBlob;
ptr = talloc(ctx, struct trustAuthInOutBlob);
break;
case DRSUAPI_ATTRIBUTE_trustAuthIncoming:
case DRSUAPI_ATTID_trustAuthIncoming:
name = "trustAuthIncoming";
pull_fn = (ndr_pull_flags_fn_t)ndr_pull_trustAuthInOutBlob;
print_fn = (ndr_print_fn_t)ndr_print_trustAuthInOutBlob;
ptr = talloc(ctx, struct trustAuthInOutBlob);
break;
case DRSUAPI_ATTRIBUTE_initialAuthOutgoing:
case DRSUAPI_ATTID_initialAuthOutgoing:
name = "initialAuthOutgoing";
break;
case DRSUAPI_ATTRIBUTE_initialAuthIncoming:
case DRSUAPI_ATTID_initialAuthIncoming:
name = "initialAuthIncoming";
break;
default: