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

+Fri Mar 13 19:52:07 EET 2009 (edwin)

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

+ * clamd/scanner.c: fix handling of multiple ExcludePath entries.

+

 Fri Mar 13 17:44:48 EET 2009 (edwin)

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

  * docs/man/clamdscan.1.in, docs/man/clamdtop.1.in: escape some more

@@ -149,6 +149,7 @@ int scan_callback(struct stat *sb, char *filename, const char *msg, enum cli_ftw

     }

 #endif

     if((opt = optget(scandata->opts, "ExcludePath"))->enabled) {

+      while (opt) {

 	/* TODO: perhaps multiscan should skip this check? 

 	 * This should work unless the user is doing something stupid like

 	 * MULTISCAN / */

@@ -158,6 +159,8 @@ int scan_callback(struct stat *sb, char *filename, const char *msg, enum cli_ftw

 	    free(filename);

 	    return CL_SUCCESS;

 	}

+	opt = (struct opstruct *) opt->nextarg;

+      }

     }

     if(sb && sb->st_size == 0) { /* empty file */