ITS#5435

CHANGES

@@ -8,6 +8,7 @@ OpenLDAP 2.4.9 Engineering
 	Fixed slapd frontendDB backend selection (ITS#5419)
 	Fixed slapd delta-syncrepl resync (ITS#5378)
 	Fixed slapd pointer dereference (ITS#5388)
+	Fixed slapd null argument dereference (ITS#5435)
 	Fixed slapd sets attribute description parsing (ITS#5402)
 	Fixed slapd syncrepl hang on back-config (ITS#5407)
 	Fixed slapd syncrepl compare_csns crash (ITS#5413)

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;

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",

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 )

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;
 	}

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);