honor disclose

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

diff --git a/servers/slapd/back-monitor/rww.c b/servers/slapd/back-monitor/rww.c
index ada1c27825870abf0c8e6b73302a23c59e6bef1d..150484689779004774a3ea9239b0657ad904eb71 100644 (file)
--- a/servers/slapd/back-monitor/rww.c
+++ b/servers/slapd/back-monitor/rww.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-2005 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -47,21 +47,20 @@ struct monitor_rww_t {
 int
 monitor_subsys_rww_init(
        BackendDB               *be,
-       monitorsubsys           *ms
+       monitor_subsys_t        *ms
 )
 {
-       struct monitorinfo      *mi;
+       monitor_info_t  *mi;
        
-       Entry                   **ep, *e_conn;
-       struct monitorentrypriv *mp;
+       Entry           **ep, *e_conn;
+       monitor_entry_t *mp;
        int                     i;
 
        assert( be != NULL );
 
-       mi = ( struct monitorinfo * )be->be_private;
+       mi = ( monitor_info_t * )be->be_private;
 
-       if ( monitor_cache_get( mi,
-                       &ms->mss_ndn, &e_conn ) ) {
+       if ( monitor_cache_get( mi, &ms->mss_ndn, &e_conn ) ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_rww_init: "
                        "unable to get entry \"%s\"\n",
@@ -69,7 +68,7 @@ monitor_subsys_rww_init(
                return( -1 );
        }
 
-       mp = ( struct monitorentrypriv * )e_conn->e_private;
+       mp = ( monitor_entry_t * )e_conn->e_private;
        mp->mp_children = NULL;
        ep = &mp->mp_children;
 
@@ -87,11 +86,11 @@ monitor_subsys_rww_init(
                        "modifiersName: %s\n"
                        "createTimestamp: %s\n"
                        "modifyTimestamp: %s\n",
-                       monitor_rww[i].rdn.bv_val,
+                       monitor_rww[ i ].rdn.bv_val,
                        ms->mss_dn.bv_val,
                        mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
                        mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
-                       &monitor_rww[i].rdn.bv_val[STRLENOF("cn")],
+                       &monitor_rww[ i ].rdn.bv_val[ STRLENOF( "cn=" ) ],
                        mi->mi_creatorsName.bv_val,
                        mi->mi_creatorsName.bv_val,
                        mi->mi_startTime.bv_val,
@@ -108,15 +107,16 @@ monitor_subsys_rww_init(
 
                /* steal normalized RDN */
                dnRdn( &e->e_nname, &nrdn );
-               ber_dupbv( &monitor_rww[i].nrdn, &nrdn );
+               ber_dupbv( &monitor_rww[ i ].nrdn, &nrdn );
        
                BER_BVSTR( &bv, "0" );
                attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
        
-               mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+               mp = monitor_entrypriv_create();
+               if ( mp == NULL ) {
+                       return -1;
+               }
                e->e_private = ( void * )mp;
-               mp->mp_next = NULL;
-               mp->mp_children = NULL;
                mp->mp_info = ms;
                mp->mp_flags = ms->mss_flags \
                        | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
@@ -125,7 +125,7 @@ monitor_subsys_rww_init(
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_rww_init: "
                                "unable to add entry \"%s,%s\"\n",
-                               monitor_rww[i].rdn.bv_val,
+                               monitor_rww[ i ].rdn.bv_val,
                                ms->mss_ndn.bv_val, 0 );
                        return( -1 );
                }
@@ -145,26 +145,26 @@ monitor_subsys_rww_update(
        Entry                   *e
 )
 {
-       struct monitorinfo *mi = (struct monitorinfo *)op->o_bd->be_private;
-       Connection              *c;
-       int                     connindex;
-       long                    nconns, nwritewaiters, nreadwaiters;
+       monitor_info_t *mi = (monitor_info_t *)op->o_bd->be_private;
+       Connection      *c;
+       int             connindex;
+       long            nconns, nwritewaiters, nreadwaiters;
 
-       int                     i;
-       struct berval           nrdn;
+       int             i;
+       struct berval   nrdn;
 
-       Attribute               *a;
-       char                    buf[] = "+9223372036854775807L";
-       long                    num = 0;
-       ber_len_t               len;
+       Attribute       *a;
+       char            buf[] = "+9223372036854775807L";
+       long            num = 0;
+       ber_len_t       len;
 
        assert( mi != NULL );
        assert( e != NULL );
 
        dnRdn( &e->e_nname, &nrdn );
 
-       for ( i = 0; !BER_BVISNULL( &monitor_rww[i].nrdn ); i++ ) {
-               if ( dn_match( &nrdn, &monitor_rww[i].nrdn ) ) {
+       for ( i = 0; !BER_BVISNULL( &monitor_rww[ i ].nrdn ); i++ ) {
+               if ( dn_match( &nrdn, &monitor_rww[ i ].nrdn ) ) {
                        break;
                }
        }
@@ -207,16 +207,18 @@ monitor_subsys_rww_update(
        a = attr_find( e->e_attrs, mi->mi_ad_monitorCounter );
        assert( a );
        len = strlen( buf );
-       if ( len > a->a_vals[0].bv_len ) {
-               a->a_vals[0].bv_val = ber_memrealloc( a->a_vals[0].bv_val, len + 1 );
-               if ( a->a_vals[0].bv_val == NULL ) {
-                       BER_BVZERO( &a->a_vals[0] );
+       if ( len > a->a_vals[ 0 ].bv_len ) {
+               a->a_vals[ 0 ].bv_val = ber_memrealloc( a->a_vals[ 0 ].bv_val, len + 1 );
+               if ( BER_BVISNULL( &a->a_vals[ 0 ] ) ) {
+                       BER_BVZERO( &a->a_vals[ 0 ] );
                        return( 0 );
                }
        }
-       AC_MEMCPY( a->a_vals[0].bv_val, buf, len + 1 );
+       AC_MEMCPY( a->a_vals[ 0 ].bv_val, buf, len + 1 );
        a->a_vals[ 0 ].bv_len = len;
 
+       /* FIXME: touch modifyTimestamp? */
+
        return( 0 );
 }