More removal of $Id$ tags

[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 38b47de84cf1465f5f21a25d369b60b41cff0c7f..e31638aee42a5935d4f67b2b754537eae6afe9af 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
@@ -102,10 +100,10 @@ int clamd(struct CtdlMessage *msg) {
                 extract_token(hostbuf, buf, 0, ':', sizeof hostbuf);
                 if (extract_token(portbuf, buf, 1, ':', sizeof portbuf)==-1)
                   /* Didn't specify a port so we'll try the psuedo-standard 3310 */
-                  sock = sock_connect(hostbuf, CLAMD_PORT, "tcp");
+                  sock = sock_connect(hostbuf, CLAMD_PORT);
                 else
                   /* Port specified lets try connecting to it! */
-                  sock = sock_connect(hostbuf, portbuf, "tcp");
+                  sock = sock_connect(hostbuf, portbuf);
 
                 if (sock >= 0) CtdlLogPrintf(CTDL_DEBUG, "Connected!\n");
         }
@@ -140,7 +138,7 @@ int clamd(struct CtdlMessage *msg) {
        extract_token(portbuf, buf, 1, ' ', sizeof portbuf);
 
        /* Attempt to establish connection to STREAM socket */
-        streamsock = sock_connect(hostbuf, portbuf, "tcp");
+        streamsock = sock_connect(hostbuf, portbuf);
 
        if (streamsock < 0) {
                /* If the service isn't running, just pass the mail
@@ -204,5 +202,5 @@ CTDL_MODULE_INIT(virus)
        }
        
        /* return our Subversion id for the Log */
-        return "$Id$";
+        return "virus";
 }