ITS#5435 ConfigReply arg must be non-NULL

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index 8a762aee14955be4a4dd574aafa125e2884851c7..184ebb64d595b380a4c1125861c9d0a0dcd40aa3 100644 (file)
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -337,9 +337,9 @@ bdb_cf_cleanup( ConfigArgs *c )
        
        if ( bdb->bi_flags & BDB_RE_OPEN ) {
                bdb->bi_flags ^= BDB_RE_OPEN;
-               rc = c->be->bd_info->bi_db_close( c->be, NULL );
+               rc = c->be->bd_info->bi_db_close( c->be, &c->reply );
                if ( rc == 0 )
-                       rc = c->be->bd_info->bi_db_open( c->be, NULL );
+                       rc = c->be->bd_info->bi_db_open( c->be, &c->reply );
                /* If this fails, we need to restart */
                if ( rc ) {
                        slapd_shutdown = 2;

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index fb92cf6f7f211943b69171fa1b0ff1b1d3dda294..2f2662342885999a28d20e7d27f12b0dd0dac033 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -269,7 +269,7 @@ int backend_startup(Backend *be)
 
        /* open frontend, if required */
        if ( frontendDB->bd_info->bi_db_open ) {
-               rc = frontendDB->bd_info->bi_db_open( frontendDB, NULL );
+               rc = frontendDB->bd_info->bi_db_open( frontendDB, &cr );
                if ( rc != 0 ) {
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_db_open(frontend) failed! (%d)\n",

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index b406f5b19f402ce876baeeb5413c0ea732fe8e78..c12d4de4e1fe63b408b9d1b8b30c8ff2f13e394f 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -620,6 +620,7 @@ glue_open (
        glueinfo                *gi = on->on_bi.bi_private;
        static int glueOpened = 0;
        int i, j, same, bsame = 0, rc = 0;
+       ConfigReply cr = {0};
 
        if (glueOpened) return 0;
 
@@ -650,7 +651,7 @@ glue_open (
                                        gi->gi_n[i].gn_be->bd_info );
                        /* Let backend.c take care of the rest of startup */
                        if ( !rc )
-                               rc = backend_startup_one( gi->gi_n[i].gn_be, NULL );
+                               rc = backend_startup_one( gi->gi_n[i].gn_be, &cr );
                        if ( rc ) break;
                }
                if ( !rc && !bsame && on->on_info->oi_orig->bi_open )

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 450706c12751e13454798016afecc6057b54fb95..700043e305f3e0e4c66ef3583f9edf67aaacbfef 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -3209,7 +3209,7 @@ pcache_db_open2(
        query_manager*  qm = cm->qm;
        int rc;
 
-       rc = backend_startup_one( &cm->db, NULL );
+       rc = backend_startup_one( &cm->db, cr );
        if ( rc == 0 ) {
                cm->defer_db_open = 0;
        }

diff --git a/servers/slapd/overlays/translucent.c b/servers/slapd/overlays/translucent.c
index 146245dfb033bdb88d4f298f7e4ceecf54fd82c6..7f91cff5e52d737dace6f5888cbdcea949a5d5b6 100644 (file)
--- a/servers/slapd/overlays/translucent.c
+++ b/servers/slapd/overlays/translucent.c
@@ -1147,7 +1147,7 @@ static int translucent_db_open(BackendDB *be, ConfigReply *cr) {
        if ( ov->defer_db_open )
                return 0;
 
-       rc = backend_startup_one( &ov->db, NULL );
+       rc = backend_startup_one( &ov->db, cr );
 
        if(rc) Debug(LDAP_DEBUG_TRACE,
                "translucent: bi_db_open() returned error %d\n", rc, 0, 0);