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

+Tue Feb 17 01:36:36 CET 2009 (acab)

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

+ * clamd: add --stream option to force streaming even to the localhost

+	  via unix socket

+

 Mon Feb 16 23:56:34 EET 2009 (edwin)

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

  * clamd/clamd.c, clamd/server-th.c, unit_tests/check_clamd.c,

@@ -176,7 +176,8 @@ void help(void)

     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("    --fdpass                           Pass filedescriptor to clamd (useful if clamd is running as a different user)\n");

+    mprintf("    --stream                           Force streaming files to clamd (for debugging and unit testing)\n");

     mprintf("\n");

     exit(0);

@@ -223,8 +223,7 @@ int client(const struct optstruct *opts, int *infected)

     }

     scandash = (opts->filename && opts->filename[0] && !strcmp(opts->filename[0], "-") && !opts->filename[1]);

-    remote = isremote(opts);

-    /* remote = 1; */

+    remote = isremote(opts) | optget(opts, "stream")->enabled;

 #ifdef HAVE_FD_PASSING

     if(!remote && optget(clamdopts, "LocalSocket")->enabled && (optget(opts, "fdpass")->enabled || scandash)) {

 	scantype = FILDES;

@@ -53,6 +53,9 @@ Request clamd to reload virus database.

 \fB\-\-fdpass\fR

 Pass the file descriptor permissions to 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 via local(unix) socket.

+.TP

+\fB\-\-stream\fR

+Forces file streaming to clamd. This is generally not needed as clamdscan detects automatically if streaming is required. This option only exists for debugging and testing purposes, in all other cases \-\-fdpass is preferred.

 .SH "EXAMPLES"

 .LP 

 .TP 

@@ -78,6 +78,7 @@ const struct clam_option clam_options[] = {

     { NULL, "reload", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMDSCAN, "", "" },

     { NULL, "multiscan", 'm', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMDSCAN, "", "" },

     { NULL, "fdpass", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMDSCAN, "", "" },

+    { NULL, "stream", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMDSCAN, "", "" },

     { NULL, "database", 'd', TYPE_STRING, NULL, -1, DATADIR, FLAG_REQUIRED, OPT_CLAMSCAN, "", "" }, /* merge it with DatabaseDirectory (and fix conflict with --datadir */

     { NULL, "recursive", 'r', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN, "", "" },

     { NULL, "bell", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN, "", "" },