--- servers/slapd/overlays/unique.c	2015-08-14 17:25:28.000000000 +0200
+++ servers/slapd/overlays/unique.c	2015-09-07 22:00:44.217833199 +0200
@@ -1038,9 +1038,8 @@
 	Debug(LDAP_DEBUG_TRACE, "==> unique_add <%s>\n",
 	      op->o_req_dn.bv_val, 0, 0);
 
-	/* skip the checks if the operation has manageDsaIt control in it
-	 * (for replication) */
-	if ( op->o_managedsait > SLAP_CONTROL_IGNORED
+	/* skip the checks if the operation has relax control in it */
+	if ( op->o_relax > SLAP_CONTROL_IGNORED
 	     && access_allowed ( op, op->ora_e,
 				 slap_schema.si_ad_entry, NULL,
 				 ACL_MANAGE, NULL ) ) {
@@ -1170,9 +1169,8 @@
 	Debug(LDAP_DEBUG_TRACE, "==> unique_modify <%s>\n",
 	      op->o_req_dn.bv_val, 0, 0);
 
-	/* skip the checks if the operation has manageDsaIt control in it
-	 * (for replication) */
-	if ( op->o_managedsait > SLAP_CONTROL_IGNORED
+	/* skip the checks if the operation has relax control in it */
+	if ( op->o_relax > SLAP_CONTROL_IGNORED
 	     && overlay_entry_get_ov(op, &op->o_req_ndn, NULL, NULL, 0, &e, on) == LDAP_SUCCESS
 	     && e
 	     && access_allowed ( op, e,
@@ -1301,9 +1299,8 @@
 	Debug(LDAP_DEBUG_TRACE, "==> unique_modrdn <%s> <%s>\n",
 		op->o_req_dn.bv_val, op->orr_newrdn.bv_val, 0);
 
-	/* skip the checks if the operation has manageDsaIt control in it
-	 * (for replication) */
-	if ( op->o_managedsait > SLAP_CONTROL_IGNORED
+	/* skip the checks if the operation has relax control in it */
+	if ( op->o_relax > SLAP_CONTROL_IGNORED
 	     && overlay_entry_get_ov(op, &op->o_req_ndn, NULL, NULL, 0, &e, on) == LDAP_SUCCESS
 	     && e
 	     && access_allowed ( op, e,