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

+Tue Jan 22 09:16:24 CET 2008 (tk)

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

+  * clamd, clamdscan: drop support for direct fd passing (not maintained)

+

 Mon Jan 21 19:59:41 EET 2008 (edwin)

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

   * libclamav/entconv.c: fix EOF handling, bug introduced in r3515.

@@ -374,40 +374,6 @@ int scan(const char *filename, unsigned long int *scanned, const struct cl_engin

     return ret;

 }

-int scanfd(const int fd, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt, int odesc)

-{

-	int ret;

-	const char *virname;

-	struct stat statbuf;

-	char fdstr[32];      

-

-

-    if(fstat(fd, &statbuf) == -1)

-	return -1;

-

-    if(!S_ISREG(statbuf.st_mode))

-	return -1;

-

-    snprintf(fdstr, sizeof(fdstr), "fd[%d]", fd);

-

-    ret = cl_scandesc(fd, &virname, scanned, engine, limits, options);

-

-    if(ret == CL_VIRUS) {

-	mdprintf(odesc, "%s: %s FOUND\n", fdstr, virname);

-	logg("%s: %s FOUND\n", fdstr, virname);

-	virusaction(fdstr, virname, copt);

-    } else if(ret != CL_CLEAN) {

-	mdprintf(odesc, "%s: %s ERROR\n", fdstr, cl_strerror(ret));

-	logg("%s: %s ERROR\n", fdstr, cl_strerror(ret));

-    } else {

-	mdprintf(odesc, "%s: OK\n", fdstr);

-        if(logok)

-	    logg("%s: OK\n", fdstr); 

-    }

-

-    return ret;

-}

-

 int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt)

 {

 	int ret, sockfd, acceptd;

@@ -28,8 +28,6 @@

 int scan(const char *filename, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt, int odesc, unsigned int type);

-int scanfd(const int fd, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt, int odesc);

-

 int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt);

 #endif

@@ -143,12 +143,6 @@ int command(int desc, const struct cl_engine *engine, const struct cl_limits *li

     } else if(!strncmp(buff, CMD11, strlen(CMD11))) { /* SHUTDOWN */

 	return COMMAND_SHUTDOWN;

-    } else if(!strncmp(buff, CMD12, strlen(CMD12))) { /* FD */

-	    int fd = atoi(buff + strlen(CMD12) + 1);

-

-	scanfd(fd, NULL, engine, limits, options, copt, desc);

-	close(fd); /* FIXME: should we close it here? */

-

     } else if(!strncmp(buff, CMD13, strlen(CMD13))) { /* MULTISCAN */

 	if(scan(buff + strlen(CMD13) + 1, NULL, engine, limits, options, copt, desc, TYPE_MULTISCAN) == -2)

 	    if(cfgopt(copt, "ExitOnOOM")->enabled)

@@ -35,7 +35,7 @@

 #define CMD9 "SESSION"

 #define CMD10 "END"

 #define CMD11 "SHUTDOWN"

-#define CMD12 "FD"

+/* #define CMD12 "FD" */

 #define CMD13 "MULTISCAN"

 #include "libclamav/clamav.h"

@@ -52,8 +52,6 @@

 # define SOCKET_INET	AF_INET

 #endif

-/* #define ENABLE_FD_PASSING	    FIXME: Doesn't work yet */

-

 void move_infected(const char *filename, const struct optstruct *opt);

 int notremoved = 0, notmoved = 0;

@@ -141,50 +139,6 @@ static int dsfile(int sockd, const char *scantype, const char *filename, const s

     return ret;

 }

-#if defined(ENABLE_FD_PASSING) && defined(HAVE_SENDMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) && !defined(C_CYGWIN)

-

-/* Submitted by Richard Lyons <frob-clamav*webcentral.com.au> */

-static int dsfd(int sockfd, int fd, const struct optstruct *opt)

-{

-	struct iovec iov[1];

-	struct msghdr msg;

-#ifdef HAVE_CONTROL_IN_MSGHDR

-#ifndef CMSG_SPACE

-#define CMSG_SPACE(len)	    (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))

-#endif

-#ifndef CMSG_LEN

-#define CMSG_LEN(len)	    (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))

-#endif

-	struct cmsghdr *cmsg;

-	char tmp[CMSG_SPACE(sizeof(fd))];

-#endif

-

-    iov[0].iov_base = "";

-    iov[0].iov_len = 1;

-    memset(&msg, 0, sizeof(msg));

-    msg.msg_iov = iov;

-    msg.msg_iovlen = 1;

-#ifdef HAVE_CONTROL_IN_MSGHDR

-    msg.msg_control = tmp;

-    msg.msg_controllen = sizeof(tmp);

-    cmsg = CMSG_FIRSTHDR(&msg);

-    cmsg->cmsg_level = SOL_SOCKET;

-    cmsg->cmsg_type = SCM_RIGHTS;

-    cmsg->cmsg_len = CMSG_LEN(sizeof(fd));

-    *(int *)CMSG_DATA(cmsg) = fd;

-#endif

-#ifdef HAVE_ACCRIGHTS_IN_MSGHDR

-    msg.msg_accrights = (caddr_t)&fd;

-    msg.msg_accrightslen = sizeof(fd);

-#endif

-    if (sendmsg(sockfd, &msg, 0) != iov[0].iov_len) {

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

-	return -1;

-    }

-    return dsresult(sockfd, opt);

-}

-#endif

-

 static int dsstream(int sockd, const struct optstruct *opt)

 {

 	int wsockd, loopw = 60, bread, port, infected = 0;

@@ -444,18 +398,6 @@ int client(const struct optstruct *opt, int *infected)

 	close(sockd);

-#if defined(ENABLE_FD_PASSING) && defined(HAVE_SENDMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) && !defined(C_CYGWIN)

-    } else if(!strcmp(opt->filename, "-")) { /* scan data from stdin */

-	if((sockd = dconnect(opt)) < 0)

-	    return 2;

-

-	if((ret = dsfd(sockd, 0, opt)) >= 0)

-	    *infected += ret;

-	else

-	    errors++;

-

-	close(sockd);

-#else

     } else if(!strcmp(opt->filename, "-")) { /* scan data from stdin */

 	if((sockd = dconnect(opt)) < 0)

 	    return 2;

@@ -466,7 +408,6 @@ int client(const struct optstruct *opt, int *infected)

 	    errors++;

 	close(sockd);

-#endif

     } else {

 	int x;