From 6f2004961018ccd0cd0334c2165fe53b35d6dd8a Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 19 Nov 2008 16:02:22 +0000
Subject: [PATCH] clear rc if value must be added (ITS#5819)

---
 servers/slapd/schema_check.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index ca0f730980..e45a63d7d7 100644
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -885,6 +885,7 @@ entry_naming_check(
 						ava->la_attr.bv_val );
 					if ( add_naming ) {
 						add = 1;
+						rc = LDAP_SUCCESS;
 					}
 					break;
 				default:
@@ -892,7 +893,10 @@ entry_naming_check(
 						"naming attribute '%s' is inappropriate",
 						ava->la_attr.bv_val );
 				}
-				rc = LDAP_NAMING_VIOLATION;
+
+				if ( !add ) {
+					rc = LDAP_NAMING_VIOLATION;
+				}
 			}
 		}
 
-- 
2.39.5