* More license declarations

[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 a5d64f0a5e22463150deee7536fdadb6acb87315..2680d908cfdc2e681c0f14af8c9b17392bd144fc 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -22,6 +22,21 @@
  * The VRFY and EXPN commands have been removed from this implementation
  * because nobody uses these commands anymore, except for spammers.
  *
+ * Copyright (c) 1998-2009 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 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
  */
 
 #include "sysdep.h"
@@ -316,6 +331,7 @@ void smtp_get_user(char *argbuf) {
 void smtp_get_pass(char *argbuf) {
        char password[SIZ];
 
+       memset(password, 0, sizeof(password));  
        CtdlDecodeBase64(password, argbuf, SIZ);
        /* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", password); */
        if (CtdlTryPassword(password) == pass_ok) {
@@ -659,15 +675,27 @@ void smtp_data(void) {
        datestring(nowstamp, sizeof nowstamp, time(NULL), DATESTRING_RFC822);
        body = malloc(4096);
 
-       if (body != NULL) snprintf(body, 4096,
-               "Received: from %s (%s [%s])\n"
-               "       by %s; %s\n",
-                       SMTP->helo_node,
-                       CC->cs_host,
-                       CC->cs_addr,
-                       config.c_fqdn,
-                       nowstamp);
-       
+       if (body != NULL) {
+               if (SMTP->is_lmtp && (CC->cs_UDSclientUID != -1)) {
+                       snprintf(body, 4096,
+                                "Received: from %s (Citadel from userid %ld)\n"
+                                "      by %s; %s\n",
+                                SMTP->helo_node,
+                                CC->cs_UDSclientUID,
+                                config.c_fqdn,
+                                nowstamp);
+               }
+               else {
+                       snprintf(body, 4096,
+                                "Received: from %s (%s [%s])\n"
+                                "      by %s; %s\n",
+                                SMTP->helo_node,
+                                CC->cs_host,
+                                CC->cs_addr,
+                                config.c_fqdn,
+                                nowstamp);
+               }
+       }
        body = CtdlReadMessageBody(".", config.c_maxmsglen, body, 1, 0);
        if (body == NULL) {
                cprintf("550 Unable to save message: internal error.\r\n");