fix uninit'ed parameters to monitor_back_register_entry_attrs()

diff --git a/servers/slapd/back-bdb/monitor.c b/servers/slapd/back-bdb/monitor.c
index 9956cbb1f088d1dda1c2fe3e4425d6cee2ad4cc6..88cb9a7759dc88b6fc7397a9bfbb9c5b4fffd9c7 100644 (file)
--- a/servers/slapd/back-bdb/monitor.c
+++ b/servers/slapd/back-bdb/monitor.c
@@ -339,7 +339,6 @@ bdb_monitor_db_open( BackendDB *be )
        int                     rc = 0;
        BackendInfo             *mi;
        monitor_extra_t         *mbe;
-       struct berval dummy = BER_BVC("");
 
        if ( !SLAP_DBMONITORING( be ) ) {
                return 0;
@@ -456,7 +455,7 @@ bdb_monitor_db_open( BackendDB *be )
        rc = mbe->register_database( be, &bdb->bi_monitor.bdm_ndn );
        if ( rc == 0 ) {
                rc = mbe->register_entry_attrs( &bdb->bi_monitor.bdm_ndn, a, cb,
-                       &dummy, 0, &dummy );
+                       NULL, 0, NULL );
        }
 
 cleanup:;

diff --git a/servers/slapd/back-ldap/monitor.c b/servers/slapd/back-ldap/monitor.c
index 6623a3af5214a704581dd8ffbe3ed032138aebd8..54a6a6d7f5aa7f89f4ad273e9d1b8f58d56c39a0 100644 (file)
--- a/servers/slapd/back-ldap/monitor.c
+++ b/servers/slapd/back-ldap/monitor.c
@@ -655,7 +655,7 @@ ldap_back_monitor_conn_init(
                cb->mc_free = ldap_back_monitor_free;
                cb->mc_private = (void *)li;
 
-               rc = mbe->register_entry_attrs( &ms->mss_ndn, a, cb, NULL, 0, NULL );
+               rc = mbe->register_entry_attrs( &ms->mss_ndn, a, cb, NULL, -1, NULL );
 
                attr_free( a->a_next );
                attr_free( a );

diff --git a/servers/slapd/back-mdb/monitor.c b/servers/slapd/back-mdb/monitor.c
index 949183852ebee99ed1d974a338bfc5206eda77bd..6c4dc4b83121753457887f27db16041b1d4e1c68 100644 (file)
--- a/servers/slapd/back-mdb/monitor.c
+++ b/servers/slapd/back-mdb/monitor.c
@@ -286,7 +286,6 @@ mdb_monitor_db_open( BackendDB *be )
        int                     rc = 0;
        BackendInfo             *mi;
        monitor_extra_t         *mbe;
-       struct berval dummy = BER_BVC("");
 
        if ( !SLAP_DBMONITORING( be ) ) {
                return 0;
@@ -387,7 +386,7 @@ mdb_monitor_db_open( BackendDB *be )
        rc = mbe->register_database( be, &mdb->mi_monitor.mdm_ndn );
        if ( rc == 0 ) {
                rc = mbe->register_entry_attrs( &mdb->mi_monitor.mdm_ndn, a, cb,
-                       &dummy, 0, &dummy );
+                       NULL, -1, NULL );
        }
 
 cleanup:;

diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index 111728b1c5af4076183097e1ef9786c66a6fd8bb..92e1c0e54cce415871b8b9afc7b61614fa478de0 100644 (file)
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -941,6 +941,10 @@ monitor_back_register_entry_attrs(
        monitor_info_t  *mi;
        struct berval   ndn = BER_BVNULL;
        char            *fname = ( a == NULL ? "callback" : "attrs" );
+       struct berval   empty_bv = BER_BVC("");
+
+       if ( nbase == NULL ) nbase = &empty_bv;
+       if ( filter == NULL ) filter = &empty_bv;
 
        if ( be_monitor == NULL ) {
                char            buf[ SLAP_TEXT_BUFLEN ];

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 8052304b944917ea359ff887a32d9153a00a3ec8..6971694282bcf848b42882deb94b1a581245157c 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -5520,7 +5520,6 @@ pcache_monitor_db_open( BackendDB *be )
        int                     rc = 0;
        BackendInfo             *mi;
        monitor_extra_t         *mbe;
-       struct berval           dummy = BER_BVC( "" );
 
        if ( !SLAP_DBMONITORING( be ) ) {
                return 0;
@@ -5580,7 +5579,7 @@ pcache_monitor_db_open( BackendDB *be )
        rc = mbe->register_overlay( be, on, &cm->monitor_ndn );
        if ( rc == 0 ) {
                rc = mbe->register_entry_attrs( &cm->monitor_ndn, a, cb,
-                       &dummy, -1, &dummy);
+                       NULL, -1, NULL);
        }
 
 cleanup:;