Commit 29fe732a authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5968

parent bb23e559
......@@ -5,6 +5,7 @@ OpenLDAP 2.4.15 Release (2009/02/19)
Fixed libldap GnuTLS compilation (ITS#5955)
Fixed slapd bconfig conversion again (ITS#5346)
Fixed slapd behavior with superior objectClasses again (ITS#5517)
Fixed slapd RFC4512 behavior with same attr in RDN (ITS#5968)
Fixed slapd corrupt contextCSN (ITS#5947)
Fixed slapd syncrepl order to match on add/delete (ITS#5954)
Fixed slapd adding rdn with other values (ITS#5965)
......
......@@ -250,21 +250,8 @@ AVA_Sort( LDAPRDN rdn, int nAVAs )
ava_j = rdn[ j ];
a = strcmp( ava_i->la_attr.bv_val, ava_j->la_attr.bv_val );
if ( a == 0 ) {
int d;
d = ava_i->la_value.bv_len - ava_j->la_value.bv_len;
a = memcmp( ava_i->la_value.bv_val,
ava_j->la_value.bv_val,
d <= 0 ? ava_i->la_value.bv_len
: ava_j->la_value.bv_len );
if ( a == 0 ) {
a = d;
}
}
/* Duplicates are not allowed */
/* RFC4512 does not allow multiple AVAs
* with the same attribute type in RDN (ITS#5968) */
if ( a == 0 )
return LDAP_INVALID_DN_SYNTAX;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment