only wait if no entry was returned

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 32e2b27fc98a544d1c498ec1a938cd990e3c8934..ae6da9dc586d44c3a7572dbd3293202f1934b27e 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -474,7 +474,10 @@ really_bad:;
                                }
                                op->o_private = savepriv;
 
+                               /* don't wait any longer... */
                                gotit = 1;
+                               tv.tv_sec = 0;
+                               tv.tv_usec = 0;
 
 #if 0
                                /*
@@ -753,13 +756,11 @@ really_bad:;
                        }
                }
 
+               /* if no entry was found during this loop,
+                * set a minimal timeout */
                if ( gotit == 0 ) {
                        LDAP_BACK_TV_SET( &tv );
                         ldap_pvt_thread_yield();
-
-               } else {
-                       tv.tv_sec = 0;
-                       tv.tv_usec = 0;
                }
        }