Browse code

fix error handling in --no-dns mode (bb#418)

git-svn: trunk@2957

Tomasz Kojm authored on 2007/03/21 02:16:58
Showing 2 changed files
... ...
@@ -1,3 +1,7 @@
1
+Tue Mar 20 16:21:39 CET 2007 (tk)
2
+---------------------------------
3
+  * freshclam/manager.c: fix error handling in --no-dns mode (bb#418)
4
+
1 5
 Tue Mar 20 15:16:33 CET 2007 (tk)
2 6
 ---------------------------------
3 7
   * freshclam/manager.c: close and re-open client socket for each connect
... ...
@@ -332,7 +332,7 @@ static char *proxyauth(const char *user, const char *pass)
332 332
     return auth;
333 333
 }
334 334
 
335
-static struct cl_cvd *remote_cvdhead(const char *file, const char *hostname, char *ip, const char *localip, const char *proxy, int port, const char *user, const char *pass, const char *uas, unsigned int *ims, int ctimeout, int rtimeout, struct mirdat *mdat)
335
+static struct cl_cvd *remote_cvdhead(const char *file, const char *hostname, char *ip, const char *localip, const char *proxy, int port, const char *user, const char *pass, const char *uas, int *ims, int ctimeout, int rtimeout, struct mirdat *mdat)
336 336
 {
337 337
 	char cmd[512], head[513], buffer[FILEBUFF], ipaddr[16], *ch, *tmp;
338 338
 	int bread, cnt, sd;
... ...
@@ -839,8 +839,8 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig
839 839
 {
840 840
 	struct cl_cvd *current, *remote;
841 841
 	struct cfgstruct *cpt;
842
-	unsigned int nodb = 0, currver = 0, newver = 0, port = 0, ims = 0, i, j;
843
-	int ret;
842
+	unsigned int nodb = 0, currver = 0, newver = 0, port = 0, i, j;
843
+	int ret, ims = -1;
844 844
 	char *pt, dbfile[32], dbinc[32], *bacinc = NULL;
845 845
 	const char *proxy = NULL, *user = NULL, *pass = NULL, *uas = NULL;
846 846
 	unsigned int flevel = cl_retflevel(), inc;