X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fmodify.c;h=ef24ac64b29436b525308e98d8fd2f8933ea8683;hb=c56ede77811f6d43733f2ece24a053cdf8c642c2;hp=3602bf548173580c1d7034d62ecfb98e00989932;hpb=acbb5cf689a4336af05c9f259d909d8141055bac;p=openldap

diff --git a/servers/slapd/back-monitor/modify.c b/servers/slapd/back-monitor/modify.c
index 3602bf5481..ef24ac64b2 100644
--- a/servers/slapd/back-monitor/modify.c
+++ b/servers/slapd/back-monitor/modify.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2006 The OpenLDAP Foundation.
+ * Copyright 2001-2012 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -45,15 +45,12 @@ monitor_back_modify( Operation *op, SlapReply *rs )
 	if ( e == NULL ) {
 		rs->sr_err = LDAP_NO_SUCH_OBJECT;
 		if ( matched ) {
-#ifdef SLAP_ACL_HONOR_DISCLOSE
 			if ( !access_allowed_mask( op, matched,
 					slap_schema.si_ad_entry,
 					NULL, ACL_DISCLOSE, NULL, NULL ) )
 			{
 				/* do nothing */ ;
-			} else 
-#endif /* SLAP_ACL_HONOR_DISCLOSE */
-			{
+			} else {
 				rs->sr_matched = matched->e_dn;
 			}
 		}
@@ -65,7 +62,7 @@ monitor_back_modify( Operation *op, SlapReply *rs )
 		return rs->sr_err;
 	}
 
-	if ( !acl_check_modlist( op, e, op->oq_modify.rs_modlist )) {
+	if ( !acl_check_modlist( op, e, op->orm_modlist )) {
 		rc = LDAP_INSUFFICIENT_ACCESS;
 
 	} else {
@@ -75,7 +72,6 @@ monitor_back_modify( Operation *op, SlapReply *rs )
 		rc = monitor_entry_modify( op, rs, e );
 	}
 
-#ifdef SLAP_ACL_HONOR_DISCLOSE
 	if ( rc != LDAP_SUCCESS ) {
 		if ( !access_allowed_mask( op, e, slap_schema.si_ad_entry,
 				NULL, ACL_DISCLOSE, NULL, NULL ) )
@@ -83,7 +79,6 @@ monitor_back_modify( Operation *op, SlapReply *rs )
 			rc = LDAP_NO_SUCH_OBJECT;
 		}
 	}
-#endif /* SLAP_ACL_HONOR_DISCLOSE */
 
 	rs->sr_err = rc;
 	send_ldap_result( op, rs );