re-fix previous commit

diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c
index 2922d47ccc3c81c1481b106ff1db5bb95cf08cfd..e0777f3e8252d1a9198a88b040c75b67a6a2e896 100644 (file)
--- a/servers/slapd/back-sql/search.c
+++ b/servers/slapd/back-sql/search.c
@@ -2340,6 +2340,9 @@ backsql_search( Operation *op, SlapReply *rs )
                        rs->sr_ref = NULL;
                        rs->sr_matched = NULL;
                        rs->sr_entry = NULL;
+                       if ( rs->sr_err == LDAP_REFERRAL ) {
+                               rs->sr_err = LDAP_SUCCESS;
+                       }
 
                        goto next_entry;
                }
@@ -2452,15 +2455,13 @@ next_entry2:;
        }
 
 end_of_search:;
-       if ( rs->sr_err == LDAP_SUCCESS ) {
-               if ( rs->sr_nentries > 0 ) {
-                       rs->sr_ref = rs->sr_v2ref;
-                       rs->sr_err = (rs->sr_v2ref == NULL) ? LDAP_SUCCESS
-                               : LDAP_REFERRAL;
-       
-               } else {
-                       rs->sr_err = bsi.bsi_status;
-               }
+       if ( rs->sr_nentries > 0 ) {
+               rs->sr_ref = rs->sr_v2ref;
+               rs->sr_err = (rs->sr_v2ref == NULL) ? LDAP_SUCCESS
+                       : LDAP_REFERRAL;
+
+       } else {
+               rs->sr_err = bsi.bsi_status;
        }
 
 send_results:;