@@ -1,3 +1,8 @@

+Thu Sep 18 10:25:07 CEST 2008 (tk)

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

+  * clamdscan: add support for --reload (bb#1098)

+	       Thanks to Jeffrey Thomas Peckham

+

 Wed Sep 17 10:59:48 CEST 2008 (tk)

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

   * libclamav/mbox.c: mail-follow-urls was not RFC compliant (bb#1192)

@@ -51,6 +51,15 @@ static void print_server_version(const struct optstruct *opt)

     }

 }

+static int reload_server_database(const struct optstruct *opt)

+{

+    if(reload_clamd_database(opt)) {

+	logg("!Clamd did not reload the database\n");

+	return 2;

+    }

+    return 0;

+}

+

 int main(int argc, char **argv)

 {

 	int ds, dms, ret, infected;

@@ -61,7 +70,8 @@ int main(int argc, char **argv)

 	const char *clamdscan_accepted[] = { "help", "version", "verbose", "quiet",

 				  "stdout", "log", "move", "copy", "remove",

 				  "config-file", "no-summary",  "fdpass",

-				  "disable-summary", "multiscan", NULL };

+				  "disable-summary", "multiscan", "reload",

+				  NULL };

     opt = opt_parse(argc, argv, clamscan_shortopt, clamscan_longopt, clamdscan_accepted);

@@ -108,6 +118,13 @@ int main(int argc, char **argv)

 	logg_file = NULL;

+    if(opt_check(opt, "reload")) {

+	ret = reload_server_database(opt);

+	opt_free(opt);

+	logg_close();

+	exit(ret);

+    }

+

     time(&starttime);

     /* ctime() does \n, but I need it once more */

@@ -133,6 +150,7 @@ int main(int argc, char **argv)

 	logg("Time: %d.%3.3d sec (%d m %d s)\n", ds, dms/1000, ds/60, ds%60);

     }

+    logg_close();

     opt_free(opt);

     exit(ret);

 }

@@ -160,6 +178,7 @@ void help(void)

     mprintf("    --multiscan           -m           Force MULTISCAN mode\n");

     mprintf("    --infected            -i           Only print infected files\n");

     mprintf("    --no-summary                       Disable summary at end of scanning\n");

+    mprintf("    --reload                           Request clamd to reload virus database\n");

     mprintf("    --fdpass                           pass filedescriptor to clamd (useful if clamd is running as a different user)\n");

     mprintf("\n");

@@ -360,6 +360,7 @@ int get_clamd_version(const struct optstruct *opt)

     if(write(sockd, "VERSION", 7) <= 0) {

 	logg("^Can't write to the socket.\n");

+	close(sockd);

 	return 2;

     }

@@ -372,6 +373,33 @@ int get_clamd_version(const struct optstruct *opt)

     return 0;

 }

+int reload_clamd_database(const struct optstruct *opt)

+{

+	char buff[64];

+	int bread, sockd;

+

+

+    if((sockd = dconnect(opt, NULL)) < 0)

+	return 2;

+

+    if(write(sockd, "RELOAD", 6) <= 0) {

+	logg("!Can't write to the socket.\n");

+	close(sockd);

+	return 2;

+    }

+

+    bread = read(sockd, buff, sizeof(buff) - 1);

+    buff[bread] = '\0';

+    if(strncmp(buff, "RELOADING", 9)) {

+	logg("!Incorrect reply from clamd\n");

+	close(sockd);

+	return 2;

+    }

+

+    close(sockd);

+    return 0;

+}

+

 int client(const struct optstruct *opt, int *infected)

 {

 	char cwd[PATH_MAX+1], *fullpath;

@@ -23,5 +23,6 @@

 int client(const struct optstruct *opt, int *infected);

 int get_clamd_version(const struct optstruct *opt);

+int reload_clamd_database(const struct optstruct *opt);

 #endif

@@ -37,6 +37,7 @@ static struct option clamscan_longopt[] = {

     {"tempdir", 1, 0, 0},

     {"leave-temps", 0, 0, 0},

     {"config-file", 1, 0, 0},	    /* clamdscan */

+    {"reload", 0, 0, 0},           /* clamdscan */

     {"multiscan", 0, 0, 'm'},

     {"database", 1, 0, 'd'},

     {"force", 0, 0, 0},

@@ -45,6 +45,9 @@ Move infected files into DIRECTORY.

 \fB\-\-no\-summary\fR

 Do not display summary at the end of scanning.

 .TP

+\fB\-\-reload\fR

+Request clamd to reload virus database.

+.TP

 \fB\-\-fdpass\fR

 Pass the file descriptor permissions clamd. This is useful if clamd is running as a different user as it is faster than streaming the file to clamd.

 Only available if connected to clamd through local(unix) sockets and scanning stdin.