address ITS#4332; might remove dynamicObject counting

[openldap] / servers / slapd / back-monitor / modify.c

diff --git a/servers/slapd/back-monitor/modify.c b/servers/slapd/back-monitor/modify.c
index 87619844400ba9e6950adc135a97dc20d5960017..3602bf548173580c1d7034d62ecfb98e00989932 100644 (file)
--- 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-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -32,14 +32,6 @@
 
 int
 monitor_back_modify( Operation *op, SlapReply *rs )
-       /*
-       Backend         *be,
-       Connection      *conn,
-       Operation       *op,
-       struct berval   *dn,
-       struct berval   *ndn,
-       Modifications   *modlist
-       */
 {
        int             rc = 0;
        monitor_info_t  *mi = ( monitor_info_t * )op->o_bd->be_private;
@@ -49,31 +41,55 @@ monitor_back_modify( Operation *op, SlapReply *rs )
        Debug(LDAP_DEBUG_ARGS, "monitor_back_modify:\n", 0, 0, 0);
 
        /* acquire and lock entry */
-       monitor_cache_dn2entry( op, &op->o_req_ndn, &e, &matched );
+       monitor_cache_dn2entry( op, rs, &op->o_req_ndn, &e, &matched );
        if ( e == NULL ) {
                rs->sr_err = LDAP_NO_SUCH_OBJECT;
                if ( matched ) {
-                       rs->sr_matched = matched->e_name.bv_val;
+#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 */
+                       {
+                               rs->sr_matched = matched->e_dn;
+                       }
                }
                send_ldap_result( op, rs );
                if ( matched != NULL ) {
                        rs->sr_matched = NULL;
                        monitor_cache_release( mi, matched );
                }
-               return( 0 );
+               return rs->sr_err;
        }
 
        if ( !acl_check_modlist( op, e, op->oq_modify.rs_modlist )) {
                rc = LDAP_INSUFFICIENT_ACCESS;
+
        } else {
-               rc = monitor_entry_modify( op, e );
+               assert( !SLAP_SHADOW( op->o_bd ) );
+               slap_mods_opattrs( op, &op->orm_modlist, 0 );
+
+               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 ) )
+               {
+                       rc = LDAP_NO_SUCH_OBJECT;
+               }
        }
+#endif /* SLAP_ACL_HONOR_DISCLOSE */
 
        rs->sr_err = rc;
        send_ldap_result( op, rs );
 
        monitor_cache_release( mi, e );
 
-       return( 0 );
+       return rs->sr_err;
 }