@@ -1,3 +1,7 @@

+Tue Nov  4 20:15:55 CET 2008 (tk)

+---------------------------------

+ * libclamav, clamd: always return correct db version in VERSION (bb#1168)

+

 Tue Nov  4 13:11:24 EET 2008 (edwin)

 ------------------------------------

  * contrib/clamdtop/TODO, contrib/clamdtop/clamdtop.c: fix bar

@@ -158,32 +158,16 @@ int command(int desc, const struct cl_engine *engine, const struct cl_limits *li

 		return COMMAND_SHUTDOWN;

     } else if(!strncmp(buff, CMD7, strlen(CMD7))) { /* VERSION */

-	    const char *dbdir = cfgopt(copt, "DatabaseDirectory")->strarg;

-	    char *path;

-	    struct cl_cvd *daily;

-

 	thrmgr_setactivetask(NULL, CMD7);

-	if(!(path = malloc(strlen(dbdir) + 30))) {

-	    mdprintf(desc, "Memory allocation error - SHUTDOWN forced\n");

-	    return COMMAND_SHUTDOWN;

-	}

-

-	sprintf(path, "%s/daily.cvd", dbdir);

-	if(access(path, R_OK))

-	    sprintf(path, "%s/daily.cld", dbdir);

-

-	if(!access(path, R_OK) && (daily = cl_cvdhead(path))) {

+	if(engine->dbversion[0]) {

 		char timestr[32];

-		time_t t = (time_t) daily->stime;

+		time_t t = (time_t) engine->dbversion[1];

-	    mdprintf(desc, "ClamAV %s/%d/%s", get_version(), daily->version, cli_ctime(&t, timestr, sizeof(timestr)));

-	    cl_cvdfree(daily);

+	    mdprintf(desc, "ClamAV %s/%d/%s", get_version(), engine->dbversion[0], cli_ctime(&t, timestr, sizeof(timestr)));

 	} else {

 	    mdprintf(desc, "ClamAV %s\n", get_version());

 	}

-	free(path);

-

     } else if(!strncmp(buff, CMD8, strlen(CMD8))) { /* STREAM */

 	thrmgr_setactivetask(NULL, CMD8);

 	if(scanstream(desc, NULL, engine, limits, options, copt) == CL_EMEM)

@@ -117,6 +117,7 @@ struct cl_engine {

     unsigned int refcount; /* reference counter */

     unsigned short sdb;

     unsigned int dboptions;

+    unsigned int dbversion[2];

     /* Roots table */

     void **root;

@@ -500,7 +500,7 @@ int cl_cvdverify(const char *file)

     return ret;

 }

-int cli_cvdload(FILE *fs, struct cl_engine **engine, unsigned int *signo, short warn, unsigned int options, unsigned int cld)

+int cli_cvdload(FILE *fs, struct cl_engine **engine, unsigned int *signo, unsigned int daily, unsigned int options, unsigned int cld)

 {

         char *dir;

 	struct cl_cvd cvd;

@@ -515,7 +515,7 @@ int cli_cvdload(FILE *fs, struct cl_engine **engine, unsigned int *signo, short

     if((ret = cli_cvdverify(fs, &cvd, cld)))

 	return ret;

-    if(cvd.stime && warn) {

+    if(cvd.stime && daily) {

 	time(&s_time);

 	if((int) s_time - cvd.stime > 604800) {

 	    cli_warnmsg("**************************************************\n");

@@ -543,6 +543,11 @@ int cli_cvdload(FILE *fs, struct cl_engine **engine, unsigned int *signo, short

 	return CL_EIO;

     }

+    if(daily) {

+	(*engine)->dbversion[0] = cvd.version;

+	(*engine)->dbversion[1] = cvd.stime;

+    }

+

     if(options & CL_DB_CVDNOTMP) {

 	return cli_tgzload(cfd, engine, signo, options | CL_DB_OFFICIAL);

@@ -31,7 +31,7 @@ struct cli_dbio {

     unsigned int size;

 };

-int cli_cvdload(FILE *fs, struct cl_engine **engine, unsigned int *signo, short warn, unsigned int options, unsigned int cld);

+int cli_cvdload(FILE *fs, struct cl_engine **engine, unsigned int *signo, unsigned int daily, unsigned int options, unsigned int cld);

 int cli_untgz(int fd, const char *destdir);

 #endif

@@ -388,11 +388,11 @@ int cli_initengine(struct cl_engine **engine, unsigned int options)

 	    cli_errmsg("Can't initialize dynamic configuration\n");

 	    return CL_EMEM;

 	}

-    }

-    if((options & CL_DB_PHISHING_URLS) && (((struct cli_dconf*) (*engine)->dconf)->phishing & PHISHING_CONF_ENGINE))

-	if((ret = phishing_init(*engine)))

-	    return ret;

+	if((options & CL_DB_PHISHING_URLS) && (((struct cli_dconf*) (*engine)->dconf)->phishing & PHISHING_CONF_ENGINE))

+	    if((ret = phishing_init(*engine)))

+		return ret;

+    }

     return CL_SUCCESS;

 }

@@ -528,11 +528,6 @@ static int cli_loaddb(FILE *fs, struct cl_engine **engine, unsigned int *signo,

 	struct cli_matcher *root;

-    if((ret = cli_initengine(engine, options))) {

-	cl_free(*engine);

-	return ret;

-    }

-

     if((ret = cli_initroots(*engine, options))) {

 	cl_free(*engine);

 	return ret;

@@ -589,11 +584,6 @@ static int cli_loadwdb(FILE *fs, struct cl_engine **engine, unsigned int options

 	int ret = 0;

-    if((ret = cli_initengine(engine, options))) {

-	cl_free(*engine);

-	return ret;

-    }

-

     if(!(((struct cli_dconf *) (*engine)->dconf)->phishing & PHISHING_CONF_ENGINE))

 	return CL_SUCCESS;

@@ -619,11 +609,6 @@ static int cli_loadpdb(FILE *fs, struct cl_engine **engine, unsigned int options

 	int ret = 0;

-    if((ret = cli_initengine(engine, options))) {

-	cl_free(*engine);

-	return ret;

-    }

-

     if(!(((struct cli_dconf *) (*engine)->dconf)->phishing & PHISHING_CONF_ENGINE))

 	return CL_SUCCESS;

@@ -656,11 +641,6 @@ static int cli_loadndb(FILE *fs, struct cl_engine **engine, unsigned int *signo,

 	unsigned int phish = options & CL_DB_PHISHING;

-    if((ret = cli_initengine(engine, options))) {

-	cl_free(*engine);

-	return ret;

-    }

-

     if((ret = cli_initroots(*engine, options))) {

 	cl_free(*engine);

 	return ret;

@@ -946,11 +926,6 @@ static int cli_loadldb(FILE *fs, struct cl_engine **engine, unsigned int *signo,

 	struct cli_lsig_tdb tdb;

-    if((ret = cli_initengine(engine, options))) {

-	cl_free(*engine);

-	return ret;

-    }

-

     if((ret = cli_initroots(*engine, options))) {

 	cl_free(*engine);

 	return ret;

@@ -1127,11 +1102,6 @@ static int cli_loadftm(FILE *fs, struct cl_engine **engine, unsigned int options

 	int ret;

-    if((ret = cli_initengine(engine, options))) {

-	cl_free(*engine);

-	return ret;

-    }

-

     if((ret = cli_initroots(*engine, options))) {

 	cl_free(*engine);

 	return ret;

@@ -1258,13 +1228,8 @@ static int cli_loadign(FILE *fs, struct cl_engine **engine, unsigned int options

 	unsigned int line = 0;

 	struct cli_ignsig *new;

 	struct cli_ignored *ignored;

-	int ret;

-

+	int ret = CL_SUCCESS;

-    if((ret = cli_initengine(engine, options))) {

-	cl_free(*engine);

-	return ret;

-    }

     if(!(ignored = (*engine)->ignored)) {

 	ignored = (*engine)->ignored = (struct cli_ignored *) cli_calloc(sizeof(struct cli_ignored), 1);

@@ -1421,10 +1386,6 @@ static int cli_loadmd5(FILE *fs, struct cl_engine **engine, unsigned int *signo,

 	struct cli_bm_patt *new;

 	struct cli_matcher *db = NULL;

-    if((ret = cli_initengine(engine, options))) {

-	cl_free(*engine);

-	return ret;

-    }

     if(mode == MD5_MDB) {

 	size_field = 0;

@@ -1562,15 +1523,10 @@ static int cli_loadmd(FILE *fs, struct cl_engine **engine, unsigned int *signo,

 {

 	char buffer[FILEBUFF], *pt;

 	unsigned int line = 0, sigs = 0;

-	int ret, crc;

+	int ret = CL_SUCCESS, crc;

 	struct cli_meta_node *new;

-    if((ret = cli_initengine(engine, options))) {

-	cl_free(*engine);

-	return ret;

-    }

-

     while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) {

 	line++;

 	if(buffer[0] == '#')

@@ -1791,20 +1747,10 @@ int cli_load(const char *filename, struct cl_engine **engine, unsigned int *sign

 	ret = cli_loaddb(fs, engine, signo, options, dbio, dbname);

     } else if(cli_strbcasestr(dbname, ".cvd")) {

-	    int warn = 0;

-

-	if(!strcmp(dbname, "daily.cvd"))

-	    warn = 1;

-

-	ret = cli_cvdload(fs, engine, signo, warn, options, 0);

+	ret = cli_cvdload(fs, engine, signo, !strcmp(dbname, "daily.cvd"), options, 0);

     } else if(cli_strbcasestr(dbname, ".cld")) {

-	    int warn = 0;

-

-	if(!strcmp(dbname, "daily.cld"))

-	    warn = 1;

-

-	ret = cli_cvdload(fs, engine, signo, warn, options | CL_DB_CVDNOTMP, 1);

+	ret = cli_cvdload(fs, engine, signo, !strcmp(dbname, "daily.cld"), options | CL_DB_CVDNOTMP, 1);

     } else if(cli_strbcasestr(dbname, ".hdb")) {

 	ret = cli_loadmd5(fs, engine, signo, MD5_HDB, options, dbio, dbname);

@@ -1894,6 +1840,12 @@ int cli_load(const char *filename, struct cl_engine **engine, unsigned int *sign

 }

 int cl_loaddb(const char *filename, struct cl_engine **engine, unsigned int *signo) {

+	int ret;

+

+    if((ret = cli_initengine(engine, CL_DB_STDOPT))) {

+	cl_free(*engine);

+	return ret;

+    }

     return cli_load(filename, engine, signo, CL_DB_STDOPT, NULL);

 }

@@ -1992,6 +1944,12 @@ static int cli_loaddbdir(const char *dirname, struct cl_engine **engine, unsigne

 }

 int cl_loaddbdir(const char *dirname, struct cl_engine **engine, unsigned int *signo) {

+	int ret;

+

+    if((ret = cli_initengine(engine, CL_DB_STDOPT))) {

+	cl_free(*engine);

+	return ret;

+    }

     return cli_loaddbdir(dirname, engine, signo, CL_DB_STDOPT);

 }

@@ -2002,7 +1960,7 @@ int cl_load(const char *path, struct cl_engine **engine, unsigned int *signo, un

     if(stat(path, &sb) == -1) {

-        cli_errmsg("cl_loaddbdir(): Can't get status of %s\n", path);

+        cli_errmsg("cl_load(): Can't get status of %s\n", path);

         return CL_EIO;

     }