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

+Fri May  7 21:12:35 CEST 2010 (tk)

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

+ * clamdscan: respect ExcludePath in --fdpass mode (bb#1923)

+

 Fri Apr  9 17:01:07 EEST 2010 (edwin)

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

  * libclamav/c++/llvm/test: Fix make check failure on x86-32 (bb #1942)

@@ -44,6 +44,7 @@

 void help(void);

 extern int printinfected;

+struct optstruct *clamdopts = NULL;

 static void print_server_version(const struct optstruct *opt)

 {

@@ -69,6 +70,11 @@ int main(int argc, char **argv)

 	return 2;

     }

+    if((clamdopts = optparse(optget(opts, "config-file")->strarg, 0, NULL, 1, OPT_CLAMD, 0, NULL)) == NULL) {

+	logg("!Can't parse clamd configuration file %s\n", optget(opts, "config-file")->strarg);

+	return 2;

+    }

+

     if(optget(opts, "verbose")->enabled) {

 	mprintf_verbose = 1;

 	logg_verbose = 1;

@@ -83,11 +89,13 @@ int main(int argc, char **argv)

     if(optget(opts, "version")->enabled) {

 	print_server_version(opts);

 	optfree(opts);

+	optfree(clamdopts);

 	exit(0);

     }

     if(optget(opts, "help")->enabled) {

 	optfree(opts);

+	optfree(clamdopts);

     	help();

     }

@@ -101,6 +109,7 @@ int main(int argc, char **argv)

 	if(logg("--------------------------------------\n")) {

 	    mprintf("!Problem with internal logger.\n");

 	    optfree(opts);

+	    optfree(clamdopts);

 	    exit(2);

 	}

     } else 

@@ -110,12 +119,14 @@ int main(int argc, char **argv)

     if(optget(opts, "reload")->enabled) {

 	ret = reload_clamd_database(opts);

 	optfree(opts);

+	optfree(clamdopts);

 	logg_close();

 	exit(ret);

     }

     if(actsetup(opts)) {

 	optfree(opts);

+	optfree(clamdopts);

 	logg_close();

 	exit(2);

     }

@@ -134,6 +145,7 @@ int main(int argc, char **argv)

     gettimeofday(&t1, NULL);

     ret = client(opts, &infected, &err);

+    optfree(clamdopts);

     /* TODO: Implement STATUS in clamd */

     if(!optget(opts, "no-summary")->enabled) {

@@ -73,21 +73,16 @@ unsigned long int maxstream;

 static struct sockaddr_un nixsock;

 #endif

 static struct sockaddr_in tcpsock;

-

+extern struct optstruct *clamdopts;

 /* Inits the communication layer

  * Returns 0 if clamd is local, non zero if clamd is remote */

 static int isremote(const struct optstruct *opts) {

     int s, ret;

     const struct optstruct *opt;

-    struct optstruct *clamdopts;

     const char *clamd_conf = optget(opts, "config-file")->strarg;

     static struct sockaddr_in testsock;

-    if((clamdopts = optparse(clamd_conf, 0, NULL, 1, OPT_CLAMD, 0, NULL)) == NULL) {

-	logg("!Can't parse clamd configuration file %s\n", clamd_conf);

-	return 0;

-    }

 #ifndef _WIN32

     if((opt = optget(clamdopts, "LocalSocket"))->enabled) {

 	memset((void *)&nixsock, 0, sizeof(nixsock));

@@ -96,24 +91,20 @@ static int isremote(const struct optstruct *opts) {

 	nixsock.sun_path[sizeof(nixsock.sun_path)-1]='\0';

 	mainsa = (struct sockaddr *)&nixsock;

 	mainsasz = sizeof(nixsock);

-	optfree(clamdopts);

 	return 0;

     }

 #endif

-    if(!(opt = optget(clamdopts, "TCPSocket"))->enabled) {

-	optfree(clamdopts);

+    if(!(opt = optget(clamdopts, "TCPSocket"))->enabled)

 	return 0;

-    }

+

     mainsa = (struct sockaddr *)&tcpsock;

     mainsasz = sizeof(tcpsock);

     if (cfg_tcpsock(clamdopts, &tcpsock, INADDR_LOOPBACK) == -1) {

 	logg("!Can't lookup clamd hostname: %s.\n", strerror(errno));

-	optfree(clamdopts);

 	mainsa = NULL;

 	return 0;

     }

-    optfree(clamdopts);

     memcpy((void *)&testsock, (void *)&tcpsock, sizeof(testsock));

     testsock.sin_port = htons(INADDR_ANY);

     if(!(s = socket(testsock.sin_family, SOCK_STREAM, 0))) return 0;

@@ -226,16 +217,9 @@ int reload_clamd_database(const struct optstruct *opts)

 int client(const struct optstruct *opts, int *infected, int *err)

 {

-	const char *clamd_conf = optget(opts, "config-file")->strarg;

-	struct optstruct *clamdopts;

 	int remote, scantype, session = 0, errors = 0, scandash = 0, maxrec, flags = 0;

 	const char *fname;

-    if((clamdopts = optparse(clamd_conf, 0, NULL, 1, OPT_CLAMD, 0, NULL)) == NULL) {

-	logg("!Can't parse clamd configuration file %s\n", clamd_conf);

-	return 2;

-    }

-

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

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

 #ifdef HAVE_FD_PASSING

@@ -257,7 +241,6 @@ int client(const struct optstruct *opts, int *infected, int *err)

     if (optget(clamdopts, "FollowFileSymlinks")->enabled)

 	flags |= CLI_FTW_FOLLOW_FILE_SYMLINK;

     flags |= CLI_FTW_TRIM_SLASHES;

-    optfree(clamdopts);

     if(!mainsa) {

 	logg("!Clamd is not configured properly.\n");

@@ -46,6 +46,7 @@

 #include "libclamav/others.h"

 #include "shared/actions.h"

 #include "shared/output.h"

+#include "shared/misc.h"

 #include "proto.h"

 #include "client.h"

@@ -54,6 +55,7 @@ extern struct sockaddr *mainsa;

 extern int mainsasz;

 extern unsigned long int maxstream;

 int printinfected;

+extern struct optstruct *clamdopts;

 static const char *scancmd[] = { "CONTSCAN", "MULTISCAN" };

@@ -244,6 +246,23 @@ static int send_fdpass(int sockd, const char *filename) {

 }

 #endif

+/* 0: scan, 1: skip */

+static int chkpath(const char *path)

+{

+	const struct optstruct *opt;

+

+   if((opt = optget(clamdopts, "ExcludePath"))->enabled) {

+	while(opt) {

+	    if(match_regex(path, opt->strarg) == 1) {

+		logg("~%s: Excluded\n", path);

+		return 1;

+	    }

+	    opt = opt->nextarg;

+	}

+    }

+    return 0;

+}

+

 /* Sends a proper scan request to clamd and parses its replies

  * This is used only in non IDSESSION mode

  * Returns the number of infected files or -1 on error */

@@ -253,6 +272,8 @@ int dsresult(int sockd, int scantype, const char *filename, int *printok, int *e

     struct RCVLN rcv;

     struct stat sb;

+    if(chkpath(filename))

+	return 0;

     recvlninit(&rcv, sockd);

     switch(scantype) {

@@ -501,6 +522,8 @@ static int parallel_callback(struct stat *sb, char *filename, const char *path,

     struct SCANID *cid;

     int res;

+    if(chkpath(filename))

+	return 0;

     c->files++;

     switch(reason) {

     case error_stat:

@@ -286,7 +286,6 @@ int daemonize(void)

 #endif

 }

-#ifndef CL_NOLIBCLAMAV

 int match_regex(const char *filename, const char *pattern)

 {

 	regex_t reg;

@@ -310,7 +309,6 @@ int match_regex(const char *filename, const char *pattern)

 	cli_regfree(&reg);

 	return match;

 }

-#endif

 int cfg_tcpsock(const struct optstruct *opts, struct sockaddr_in *tcpsock, in_addr_t defaultbind)

 {