reset e_ocflags on objectClass modify (import from HEAD)

diff --git a/CHANGES b/CHANGES
index ffc791c6c577f51aa7624bd0fc502ad2a6332c0b..ba776ef4cfaee6aa166e547219158c1afba0f55b 100644 (file)
--- 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 f44c362b11a2b52192ae786f745486b7dafd361b..2a531f710dbfc6b62ad45d917991482bd9548231 100644 (file)
--- 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: