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

ITS#5819

parent 658c99d1
...@@ -25,6 +25,7 @@ OpenLDAP 2.4.13 Release (2008/11/20) ...@@ -25,6 +25,7 @@ OpenLDAP 2.4.13 Release (2008/11/20)
Fixed slapd parsing of read entry control (ITS#5741) Fixed slapd parsing of read entry control (ITS#5741)
Added slapd PMI schema (ITS#5695) Added slapd PMI schema (ITS#5695)
Added slapd private databases in global overlays (ITS#5735,ITS#5736) Added slapd private databases in global overlays (ITS#5735,ITS#5736)
Fixed slapd rdn generation when it isn't specified (ITS#5819)
Fixed slapd slapd.conf validation to LDIF (ITS#5755) Fixed slapd slapd.conf validation to LDIF (ITS#5755)
Fixed slapd startup scan for CSN (ITS#5640) Fixed slapd startup scan for CSN (ITS#5640)
Fixed slapd statslog printing of released entry (ITS#5775) Fixed slapd statslog printing of released entry (ITS#5775)
......
...@@ -880,11 +880,13 @@ entry_naming_check( ...@@ -880,11 +880,13 @@ entry_naming_check(
ava->la_attr.bv_val ); ava->la_attr.bv_val );
break; break;
case LDAP_NO_SUCH_ATTRIBUTE: case LDAP_NO_SUCH_ATTRIBUTE:
if ( add_naming ) {
add = 1;
rc = LDAP_SUCCESS;
} else {
snprintf( textbuf, textlen, snprintf( textbuf, textlen,
"value of naming attribute '%s' is not present in entry", "value of naming attribute '%s' is not present in entry",
ava->la_attr.bv_val ); ava->la_attr.bv_val );
if ( add_naming ) {
add = 1;
} }
break; break;
default: default:
...@@ -892,9 +894,12 @@ entry_naming_check( ...@@ -892,9 +894,12 @@ entry_naming_check(
"naming attribute '%s' is inappropriate", "naming attribute '%s' is inappropriate",
ava->la_attr.bv_val ); ava->la_attr.bv_val );
} }
if ( !add ) {
rc = LDAP_NAMING_VIOLATION; rc = LDAP_NAMING_VIOLATION;
} }
} }
}
if ( add ) { if ( add ) {
attr_merge_normalize_one( e, desc, &ava->la_value, NULL ); attr_merge_normalize_one( e, desc, &ava->la_value, NULL );
......
Supports Markdown
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