more cleanup

diff --git a/servers/slapd/back-monitor/back-monitor.h b/servers/slapd/back-monitor/back-monitor.h
index 9c463c8f1c059f3efd3bd47ad85773f272e59a9b..b622f6a2e9d28692ffa431a0318ba6793c97b602 100644 (file)
--- a/servers/slapd/back-monitor/back-monitor.h
+++ b/servers/slapd/back-monitor/back-monitor.h
@@ -168,9 +168,9 @@ struct monitorinfo {
 struct monitorsubsys {
        int             mss_type;
        char            *mss_name;
-       struct berval   *mss_rdn;
-       struct berval   *mss_dn;
-       struct berval   *mss_ndn;
+       struct berval   mss_rdn;
+       struct berval   mss_dn;
+       struct berval   mss_ndn;
        int             mss_flags;
 
 #define MONITOR_HAS_VOLATILE_CH( mp ) \

diff --git a/servers/slapd/back-monitor/backend.c b/servers/slapd/back-monitor/backend.c
index eb7c0e0856f1561591984280a7399811615ceba5..0d5ae841d82683309e0a757339b979761519a002 100644 (file)
--- a/servers/slapd/back-monitor/backend.c
+++ b/servers/slapd/back-monitor/backend.c
@@ -59,18 +59,18 @@ monitor_subsys_backend_init(
        mi = ( struct monitorinfo * )be->be_private;
 
        if ( monitor_cache_get( mi, 
-                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn, 
+                               &monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn, 
                                &e_backend ) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_backend_init: "
                        "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_backend_init: "
                        "unable to get entry '%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn->bv_val, 
+                       monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val, 
                        "", "" );
 #endif
                return( -1 );
@@ -95,7 +95,7 @@ monitor_subsys_backend_init(
 #endif /* !SLAPD_MONITORSUBENTRY */
                                "cn: %d\n",
                                i,
-                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn->bv_val,
+                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val,
                                i );
                
                e = str2entry( buf );
@@ -105,13 +105,13 @@ monitor_subsys_backend_init(
                                "monitor_subsys_backend_init: "
                                "unable to create entry 'cn=%d,%s'\n",
                                i, 
-                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn->bv_val ));
+                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_backend_init: "
                                "unable to create entry 'cn=%d,%s'\n%s",
                                i, 
-                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn->bv_val,
+                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
                                "" );
 #endif
                        return( -1 );
@@ -137,13 +137,13 @@ monitor_subsys_backend_init(
                                "monitor_subsys_backend_init: "
                                "unable to add entry 'cn=%d,%s'\n",
                                i,
-                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn->bv_val ));
+                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val ));
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_backend_init: "
                                "unable to add entry 'cn=%d,%s'\n%s",
                                i,
-                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn->bv_val,
+                               monitor_subsys[SLAPD_MONITOR_BACKEND].mss_ndn.bv_val,
                                "" );
 #endif
                        return( -1 );

diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c
index b9555b2f666815ad42e66e0ab93ea0d3b54ad826..e2bfdc5bd751559fa7d96f84ea371b77ff4e0150 100644 (file)
--- a/servers/slapd/back-monitor/conn.c
+++ b/servers/slapd/back-monitor/conn.c
@@ -58,17 +58,17 @@ monitor_subsys_conn_init(
        mi = ( struct monitorinfo * )be->be_private;
 
        if ( monitor_cache_get( mi,
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn, &e_conn ) ) {
+                       &monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn, &e_conn ) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_conn_init: "
                        "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_conn_init: "
                        "unable to get entry '%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val, 
+                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val, 
                        "", "" );
 #endif
                return( -1 );
@@ -89,7 +89,7 @@ monitor_subsys_conn_init(
                "objectClass: extensibleObject\n"
 #endif /* !SLAPD_MONITORSUBENTRY */
                "cn: Total\n",
-               monitor_subsys[SLAPD_MONITOR_CONN].mss_dn->bv_val );
+               monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val );
        
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -97,12 +97,12 @@ monitor_subsys_conn_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_conn_init: "
                        "unable to create entry 'cn=Total,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_conn_init: "
                        "unable to create entry 'cn=Total,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -127,12 +127,12 @@ monitor_subsys_conn_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_conn_init: "
                        "unable to add entry 'cn=Total,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_conn_init: "
                        "unable to add entry 'cn=Total,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -153,7 +153,7 @@ monitor_subsys_conn_init(
                "objectClass: extensibleObject\n"
 #endif /* !SLAPD_MONITORSUBENTRY */
                "cn: Current\n",
