upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-06 15:10:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix X-ORDERED SIBLINGS

Browse source
This commit is contained in:
Howard Chu 2005-04-21 06:39:58 +00:00
parent 2f877b48b1
commit 854b433489
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
servers/slapd/at.c
View file

@ -519,11 +519,16 @@ at_add(
if ( sat->sat_extensions ) {
for (i=0; sat->sat_extensions[i]; i++) {
if (!strcasecmp( sat->sat_extensions[i]->lsei_name,
"X-ORDERED" ) && sat->sat_extensions[i]->lsei_values &&
!strcasecmp( sat->sat_extensions[i]->lsei_values[0],
"VALUES" )) {
sat->sat_flags |= SLAP_AT_ORDERED;
break;
"X-ORDERED" ) && sat->sat_extensions[i]->lsei_values ) {
if ( !strcasecmp( sat->sat_extensions[i]->lsei_values[0],
"VALUES" )) {
sat->sat_flags |= SLAP_AT_ORDERED_VAL;
break;
} else if ( !strcasecmp( sat->sat_extensions[i]->lsei_values[0],
"SIBLINGS" )) {
sat->sat_flags |= SLAP_AT_ORDERED_SIB;
break;
}
}
}
}

2
servers/slapd/bconfig.c
View file

@ -3189,7 +3189,7 @@ check_vals( ConfigTable *ct, ConfigArgs *ca, void *ptr, int isAttr )
vals = ml->sml_values;
}
if ( a && ( ad->ad_type->sat_flags & SLAP_AT_ORDERED )) {
if ( a && ( ad->ad_type->sat_flags & SLAP_AT_ORDERED_VAL )) {
sort = 1;
rc = ordered_value_sort( a, 1 );
if ( rc )

4
servers/slapd/mods.c
View file

@ -143,7 +143,7 @@ modify_add_values(
}
/* no - add them */
if ( mod->sm_desc->ad_type->sat_flags & SLAP_AT_ORDERED ) {
if ( mod->sm_desc->ad_type->sat_flags & SLAP_AT_ORDERED_VAL ) {
rc = ordered_value_add( e, mod->sm_desc, a,
pmod.sm_values, pmod.sm_nvalues );
} else {
@ -333,7 +333,7 @@ modify_delete_vindex(
mod->sm_desc->ad_cname.bv_val );
rc = LDAP_NO_SUCH_ATTRIBUTE;
}
} else if ( a->a_desc->ad_type->sat_flags & SLAP_AT_ORDERED ) {
} else if ( a->a_desc->ad_type->sat_flags & SLAP_AT_ORDERED_VAL ) {
/* For an ordered attribute, renumber the value indices */
ordered_value_sort( a, 1 );
}

4
servers/slapd/slap.h
View file

@ -659,7 +659,9 @@ typedef struct slap_attribute_type {
#endif
#define SLAP_AT_DYNAMIC 0x0400U /* dynamically generated */
#define SLAP_AT_ORDERED 0x0001U /* values are ordered */
#define SLAP_AT_ORDERED_VAL 0x0001U /* values are ordered */
#define SLAP_AT_ORDERED_SIB 0x0002U /* siblings are ordered */
#define SLAP_AT_ORDERED 0x0003U /* value has order index */
#define SLAP_AT_HARDCODE 0x10000U /* This is hardcoded schema */
slap_mask_t sat_flags;