From 717b1158a6a4e94c0a37623731d398723a24eed8 Mon Sep 17 00:00:00 2001 From: Kamen Mazdrashki Date: Fri, 29 Oct 2010 02:22:35 +0300 Subject: 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. --- source3/libnet/libnet_dssync_keytab.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/libnet/libnet_dssync_keytab.c') diff --git a/source3/libnet/libnet_dssync_keytab.c b/source3/libnet/libnet_dssync_keytab.c index 96fb9c994b..65085cd96e 100644 --- a/source3/libnet/libnet_dssync_keytab.c +++ b/source3/libnet/libnet_dssync_keytab.c @@ -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, -- cgit