cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement scanning by filedescriptor passing. Makes it much simpler to

Browse Source 
configure a mail scanning gateway using ClamAV and smtp-vilter.

ok jsg (who also had the idea for this)
This commit is contained in:
mbalmer 2007-01-17 08:27:20 +00:00
parent a964751284
commit f94fafa89f
3 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/clamav/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.22 2007/01/13 13:13:11 mbalmer Exp $
# $OpenBSD: Makefile,v 1.23 2007/01/17 08:27:20 mbalmer Exp $
COMMENT= "virus scanner"
DISTNAME= clamav-0.88.7
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= security
SHARED_LIBS= clamav 2.0

43
security/clamav/patches/patch-clamd_session_c Normal file
View File

@ -0,0 +1,43 @@
$OpenBSD: patch-clamd_session_c,v 1.1 2007/01/17 08:27:20 mbalmer Exp $
--- clamd/session.c.orig Sun Oct 30 17:00:52 2005
+++ clamd/session.c Tue Jan 16 16:19:41 2007
@@ -51,6 +51,9 @@ int command(int desc, const struct cl_no
char buff[1025];
int bread, opt, retval;
struct cfgstruct *cpt;
+ struct msghdr msg;
+ struct cmsghdr *cmsg;
+ unsigned char buf[CMSG_SPACE(sizeof(int))];
retval = poll_fd(desc, timeout);
@@ -155,7 +158,29 @@ int command(int desc, const struct cl_no
scanfd(fd, NULL, root, limits, options, copt, desc, 0);
close(fd); /* FIXME: should we close it here? */
+ } else if(!strncmp(buff, CMD13, strlen(CMD13))) { /* FILDES */
+ memset(&msg, 0, sizeof(msg));
+ msg.msg_control = buf;
+ msg.msg_controllen = sizeof(buf);
+ if (recvmsg(desc, &msg, 0) == -1) {
+ logg("recvmsg failed!");
+ return -1;
+ }
+ if ((msg.msg_flags & MSG_TRUNC) || (msg.msg_flags & MSG_CTRUNC)) {
+ logg("control message truncated");
+ return -1;
+ }
+ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
+ cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+ if (cmsg->cmsg_len == CMSG_LEN(sizeof(int)) &&
+ cmsg->cmsg_level == SOL_SOCKET &&
+ cmsg->cmsg_type == SCM_RIGHTS) {
+ int fd = *(int *)CMSG_DATA(cmsg);
+ scanfd(fd, NULL, root, limits, options, copt, desc, 0);
+ close(fd);
+ }
+ }
} else {
mdprintf(desc, "UNKNOWN COMMAND\n");
}

11
security/clamav/patches/patch-clamd_session_h Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-clamd_session_h,v 1.1 2007/01/17 08:27:20 mbalmer Exp $
--- clamd/session.h.orig Sun Oct 30 17:00:43 2005
+++ clamd/session.h Tue Jan 16 15:50:43 2007
@@ -36,6 +36,7 @@
#define CMD10 "END"
#define CMD11 "SHUTDOWN"
#define CMD12 "FD"
+#define CMD13 "FILDES"
#include <clamav.h>
#include "cfgparser.h"