Completed the removal of $Id$ tags in the Citadel server. Also, since the strings...

[citadel.git] / citadel / modules / smtp / serv_smtp.c

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 1d7dd0e7ebb558f1bf9e4732921c2cb3c4cb1ca8..69f12fb037bc110485524be5d8039cc3b03e5855 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module is an SMTP and ESMTP implementation for the Citadel system.
  * It is compliant with all of the following:
  *
@@ -992,7 +990,7 @@ void smtp_try(const char *key, const char *addr, int *status,
 
        /* Load the message out of the database */
        CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
-       CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, ESC_DOT);
+       CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, (ESC_DOT|SUPPRESS_ENV_TO) );
        msg_size = StrLength(CC->redirect_buffer);
        msgtext = SmashStrBuf(&CC->redirect_buffer);
 
@@ -1083,7 +1081,7 @@ void smtp_try(const char *key, const char *addr, int *status,
                        strcpy(mx_port, "25");
                }
                CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connecting to %s : %s ...\n", mx_host, mx_port);
-               sock = sock_connect(mx_host, mx_port, "tcp");
+               sock = sock_connect(mx_host, mx_port);
                snprintf(dsn, SIZ, "Could not connect: %s", strerror(errno));
                if (sock >= 0) CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connected!\n");
                if (sock < 0) {
@@ -1934,5 +1932,5 @@ CTDL_MODULE_INIT(smtp)
        }
        
        /* return our Subversion id for the Log */
-       return "$Id$";
+       return "smtp";
 }