* Added cs_addr field to struct CitContext -- holds a dotted quad string

[citadel.git] / citadel / serv_smtp.c

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 4b2872dcdfc6c7223fb6177cfe12e4149fe0b7c1..28a2ec01534ece1ce522d8b11bad3c088ad037e3 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -493,14 +493,12 @@ void smtp_data(void) {
        datestring(nowstamp, sizeof nowstamp, time(NULL), DATESTRING_RFC822);
        body = mallok(4096);
 
-       /* FIXME
-          it should be Received: from %s (real.name.dom [w.x.y.z])
-        */
        if (body != NULL) snprintf(body, 4096,
-               "Received: from %s (%s)\n"
+               "Received: from %s (%s [%s])\n"
                "       by %s; %s\n",
                        SMTP->helo_node,
                        CC->cs_host,
+                       CC->cs_addr,
                        config.c_fqdn,
                        nowstamp);