From 9b99449e29fa1de7425da546d4d0ba94bcb62753 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sun, 12 Oct 2003 01:01:00 +0000 Subject: [PATCH] Import ITS#2130, ITS#2678 fix from HEAD --- servers/slapd/backend.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c index e694be61bf..4cd310d056 100644 --- 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 { -- 2.47.2