Commit 40080f65 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5965

parent f0867fb0
......@@ -6,6 +6,7 @@ OpenLDAP 2.4.15 Release (2009/02/19)
Fixed slapd bconfig conversion again (ITS#5346)
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)
Fixed slapd-bdb/hdb behavior with unallocatable shm (ITS#5956)
Fixed slapd-ldap/meta with entries with invalid attrs (ITS#5959)
Fixed slapd-relay control initialization (ITS#5724)
......
......@@ -881,7 +881,7 @@ entry_naming_check(
SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
&ava->la_value, NULL, NULL );
if( rc != 0 ) {
if ( rc != 0 ) {
switch( rc ) {
case LDAP_INAPPROPRIATE_MATCHING:
snprintf( textbuf, textlen,
......@@ -895,8 +895,16 @@ entry_naming_check(
break;
case LDAP_NO_SUCH_ATTRIBUTE:
if ( add_naming ) {
add = 1;
rc = LDAP_SUCCESS;
if ( is_at_single_value( desc->ad_type ) ) {
snprintf( textbuf, textlen,
"value of single-valued naming attribute '%s' conflicts with value present in entry",
ava->la_attr.bv_val );
} else {
add = 1;
rc = LDAP_SUCCESS;
}
} else {
snprintf( textbuf, textlen,
"value of naming attribute '%s' is not present in entry",
......
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