X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fclamav%2Fserv_virus.c;h=c5599b9de95576ed4b088d42c3dfa962f2c71be9;hb=882ff5a53c3b4e440520a073cf07dc60b2671876;hp=9626177a027d0ac2d1ab06fa8919237e7eab52a1;hpb=0428f9c321bffd2afbd5c41c1170b74d240a5c64;p=citadel.git

diff --git a/citadel/modules/clamav/serv_virus.c b/citadel/modules/clamav/serv_virus.c
index 9626177a0..c5599b9de 100644
--- a/citadel/modules/clamav/serv_virus.c
+++ b/citadel/modules/clamav/serv_virus.c
@@ -4,21 +4,15 @@
  * http://clamav.net (the ClamAV project is not in any way
  * affiliated with the Citadel project).
  *
- * Copyright (c) 1987-2009 by the citadel.org team
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #define CLAMD_PORT       "3310"
@@ -32,18 +26,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -61,16 +44,13 @@
 #include "internet_addressing.h"
 #include "domain.h"
 #include "clientsocket.h"
-
-
 #include "ctdl_module.h"
 
 
-
 /*
  * Connect to the clamd server and scan a message.
  */
-int clamd(struct CtdlMessage *msg) {
+int clamd(struct CtdlMessage *msg, struct recptypes *recp) {
 	int sock = (-1);
 	int streamsock = (-1);
 	char clamhosts[SIZ];
@@ -83,13 +63,11 @@ int clamd(struct CtdlMessage *msg) {
 	StrBuf *msgtext;
 	CitContext *CCC;
 
-	/* Don't care if you're logged in.  You can still spread viruses.
-	 */
-	/* if (CC->logged_in) return(0); */
-
 	/* See if we have any clamd hosts configured */
 	num_clamhosts = get_hosts(clamhosts, "clamav");
-	if (num_clamhosts < 1) return(0);
+	if (num_clamhosts < 1) {
+		return(0);
+	}
 
 	/* Try them one by one until we get a working one */
         for (clamhost=0; clamhost<num_clamhosts; ++clamhost) {
@@ -153,7 +131,6 @@ int clamd(struct CtdlMessage *msg) {
 	}
 
 
-
 	/* Message */
 	CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
 	CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1, 0);
@@ -166,8 +143,9 @@ int clamd(struct CtdlMessage *msg) {
 	/* Close the streamsocket connection; this tells clamd
 	 * that we're done.
 	 */
-	if (streamsock != -1)
+	if (streamsock != -1) {
 		close(streamsock);
+	}
 	
 	/* Response */
 	syslog(LOG_DEBUG, "Awaiting response\n");
@@ -180,10 +158,7 @@ int clamd(struct CtdlMessage *msg) {
 	}
 
 	if (is_virus) {
-		if (msg->cm_fields['0'] != NULL) {
-			free(msg->cm_fields['0']);
-		}
-		msg->cm_fields['0'] = strdup("message rejected by virus filter");
+		CM_SetField(msg, eErrorMsg, HKEY("message rejected by virus filter"));
 	}
 
 bail:	close(sock);
@@ -193,7 +168,6 @@ bail:	close(sock);
 }
 
 
-
 CTDL_MODULE_INIT(virus)
 {
 	if (!threading)