From 6c4971cad8fd014dac7e3d444bcc62d5821dd951 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 2 Dec 2003 03:03:03 +0000 Subject: [PATCH] ITS#2764, #2781 import fixes from HEAD --- servers/slapd/backend.c | 18 ------------------ servers/slapd/extended.c | 4 ++++ 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c index 22b443aecc..d349a7077c 100644 --- a/servers/slapd/backend.c +++ b/servers/slapd/backend.c @@ -314,24 +314,6 @@ int backend_startup(Backend *be) /* open each backend database */ for( i = 0; i < nBackendDB; i++ ) { -#ifndef SLAPD_MULTIMASTER - if ( backendDB[i].be_update_ndn.bv_val && ( - !backendDB[i].be_update_refs && - !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; - } -#endif - /* append global access controls */ acl_append( &backendDB[i].be_acl, global_acl ); diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c index a2999bab42..8150ef726f 100644 --- a/servers/slapd/extended.c +++ b/servers/slapd/extended.c @@ -241,6 +241,10 @@ do_extended( if ( rc == LDAP_REFERRAL && refs == NULL ) { refs = referral_rewrite( default_referral, NULL, NULL, LDAP_SCOPE_DEFAULT ); + if ( refs == NULL ) { + rc = LDAP_UNWILLING_TO_PERFORM; + text = "referral missing"; + } } send_ldap_extended( conn, op, rc, NULL, text, refs, -- 2.47.2