From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 3 Feb 2011 03:14:49 +0000 (+0000)
Subject: ITS#6821
X-Git-Tag: OPENLDAP_REL_ENG_2_4_24~15
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cc2db853167bfb389c399d94d83fdc6e95b28fc4;p=openldap

ITS#6821
---

diff --git a/CHANGES b/CHANGES
index d5d4dcc00b..ddea9c5730 100644
--- a/CHANGES
+++ b/CHANGES
@@ -81,6 +81,7 @@ OpenLDAP 2.4.24 Engineering
 	Fixed slapd-ndb to honor rootpw setting (ITS#6661)
 	Fixed slapd-ndb hasSubordinates generation (ITS#6712)
 	Fixed slapd-ndb variable initialization (ITS#6806)
+	Fixed slapd-ndb with out of order attributes (ITS#6821)
 	Fixed slapd-meta anon retry with failed auth method (ITS#6643)
 	Fixed slapd-meta rebind proc (ITS#6665)
 	Fixed slapd-meta to correctly rebind as user (ITS#6574)
diff --git a/servers/slapd/back-ndb/modify.cpp b/servers/slapd/back-ndb/modify.cpp
index dac207b279..188826140c 100644
--- a/servers/slapd/back-ndb/modify.cpp
+++ b/servers/slapd/back-ndb/modify.cpp
@@ -334,6 +334,14 @@ int ndb_modify_internal(
 		return rc;
 	}
 
+	if ( got_oc ) {
+		rc = ndb_entry_put_info( op->o_bd, NA, 1 );
+		if ( rc ) {
+			attrs_free( old );
+			return rc;
+		}
+	}
+
 	/* apply modifications to DB */
 	modai = (NdbAttrInfo **)op->o_tmpalloc( nmods * sizeof(NdbAttrInfo*), op->o_tmpmemctx );
 
@@ -357,7 +365,8 @@ int ndb_modify_internal(
 	}
 	ldap_pvt_thread_rdwr_runlock( &ni->ni_ai_rwlock );
 
-	if ( got_oc || indexed ) {
+	/* If got_oc, this was already done above */
+	if ( indexed && !got_oc) {
 		rc = ndb_entry_put_info( op->o_bd, NA, 1 );
 		if ( rc ) {
 			attrs_free( old );