-               monitor_subsys[SLAPD_MONITOR_CONN].mss_dn->bv_val );
+               monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val );
        
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -161,12 +161,12 @@ monitor_subsys_conn_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_conn_init: "
                        "unable to create entry 'cn=Current,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_conn_init: "
                        "unable to create entry 'cn=Current,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -186,12 +186,12 @@ monitor_subsys_conn_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_conn_init: "
                        "unable to add entry 'cn=Current,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_conn_init: "
                        "unable to add entry 'cn=Current,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -281,7 +281,7 @@ conn_create(
                "objectClass: extensibleObject\n"
 #endif /* !SLAPD_MONITORSUBENTRY */
                "cn: %ld\n",
-               c->c_connid, monitor_subsys[SLAPD_MONITOR_CONN].mss_dn->bv_val,
+               c->c_connid, monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val,
                c->c_connid );
        e = str2entry( buf );
 
@@ -292,14 +292,14 @@ conn_create(
                        "unable to create entry "
                        "'cn=%ld,%s' entry\n",
                        c->c_connid, 
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_dn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_conn_create: "
                        "unable to create entry "
                        "'cn=%ld,%s' entry\n",
                        c->c_connid, 
-                       monitor_subsys[SLAPD_MONITOR_CONN].mss_dn->bv_val, 0 );
+                       monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val, 0 );
 #endif
                return( -1 );
        }

diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index 71049a9305c8aba1d4081d62fbf5a2bdb78dd571..8a06fb37b2625903cbf22ec46d5fee852a5d2f55 100644 (file)
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -59,18 +59,18 @@ monitor_subsys_database_init(
        mi = ( struct monitorinfo * )be->be_private;
 
        if ( monitor_cache_get( mi, 
-                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn, 
+                               &monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn, 
                                &e_database ) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_database_init: "
                        "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_database_init: "
                        "unable to get entry '%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn->bv_val, 
+                       monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn.bv_val, 
                        "", "" );
 #endif
                return( -1 );
@@ -94,7 +94,7 @@ monitor_subsys_database_init(
 #endif /* !SLAPD_MONITORSUBENTRY */
                                "cn: %d\n",
                                i,
-                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_dn->bv_val,
+                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_dn.bv_val,
                                i );
                
                e = str2entry( buf );
@@ -104,13 +104,13 @@ monitor_subsys_database_init(
                                "monitor_subsys_database_init: "
                                "unable to create entry 'cn=%d,%s'\n",
                                i, 
-                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn->bv_val ));
+                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn.bv_val ));
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_database_init: "
                                "unable to create entry 'cn=%d,%s'\n%s",
                                i, 
-                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn->bv_val,
+                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn.bv_val,
                                "" );
 #endif
                        return( -1 );
@@ -142,13 +142,13 @@ monitor_subsys_database_init(
                                "monitor_subsys_database_init: "
                                "unable to add entry 'cn=%d,%s'\n",
                                i, 
-                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn->bv_val ));
+                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn.bv_val ));
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_database_init: "
                                "unable to add entry 'cn=%d,%s'\n",
                                i, 
-                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn->bv_val,
+                               monitor_subsys[SLAPD_MONITOR_DATABASE].mss_ndn.bv_val,
                                0 );
 #endif
                        return( -1 );

diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index 9a36b0630e18d906669349d4f795cb0667d64aad..af02f84588bbfcb6a6c688ebeba5751451a94ed1 100644 (file)
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -53,7 +53,7 @@ AttributeDescription *monitor_ad_desc = NULL;
 struct monitorsubsys monitor_subsys[] = {
        { 
                SLAPD_MONITOR_LISTENER, SLAPD_MONITOR_LISTENER_NAME,    
-               NULL, NULL, NULL,
+               { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
                MONITOR_F_NONE,
                NULL,   /* init */
                NULL,   /* update */
@@ -61,7 +61,7 @@ struct monitorsubsys monitor_subsys[] = {
                NULL    /* modify */
                }, { 
                SLAPD_MONITOR_DATABASE, SLAPD_MONITOR_DATABASE_NAME,    
-               NULL, NULL, NULL,
+               { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
                MONITOR_F_PERSISTENT_CH,
                monitor_subsys_database_init,
                NULL,   /* update */
@@ -69,7 +69,7 @@ struct monitorsubsys monitor_subsys[] = {
                NULL    /* modify */
                }, { 
                SLAPD_MONITOR_BACKEND, SLAPD_MONITOR_BACKEND_NAME, 
-               NULL, NULL, NULL,
+               { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
                MONITOR_F_PERSISTENT_CH,
                monitor_subsys_backend_init,
                NULL,   /* update */
@@ -77,7 +77,7 @@ struct monitorsubsys monitor_subsys[] = {
                NULL    /* modify */
                }, { 
                SLAPD_MONITOR_THREAD, SLAPD_MONITOR_THREAD_NAME,        
-               NULL, NULL, NULL,
+               { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
                MONITOR_F_NONE,
                monitor_subsys_thread_init,
                monitor_subsys_thread_update,
@@ -85,7 +85,7 @@ struct monitorsubsys monitor_subsys[] = {
                NULL    /* modify */
                }, { 
                SLAPD_MONITOR_SASL, SLAPD_MONITOR_SASL_NAME,    
-               NULL, NULL, NULL,
+               { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
                MONITOR_F_NONE,
                NULL,   /* init */
                NULL,   /* update */
@@ -93,7 +93,7 @@ struct monitorsubsys monitor_subsys[] = {
                NULL    /* modify */
                }, { 
                SLAPD_MONITOR_TLS, SLAPD_MONITOR_TLS_NAME,
-               NULL, NULL, NULL,
+               { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
                MONITOR_F_NONE,
                NULL,   /* init */
                NULL,   /* update */
@@ -101,7 +101,7 @@ struct monitorsubsys monitor_subsys[] = {
                NULL    /* modify */
                }, { 
                SLAPD_MONITOR_CONN, SLAPD_MONITOR_CONN_NAME,
-               NULL, NULL, NULL,
+               { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
                MONITOR_F_VOLATILE_CH,
                monitor_subsys_conn_init,
                monitor_subsys_conn_update,
@@ -109,7 +109,7 @@ struct monitorsubsys monitor_subsys[] = {
                NULL    /* modify */
                }, { 
                SLAPD_MONITOR_READW, SLAPD_MONITOR_READW_NAME,
-               NULL, NULL, NULL,
+               { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
                MONITOR_F_NONE,
                NULL,   /* init */
                monitor_subsys_readw_update,
@@ -117,7 +117,7 @@ struct monitorsubsys monitor_subsys[] = {
                NULL    /* modify */
                }, { 
                SLAPD_MONITOR_WRITEW, SLAPD_MONITOR_WRITEW_NAME,
-               NULL, NULL, NULL,
+               { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
                MONITOR_F_NONE,
                NULL,   /* init */
                monitor_subsys_writew_update,
@@ -125,7 +125,7 @@ struct monitorsubsys monitor_subsys[] = {
                NULL    /* modify */
                }, { 
                SLAPD_MONITOR_LOG, SLAPD_MONITOR_LOG_NAME,
-               NULL, NULL, NULL,
+               { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
                MONITOR_F_NONE,
                monitor_subsys_log_init,
                NULL,   /* update */
@@ -133,7 +133,7 @@ struct monitorsubsys monitor_subsys[] = {
                monitor_subsys_log_modify
                }, { 
                SLAPD_MONITOR_OPS, SLAPD_MONITOR_OPS_NAME,
-               NULL, NULL, NULL,
+               { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
                MONITOR_F_NONE,
                monitor_subsys_ops_init,
                monitor_subsys_ops_update,
@@ -141,7 +141,7 @@ struct monitorsubsys monitor_subsys[] = {
                NULL,   /* modify */
                }, { 
                SLAPD_MONITOR_SENT, SLAPD_MONITOR_SENT_NAME,
-               NULL, NULL, NULL,
+               { 0L, NULL }, { 0L, NULL }, { 0L, NULL },
                MONITOR_F_NONE,
                monitor_subsys_sent_init,
                monitor_subsys_sent_update,
@@ -307,7 +307,7 @@ monitor_back_db_init(
 
                dn.bv_len += sizeof( SLAPD_MONITOR_DN ); /* 1 for the , */
                dn.bv_val = ch_malloc( dn.bv_len + 1 );
-               strcpy( dn.bv_val , monitor_subsys[ i ].mss_rdn->bv_val );
+               strcpy( dn.bv_val , monitor_subsys[ i ].mss_rdn.bv_val );
                strcat( dn.bv_val, "," SLAPD_MONITOR_DN );
                rc = dnPrettyNormal( NULL, &dn, &monitor_subsys[ i ].mss_dn,
                        &monitor_subsys[ i ].mss_ndn );
@@ -335,7 +335,7 @@ monitor_back_db_init(
                                "objectClass: extensibleObject\n"
 #endif /* !SLAPD_MONITORSUBENTRY */
                                "cn: %s\n",
-                               monitor_subsys[ i ].mss_dn->bv_val,
+                               monitor_subsys[ i ].mss_dn.bv_val,
                                monitor_subsys[ i ].mss_name );
                
                e = str2entry( buf );
@@ -344,11 +344,11 @@ monitor_back_db_init(
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                                "unable to create '%s' entry\n", 
-                               monitor_subsys[ i ].mss_dn->bv_val ));
+                               monitor_subsys[ i ].mss_dn.bv_val ));
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "unable to create '%s' entry\n", 
-                               monitor_subsys[ i ].mss_dn->bv_val, 0, 0 );
+                               monitor_subsys[ i ].mss_dn.bv_val, 0, 0 );
 #endif
                        return( -1 );
                }
@@ -364,11 +364,11 @@ monitor_back_db_init(
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                                "unable to add entry '%s' to cache\n",
-                               monitor_subsys[ i ].mss_dn->bv_val ));
+                               monitor_subsys[ i ].mss_dn.bv_val ));
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "unable to add entry '%s' to cache\n",
-                               monitor_subsys[ i ].mss_dn->bv_val, 0, 0 );
+                               monitor_subsys[ i ].mss_dn.bv_val, 0, 0 );
 #endif
                        return -1;
                }

diff --git a/servers/slapd/back-monitor/log.c b/servers/slapd/back-monitor/log.c
index 880d2128a820cfc4fdd8ea6572fb09829d2d406b..eb7ac6bdbfa04d78bdc5340bc10221cb334e1053 100644 (file)
--- a/servers/slapd/back-monitor/log.c
+++ b/servers/slapd/back-monitor/log.c
@@ -95,18 +95,18 @@ monitor_subsys_log_init(
 
        mi = ( struct monitorinfo * )be->be_private;
 
-       if ( monitor_cache_get( mi, monitor_subsys[SLAPD_MONITOR_LOG].mss_ndn, 
+       if ( monitor_cache_get( mi, &monitor_subsys[SLAPD_MONITOR_LOG].mss_ndn, 
                                &e ) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_log_init: "
                        "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_LOG].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_LOG].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_log_init: "
                        "unable to get entry '%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_LOG].mss_ndn->bv_val, 
+                       monitor_subsys[SLAPD_MONITOR_LOG].mss_ndn.bv_val, 
                        "", "" );
 #endif
                return( -1 );

diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c
index d30a2f716c1350c9d34918d17546ec9217ffdf0f..b9637964f376bf23d82df32dc53157fdfb38a596 100644 (file)
--- a/servers/slapd/back-monitor/operation.c
+++ b/servers/slapd/back-monitor/operation.c
@@ -58,17 +58,17 @@ monitor_subsys_ops_init(
        mi = ( struct monitorinfo * )be->be_private;
 
        if ( monitor_cache_get( mi,
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn, &e_op ) ) {
+                       &monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn, &e_op ) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_ops_init: "
                        "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_ops_init: "
                        "unable to get entry '%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val, 
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 
                        "", "" );
 #endif
                return( -1 );
@@ -89,7 +89,7 @@ monitor_subsys_ops_init(
                        "objectClass: extensibleObject\n"
 #endif /* !SLAPD_MONITORSUBENTRY */
                        "cn: Initiated\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_dn->bv_val );
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_dn.bv_val );
 
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -97,12 +97,12 @@ monitor_subsys_ops_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_ops_init: "
                        "unable to create entry 'cn=Initiated,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_ops_init: "
                        "unable to create entry 'cn=Initiated,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -126,12 +126,12 @@ monitor_subsys_ops_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_ops_init: "
                        "unable to add entry 'cn=Initiated,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_ops_init: "
                        "unable to add entry 'cn=Initiated,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -152,7 +152,7 @@ monitor_subsys_ops_init(
                        "objectClass: extensibleObject\n"
 #endif /* !SLAPD_MONITORSUBENTRY */
                        "cn: Completed\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_dn->bv_val );
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_dn.bv_val );
 
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -160,12 +160,12 @@ monitor_subsys_ops_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_ops_init: "
                        "unable to create entry 'cn=Completed,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_ops_init: "
                        "unable to create entry 'cn=Completed,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -188,12 +188,12 @@ monitor_subsys_ops_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_ops_init: "
                        "unable to add entry 'cn=Completed,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_ops_init: "
                        "unable to add entry 'cn=Completed,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );

diff --git a/servers/slapd/back-monitor/sent.c b/servers/slapd/back-monitor/sent.c
index f14337b8267aa087bd563d81cfa959117a680243..291b2efe145b5cc7e6604a53c87e38b6374f6aaa 100644 (file)
--- a/servers/slapd/back-monitor/sent.c
+++ b/servers/slapd/back-monitor/sent.c
@@ -58,17 +58,17 @@ monitor_subsys_sent_init(
        mi = ( struct monitorinfo * )be->be_private;
 
        if ( monitor_cache_get( mi,
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn, &e_sent ) ) {
+                       &monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn, &e_sent ) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to get entry '%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val, 
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 
                        "", "" );
 #endif
                return( -1 );
@@ -89,7 +89,7 @@ monitor_subsys_sent_init(
                        "objectClass: extensibleObject\n"
 #endif /* !SLAPD_MONITORSUBENTRY */
                        "cn: Entries\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn->bv_val );
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val );
 
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -97,12 +97,12 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=Entries,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=Entries,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -126,12 +126,12 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=Entries,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=Entries,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -152,7 +152,7 @@ monitor_subsys_sent_init(
                        "objectClass: extensibleObject\n"
 #endif /* !SLAPD_MONITORSUBENTRY */
                        "cn: Referrals\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn->bv_val );
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val );
 
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -160,12 +160,12 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=Referrals,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=Referrals,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -188,12 +188,12 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=Referrals,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=Referrals,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -214,7 +214,7 @@ monitor_subsys_sent_init(
                        "objectClass: extensibleObject\n"
 #endif /* !SLAPD_MONITORSUBENTRY */
                        "cn: PDU\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn->bv_val );
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val );
 
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -222,12 +222,12 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=PDU,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=PDU,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -250,12 +250,12 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=PDU,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=PDU,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -276,7 +276,7 @@ monitor_subsys_sent_init(
                        "objectClass: extensibleObject\n"
 #endif /* !SLAPD_MONITORSUBENTRY */
                        "cn: Bytes\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn->bv_val );
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val );
 
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -284,12 +284,12 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=Bytes,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=Bytes,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -312,12 +312,12 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=Bytes,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=Bytes,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn->bv_val,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );

diff --git a/servers/slapd/back-monitor/thread.c b/servers/slapd/back-monitor/thread.c
index cf9cebcdadd3dbb94ae2f3a45f5eab7ba84a1891..763e9fa161734eeccddd102682d348d02322d7f3 100644 (file)
--- a/servers/slapd/back-monitor/thread.c
+++ b/servers/slapd/back-monitor/thread.c
@@ -57,16 +57,16 @@ monitor_subsys_thread_init(
        mi = ( struct monitorinfo * )be->be_private;
 
        if ( monitor_cache_get( mi, 
-               monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn, &e ) )
+               &monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn, &e ) )
        {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_thread_init: unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn->bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_thread_init: unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn->bv_val, 
+                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 
                        0, 0 );
 #endif
                return( -1 );