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

Nathan Kinder (nkinder) fedora-directory-commits at redhat.com
Wed Jul 9 19:41:48 UTC 2008


Author: nkinder

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

Modified Files:
      Tag: Directory71RtmBranch
	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.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- ldbm_search.c	11 Jan 2008 19:20:24 -0000	1.6.2.2
+++ ldbm_search.c	9 Jul 2008 19:41:46 -0000	1.6.2.3
@@ -1303,6 +1303,10 @@
           {
               /* Failed the filter test, and this isn't a VLV Search */
               cache_return( &inst->inst_cache, &(sr->sr_entry) );
+              if (LDAP_TIMELIMIT_EXCEEDED == filter_test) {
+                  slapi_send_ldap_result( pb, LDAP_TIMELIMIT_EXCEEDED, NULL, NULL, nentries, urls );
+                  return -1;
+              }
           }
         }
     }




More information about the Fedora-directory-commits mailing list