Removed the logging facility from citserver, use syslog instead

[citadel.git] / citadel / modules / clamav / serv_virus.c

diff --git a/citadel/modules/clamav/serv_virus.c b/citadel/modules/clamav/serv_virus.c
index ab77f1865d3b1c95875074aa187b9059f153abd4..f1d6b105ae24d50e96ff9c79d3304a00bbc69ef4 100644 (file)
--- a/citadel/modules/clamav/serv_virus.c
+++ b/citadel/modules/clamav/serv_virus.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module allows Citadel to use clamd to filter incoming messages
  * arriving via SMTP.  For more information on clamd, visit
  * http://clamav.net (the ClamAV project is not in any way
@@ -96,7 +94,7 @@ int clamd(struct CtdlMessage *msg) {
        /* Try them one by one until we get a working one */
         for (clamhost=0; clamhost<num_clamhosts; ++clamhost) {
                 extract_token(buf, clamhosts, clamhost, '|', sizeof buf);
-                CtdlLogPrintf(CTDL_INFO, "Connecting to clamd at <%s>\n", buf);
+                syslog(LOG_INFO, "Connecting to clamd at <%s>\n", buf);
 
                 /* Assuming a host:port entry */ 
                 extract_token(hostbuf, buf, 0, ':', sizeof hostbuf);
@@ -107,7 +105,7 @@ int clamd(struct CtdlMessage *msg) {
                   /* Port specified lets try connecting to it! */
                   sock = sock_connect(hostbuf, portbuf);
 
-                if (sock >= 0) CtdlLogPrintf(CTDL_DEBUG, "Connected!\n");
+                if (sock >= 0) syslog(LOG_DEBUG, "Connected!\n");
         }
 
        if (sock < 0) {
@@ -117,21 +115,21 @@ int clamd(struct CtdlMessage *msg) {
                return(0);
        }
        CCC=CC;
-       CCC->sReadBuf = NewStrBuf();
+       CCC->SBuf.Buf = NewStrBuf();
        CCC->sMigrateBuf = NewStrBuf();
-       CCC->sPos = NULL;
+       CCC->SBuf.ReadWritePointer = NULL;
 
        /* Command */
-       CtdlLogPrintf(CTDL_DEBUG, "Transmitting STREAM command\n");
+       syslog(LOG_DEBUG, "Transmitting STREAM command\n");
        sprintf(buf, "STREAM\r\n");
        sock_write(&sock, buf, strlen(buf));
 
-       CtdlLogPrintf(CTDL_DEBUG, "Waiting for PORT number\n");
+       syslog(LOG_DEBUG, "Waiting for PORT number\n");
         if (sock_getln(&sock, buf, sizeof buf) < 0) {
                 goto bail;
         }
 
-        CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
+        syslog(LOG_DEBUG, "<%s\n", buf);
        if (strncasecmp(buf, "PORT", 4)!=0) {
                goto bail;
        }
@@ -146,12 +144,12 @@ int clamd(struct CtdlMessage *msg) {
                /* If the service isn't running, just pass the mail
                 * through.  Potentially throwing away mails isn't good.
                 */
-               FreeStrBuf(&CCC->sReadBuf);
+               FreeStrBuf(&CCC->SBuf.Buf);
                FreeStrBuf(&CCC->sMigrateBuf);
                return(0);
         }
        else {
-               CtdlLogPrintf(CTDL_DEBUG, "STREAM socket connected!\n");
+               syslog(LOG_DEBUG, "STREAM socket connected!\n");
        }
 
 
@@ -172,11 +170,11 @@ int clamd(struct CtdlMessage *msg) {
                close(streamsock);
        
        /* Response */
-       CtdlLogPrintf(CTDL_DEBUG, "Awaiting response\n");
+       syslog(LOG_DEBUG, "Awaiting response\n");
         if (sock_getln(&sock, buf, sizeof buf) < 0) {
                 goto bail;
         }
-        CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
+        syslog(LOG_DEBUG, "<%s\n", buf);
        if (strncasecmp(buf, "stream: OK", 10)!=0) {
                is_virus = 1;
        }
@@ -189,7 +187,7 @@ int clamd(struct CtdlMessage *msg) {
        }
 
 bail:  close(sock);
-       FreeStrBuf(&CCC->sReadBuf);
+       FreeStrBuf(&CCC->SBuf.Buf);
        FreeStrBuf(&CCC->sMigrateBuf);
        return(is_virus);
 }
@@ -204,5 +202,5 @@ CTDL_MODULE_INIT(virus)
        }
        
        /* return our Subversion id for the Log */
-        return "$Id$";
+        return "virus";
 }