From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 8 Jan 2005 09:18:09 +0000 (+0000)
Subject: reset e_ocflags on objectClass modify (import from HEAD)
X-Git-Tag: OPENLDAP_REL_ENG_2_2_21~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8df6a6a02c881b6ee8d09604dc6dc2e7873b3ad2;p=thirdparty%2Fopenldap.git

reset e_ocflags on objectClass modify (import from HEAD)
---

diff --git a/CHANGES b/CHANGES
index ffc791c6c5..ba776ef4cf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.2 Change Log
 
 OpenLDAP 2.2.21 Engineering
 	Fixed slapd group limits
+	Fixed back-bdb entry e_ocflags reset on objectClass modify
 
 OpenLDAP 2.2.20 Release
 	Fixed slapd sanity check on protocol in authz-regexp URI (ITS#3411)
diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index f44c362b11..2a531f710d 100644
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -565,6 +565,7 @@ retry:	/* transaction retry */
 			goto return_results;
 		}
 	} else {
+		e->e_ocflags = dummy.e_ocflags;
 		rc = bdb_cache_modify( e, dummy.e_attrs, bdb->bi_dbenv, locker, &lock );
 		switch( rc ) {
 		case DB_LOCK_DEADLOCK: