upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More for #5057 - reject duplicate AVAs

Browse source
This commit is contained in:
Howard Chu 2007-07-23 05:49:49 +00:00
parent c6b1e35598
commit b236aba403
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
servers/slapd/dn.c
View file

@ -231,7 +231,7 @@ rdnValidate(
* uses an insertion sort; should be fine since the number of AVAs in
* a RDN should be limited.
*/
static void
static int
AVA_Sort( LDAPRDN rdn, int nAVAs )
{
LDAPAVA *ava_i;
@ -260,17 +260,22 @@ AVA_Sort( LDAPRDN rdn, int nAVAs )
d <= 0 ? ava_i->la_value.bv_len
: ava_j->la_value.bv_len );
if ( a == 0 && d != 0 ) {
if ( a == 0 ) {
a = d;
}
}
if ( a >= 0 )
/* Duplicates are not allowed */
if ( a == 0 )
return LDAP_INVALID_DN_SYNTAX;
if ( a > 0 )
break;
rdn[ j+1 ] = rdn[ j ];
}
rdn[ j+1 ] = ava_i;
}
return LDAP_SUCCESS;
}
static int
@ -391,10 +396,13 @@ LDAPRDN_rewrite( LDAPRDN rdn, unsigned flags, void *ctx )
ava->la_flags |= LDAP_AVA_FREE_VALUE;
}
}
if ( do_sort )
AVA_Sort( rdn, iAVA );
rc = LDAP_SUCCESS;
return LDAP_SUCCESS;
if ( do_sort ) {
rc = AVA_Sort( rdn, iAVA );
}
return rc;
}
/*