coverity scan, e is non-NULL

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

diff --git a/servers/slapd/back-monitor/entry.c b/servers/slapd/back-monitor/entry.c
index 193a41369dab4539d2e0dda82ddab89b2c53db92..96e2f0fe76d3e508c59c34432a8925d7898ceb1f 100644 (file)
--- a/servers/slapd/back-monitor/entry.c
+++ b/servers/slapd/back-monitor/entry.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Copyright 2001-2007 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -27,12 +27,14 @@
 int
 monitor_entry_update(
        Operation               *op,
+       SlapReply               *rs,
        Entry                   *e
 )
 {
        monitor_info_t  *mi = ( monitor_info_t * )op->o_bd->be_private;
        monitor_entry_t *mp;
-       int             rc = 0;
+
+       int             rc = SLAP_CB_CONTINUE;
 
        assert( mi != NULL );
        assert( e != NULL );
@@ -40,35 +42,43 @@ monitor_entry_update(
 
        mp = ( monitor_entry_t * )e->e_private;
 
-       if ( mp->mp_info && mp->mp_info->mss_update ) {
-               rc = ( *mp->mp_info->mss_update )( op, e );
-       }
-
-       if ( rc == 0 && mp->mp_cb ) {
+       if ( mp->mp_cb ) {
                struct monitor_callback_t       *mc;
 
                for ( mc = mp->mp_cb; mc; mc = mc->mc_next ) {
-                       rc = ( *mc->mc_update )( op, e, mc->mc_private );
-                       if ( rc != 0 ) {
-                               break;
+                       if ( mc->mc_update ) {
+                               rc = mc->mc_update( op, rs, e, mc->mc_private );
+                               if ( rc != SLAP_CB_CONTINUE ) {
+                                       break;
+                               }
                        }
                }
        }
 
+       if ( rc == SLAP_CB_CONTINUE && mp->mp_info && mp->mp_info->mss_update ) {
+               rc = mp->mp_info->mss_update( op, rs, e );
+       }
+
+       if ( rc == SLAP_CB_CONTINUE ) {
+               rc = LDAP_SUCCESS;
+       }
+
        return rc;
 }
 
 int
 monitor_entry_create(
        Operation               *op,
+       SlapReply               *rs,
        struct berval           *ndn,
        Entry                   *e_parent,
-       Entry                   **ep
-)
+       Entry                   **ep )
 {
        monitor_info_t  *mi = ( monitor_info_t * )op->o_bd->be_private;
        monitor_entry_t *mp;
 
+       int             rc = SLAP_CB_CONTINUE;
+
        assert( mi != NULL );
        assert( e_parent != NULL );
        assert( e_parent->e_private != NULL );
@@ -77,21 +87,27 @@ monitor_entry_create(
        mp = ( monitor_entry_t * )e_parent->e_private;
 
        if ( mp->mp_info && mp->mp_info->mss_create ) {
-               return ( *mp->mp_info->mss_create )( op, ndn, e_parent, ep );
+               rc = mp->mp_info->mss_create( op, rs, ndn, e_parent, ep );
+       }
+
+       if ( rc == SLAP_CB_CONTINUE ) {
+               rc = LDAP_SUCCESS;
        }
        
-       return( 0 );
+       return rc;
 }
 
 int
 monitor_entry_modify(
        Operation               *op,
+       SlapReply               *rs,
        Entry                   *e
 )
 {
        monitor_info_t  *mi = ( monitor_info_t * )op->o_bd->be_private;
        monitor_entry_t *mp;
-       int             rc = 0;
+
+       int             rc = SLAP_CB_CONTINUE;
 
        assert( mi != NULL );
        assert( e != NULL );
@@ -99,21 +115,27 @@ monitor_entry_modify(
 
        mp = ( monitor_entry_t * )e->e_private;
 
-       if ( mp->mp_info && mp->mp_info->mss_modify ) {
-               rc = ( *mp->mp_info->mss_modify )( op, e );
-       }
-
-       if ( rc == 0 && mp->mp_cb ) {
+       if ( mp->mp_cb ) {
                struct monitor_callback_t       *mc;
 
                for ( mc = mp->mp_cb; mc; mc = mc->mc_next ) {
-                       rc = ( *mc->mc_modify )( op, e, mc->mc_private );
-                       if ( rc != 0 ) {
-                               break;
+                       if ( mc->mc_modify ) {
+                               rc = mc->mc_modify( op, rs, e, mc->mc_private );
+                               if ( rc != SLAP_CB_CONTINUE ) {
+                                       break;
+                               }
                        }
                }
        }
 
+       if ( rc == SLAP_CB_CONTINUE && mp->mp_info && mp->mp_info->mss_modify ) {
+               rc = mp->mp_info->mss_modify( op, rs, e );
+       }
+
+       if ( rc == SLAP_CB_CONTINUE ) {
+               rc = LDAP_SUCCESS;
+       }
+
        return rc;
 }
 
@@ -141,5 +163,59 @@ monitor_entrypriv_create( void )
        mp->mp_flags = MONITOR_F_NONE;
        mp->mp_cb = NULL;
 
+       ldap_pvt_thread_mutex_init( &mp->mp_mutex );
+
        return mp;
 }
+
+Entry *
+monitor_entry_stub(
+       struct berval *pdn,
+       struct berval *pndn,
+       struct berval *rdn,
+       ObjectClass *oc,
+       monitor_info_t  *mi,
+       struct berval *create,
+       struct berval *modify
+)
+{
+       AttributeDescription *nad = NULL;
+       Entry *e;
+       struct berval nat;
+       char *ptr;
+       const char *text;
+       int rc;
+
+       nat = *rdn;
+       ptr = strchr( nat.bv_val, '=' );
+       nat.bv_len = ptr - nat.bv_val;
+       rc = slap_bv2ad( &nat, &nad, &text );
+       if ( rc )
+               return NULL;
+
+       e = entry_alloc();
+       if ( e ) {
+               struct berval nrdn;
+
+               rdnNormalize( 0, NULL, NULL, rdn, &nrdn, NULL );
+               build_new_dn( &e->e_name, pdn, rdn, NULL );
+               build_new_dn( &e->e_nname, pndn, &nrdn, NULL );
+               ber_memfree( nrdn.bv_val );
+               nat.bv_val = ptr + 1;
+               nat.bv_len = rdn->bv_len - ( nat.bv_val - rdn->bv_val );
+               attr_merge_normalize_one( e, slap_schema.si_ad_objectClass,
+                       &oc->soc_cname, NULL );
+               attr_merge_normalize_one( e, slap_schema.si_ad_structuralObjectClass,
+                       &oc->soc_cname, NULL );
+               attr_merge_normalize_one( e, nad, &nat, NULL );
+               attr_merge_one( e, slap_schema.si_ad_creatorsName, &mi->mi_creatorsName,
+                       &mi->mi_ncreatorsName );
+               attr_merge_one( e, slap_schema.si_ad_modifiersName, &mi->mi_creatorsName,
+                       &mi->mi_ncreatorsName );
+               attr_merge_normalize_one( e, slap_schema.si_ad_createTimestamp,
+                       create ? create : &mi->mi_startTime, NULL );
+               attr_merge_normalize_one( e, slap_schema.si_ad_modifyTimestamp,
+                       modify ? modify : &mi->mi_startTime, NULL );
+       }
+       return e;
+}