[Fedora-directory-commits] ldapserver/ldap/servers/plugins/chainingdb cb_search.c, 1.5, 1.6

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32498/ldap/servers/plugins/chainingdb

Modified Files:
	cb_search.c 
Log Message:
[204808] spurious search timeouts
Fixed a problem that ldapsearch reports random timeouts on 64-bit machine.



Index: cb_search.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_search.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cb_search.c	19 Apr 2005 22:07:29 -0000	1.5
+++ cb_search.c	5 Oct 2006 21:14:01 -0000	1.6
@@ -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;