ITS#4310 seems to affect also back-ldbm

[openldap] / servers / slapd / back-ldbm / referral.c

diff --git a/servers/slapd/back-ldbm/referral.c b/servers/slapd/back-ldbm/referral.c
index 14838296209fa03101d31bf477c762e7f7d649cf..ba3e5fb2ec68c91940337e4cf5c230b4bb9deaa5 100644 (file)
--- a/servers/slapd/back-ldbm/referral.c
+++ b/servers/slapd/back-ldbm/referral.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,8 @@ ldbm_back_referrals(
 
                        cache_return_entry_r( &li->li_cache, matched );
 
-               } else if ( default_referral != NULL ) {
+               } else if ( !be_issuffix( op->o_bd, &op->o_req_ndn ) && default_referral != NULL ) {
+                       rc = rs->sr_err = LDAP_OTHER;
                        rs->sr_ref = referral_rewrite( default_referral,
                                NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
                }
@@ -78,7 +79,9 @@ ldbm_back_referrals(
                        rs->sr_text = rs->sr_matched ? "bad referral object" : "bad default referral";
                }
 
-               send_ldap_result( op, rs );
+               if ( rc != LDAP_SUCCESS ) {
+                       send_ldap_result( op, rs );
+               }
 
                if ( rs->sr_matched ) free( (char *)rs->sr_matched );
                if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );