Browse code

freshclam/manager.c: fix version check for builds compiled with --enable-experimental (bb#1174)

git-svn: trunk@4190

Tomasz Kojm authored on 2008/09/18 19:07:42
Showing 2 changed files
... ...
@@ -1,3 +1,8 @@
1
+Thu Sep 18 12:13:56 CEST 2008 (tk)
2
+----------------------------------
3
+  * freshclam/manager.c: fix version check for builds compiled with
4
+			 --enable-experimental (bb#1174)
5
+
1 6
 Thu Sep 18 11:52:11 CEST 2008 (tk)
2 7
 ----------------------------------
3 8
   * clamd: enable ScanPDF by default (bb#1179)
... ...
@@ -1425,19 +1425,23 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c
1425 1425
 		}
1426 1426
 
1427 1427
 		if((newver = cli_strtok(dnsreply, 0, ":"))) {
1428
+			char vstr[32];
1428 1429
 
1429 1430
 		    logg("*Software version from DNS: %s\n", newver);
1431
+		    strncpy(vstr, get_version(), 32);
1432
+		    vstr[31] = 0;
1433
+		    if((pt = strstr(vstr, "-exp")))
1434
+			*pt = 0;
1430 1435
 
1431
-		    if(vwarning && !strstr(get_version(), "devel") && !strstr(get_version(), "rc")) {
1432
-			if(strcmp(get_version(), newver)) {
1436
+		    if(vwarning && !strstr(vstr, "devel") && !strstr(vstr, "rc")) {
1437
+			if(strcmp(vstr, newver)) {
1433 1438
 			    logg("^Your ClamAV installation is OUTDATED!\n");
1434
-			    logg("^Local version: %s Recommended version: %s\n", get_version(), newver);
1439
+			    logg("^Local version: %s Recommended version: %s\n", vstr, newver);
1435 1440
 			    logg("DON'T PANIC! Read http://www.clamav.net/support/faq\n");
1436 1441
 			    outdated = 1;
1437 1442
 			}
1438 1443
 		    }
1439 1444
 		}
1440
-
1441 1445
 	    }
1442 1446
 	}
1443 1447