X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fsearch.c;h=e2e5b113c9bbf82dc9031ab4de6ed2164026e5a3;hb=b0b3eff457f0e431c4fd094d3d9cfeb6383df91d;hp=8c09b37331e7e939216cde6fb16698fd6ec65e83;hpb=fcc59c64887cf1eaf8fa6d2f215325f4ac946895;p=openldap

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 8c09b37331..e2e5b113c9 100644
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -1,8 +1,17 @@
 /* search.c - ldbm backend search function */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -41,10 +50,6 @@ ldbm_back_search(
 	int		manageDSAit = get_manageDSAit( op );
 	int		cscope = LDAP_SCOPE_DEFAULT;
 
-#ifdef LDAP_CACHING
-	Entry 		cache_base_entry; 
-#endif /* LDAP_CACHING */
-
 	struct slap_limits_set *limit = NULL;
 	int isroot = 0;
 		
@@ -115,11 +120,9 @@ ldbm_back_search(
 
 		ber_bvarray_free( rs->sr_ref );
 		ber_memfree( matched_dn.bv_val );
-#ifdef LDAP_SYNCREPL
+		rs->sr_ref = NULL;
+		rs->sr_matched = NULL;
 		return LDAP_REFERRAL;
-#else
-		return 1;
-#endif
 	}
 
 	if (!manageDSAit && is_entry_referral( e ) ) {
@@ -163,11 +166,9 @@ ldbm_back_search(
 		}
 
 		ber_memfree( matched_dn.bv_val );
-#ifdef LDAP_SYNCREPL
+		rs->sr_ref = NULL;
+		rs->sr_matched = NULL;
 		return LDAP_OTHER;
-#else
-		return 1;
-#endif
 	}
 
 	if ( is_entry_alias( e ) ) {
@@ -205,11 +206,7 @@ searchit:
 		rs->sr_err = LDAP_SUCCESS;
 		send_ldap_result( op, rs );
 
-#ifdef LDAP_SYNCREPL
-		rc = LDAP_OTHER;
-#else
-		rc = 1;
-#endif
+		rc = LDAP_SUCCESS;
 		goto done;
 	}
 
@@ -230,7 +227,7 @@ searchit:
 		if ( ID_BLOCK_NIDS( candidates ) > (unsigned) limit->lms_s_unchecked ) {
 			send_ldap_error( op, rs, LDAP_ADMINLIMIT_EXCEEDED,
 					NULL );
-			rc = 0;
+			rc = LDAP_SUCCESS;
 			goto done;
 		}
 	}
@@ -263,7 +260,7 @@ searchit:
 				send_ldap_error( op, rs,
 						LDAP_ADMINLIMIT_EXCEEDED,
 						NULL );
-				rc = 0; 
+				rc = LDAP_SUCCESS; 
 				goto done;
 			}
 
@@ -287,7 +284,7 @@ searchit:
 				send_ldap_error( op, rs,
 						LDAP_ADMINLIMIT_EXCEEDED,
 						NULL );
-				rc = 0;
+				rc = LDAP_SUCCESS;
 				goto done;
 			}
 
@@ -307,7 +304,7 @@ searchit:
 
 		/* check for abandon */
 		if ( op->o_abandon ) {
-			rc = 0;
+			rc = LDAP_SUCCESS;
 			goto done;
 		}
 
@@ -315,7 +312,7 @@ searchit:
 		if ( op->oq_search.rs_tlimit != -1 && slap_get_time() > stoptime ) {
 			rs->sr_err = LDAP_TIMELIMIT_EXCEEDED;
 			send_ldap_result( op, rs );
-			rc = 0;
+			rc = LDAP_SUCCESS;
 			goto done;
 		}
 
@@ -454,11 +451,9 @@ searchit:
 			goto loop_continue;
 		}
 
-#ifdef LDAP_SYNCREPL
 		if ( !manageDSAit && is_entry_glue( e )) {
 			goto loop_continue;
 		}
-#endif
 
 		/* if it matches the filter and scope, send it */
 		result = test_filter( op, e, op->oq_search.rs_filter );
@@ -488,7 +483,7 @@ searchit:
 					cache_return_entry_r( &li->li_cache, e );
 					rs->sr_err = LDAP_SIZELIMIT_EXCEEDED;
 					send_ldap_result( op, rs );
-					rc = 0;
+					rc = LDAP_SUCCESS;
 					goto done;
 				}
 
@@ -503,7 +498,7 @@ searchit:
 						break;
 					case -1:	/* connection closed */
 						cache_return_entry_r( &li->li_cache, e );
-						rc = 0;
+						rc = LDAP_SUCCESS;
 						goto done;
 					}
 				}
@@ -544,7 +539,7 @@ loop_continue:
 	rs->sr_ref = rs->sr_v2ref;
 	send_ldap_result( op, rs );
 
-	rc = 0;
+	rc = LDAP_SUCCESS;
 
 done:
 	ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);