ITS#6203

diff --git a/CHANGES b/CHANGES
index ce827de5272b9adaf6c895461ee3d12cafe846e1..d4f185d80d22362b7fbb3390f98238a2ce9d88c1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.18 Engineering
        Fixed slapd incorrectly applying writetimeout when not set (ITS#6220)
+       Fixed slapd-ndb startup (ITS#6203)
 
 OpenLDAP 2.4.17 Release (2009/07/13)
        Fixed liblber to use ber_strnlen (ITS#6080)

diff --git a/servers/slapd/back-ndb/init.cpp b/servers/slapd/back-ndb/init.cpp
index 6065029c1454267c79a91926aa380cad16ee29fd..8af31c72503841d70402c8f6887ddf3facfd7043 100644 (file)
--- a/servers/slapd/back-ndb/init.cpp
+++ b/servers/slapd/back-ndb/init.cpp
@@ -130,7 +130,7 @@ ndb_db_open( BackendDB *be, ConfigReply *cr )
                }
        }
        for ( i=0; i<ni->ni_nconns; i++ ) {
-               rc = ni->ni_cluster[i]->wait_until_ready( 30, 0 );
+               rc = ni->ni_cluster[i]->wait_until_ready( 30, 30 );
                if ( rc ) {
                        snprintf( cr->msg, sizeof( cr->msg ),
                                "ndb_db_open: ni_cluster[%d]->wait failed (%d)",