[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm ldbm_search.c, 1.12, 1.12.2.1

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8956/servers/slapd/back-ldbm

Modified Files:
      Tag: Directory_Server_8_0_Branch
	ldbm_search.c 
Log Message:
Resolves: 448831
Summary: Make regex code obey search timelimit.



Index: ldbm_search.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_search.c,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- ldbm_search.c	12 Oct 2007 18:03:42 -0000	1.12
+++ ldbm_search.c	11 Jul 2008 17:18:43 -0000	1.12.2.1
@@ -1296,6 +1296,10 @@
                                   "Failed the filter test", 0, NULL );
                   rc = SLAPI_FAIL_GENERAL;
                   goto bail;
+              } else if (LDAP_TIMELIMIT_EXCEEDED == filter_test) {
+                  slapi_send_ldap_result( pb, LDAP_TIMELIMIT_EXCEEDED, NULL, NULL, nentries, urls );
+                  rc = SLAPI_FAIL_GENERAL;
+                  goto bail;
               }
           }
         }