Import ITS#2130, ITS#2678 fix from HEAD

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index e694be61bf7ae158d8020a4ed90208680ec458d8..4cd310d056130112ab0eab743759b6b61854ff9a 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -314,6 +314,23 @@ int backend_startup(Backend *be)
 
        /* open each backend database */
        for( i = 0; i < nBackendDB; i++ ) {
+               if ( backendDB[i].be_update_ndn.bv_val && (
+                       !backendDB[i].be_update_refs &&
+                       !backendDB[i].syncinfo &&
+                       !default_referral ) ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG( BACKEND, CRIT, 
+                               "backend_startup: slave \"%s\" updateref missing\n",
+                               backendDB[i].be_suffix[0].bv_val, 0, 0 );
+                               
+#else
+                       Debug( LDAP_DEBUG_ANY,
+                               "backend_startup: slave \"%s\" updateref missing\n",
+                               backendDB[i].be_suffix[0].bv_val, 0, 0 );
+#endif
+                       return -1;
+               }
+
                /* append global access controls */
                acl_append( &backendDB[i].be_acl, global_acl );
 
@@ -565,7 +582,8 @@ select_backend(
                                if( be == NULL ) {
                                        be = &backends[i];
 
-                                       if( manageDSAit && len == dnlen ) {
+                                       if( manageDSAit && len == dnlen &&
+                                               !SLAP_GLUE_SUBORDINATE( be ) ) {
                                                continue;
                                        }
                                } else {