reset e_ocflags on objectClass modify (import from HEAD)

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)

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: