ITS#2764, #2781 import fixes from HEAD

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 22b443aecc3e92fd1f2560ba13d702c1a3e54b8e..d349a7077ca5b478c9cba79df9f194383c56c9d6 100644 (file)
--- 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 a2999bab4283c39be2f3d6b63e06d7bcc26b5214..8150ef726fb4af148ea43481849961edd09c05b7 100644 (file)
--- 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,