Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv554/plugins/chainingdb
Modified Files:
Tag: Directory71RtmBranch
cb_search.c
Log Message:
Resolves: #204808
Summary: spurious search timeouts
Description: applied the patch to Directory71RtmBranch
Index: cb_search.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_search.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- cb_search.c 19 Apr 2005 22:07:29 -0000 1.5
+++ cb_search.c 11 Jan 2008 19:20:23 -0000 1.5.2.1
@@ -179,7 +179,7 @@
slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_ENTRY, NULL );
return 1;
}
- timeout.tv_sec=timelimit-(now-optime);
+ timeout.tv_sec=(time_t)timelimit-(now-optime);
timeout.tv_usec=0;
}
@@ -414,7 +414,10 @@
{
char *target;
- int sizelimit,timelimit, rc, parse_rc, optime,i,retcode, attrsonly;
+ int sizelimit, timelimit;
+ int rc, parse_rc, retcode;
+ int i, attrsonly;
+ time_t optime;
LDAPMessage *res=NULL;
char *matched_msg,*error_msg;
cb_searchContext *ctx=NULL;