* Started adding better management of source IP addressses in SMTP service

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 603df6859621c60b477db26c9d73dc00477ae32f..88d787a8fe832566b94a5275f6c921d92701089a 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 590.116  2002/02/20 22:42:19  ajc
+ * Started adding better management of source IP addressses in SMTP service
+
  Revision 590.115  2002/02/15 04:28:57  ajc
  * Wrote the expire/purge routine for the new use table
 
@@ -3351,3 +3354,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index e7ac6a00f095c12c61b966452d7ab4d6daa92fbe..309c512a33ff20016165ddd954d8618bf4ff9577 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -473,11 +473,15 @@ void smtp_data(void) {
        datestring(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\n"
+               "Received: from %s (%s)\n"
                "       by %s;\n"
                "       %s\n",
                        SMTP->helo_node,
+                       CC->cs_host,
                        config.c_fqdn,
                        nowstamp);
        

diff --git a/citadel/techdoc/roadmap.txt b/citadel/techdoc/roadmap.txt
index 88471c0756a9242f25cc4c2c71445b0911cb6f8f..cfddd92f69ad0b74d082cb7b481a077500b50485 100644 (file)
--- a/citadel/techdoc/roadmap.txt
+++ b/citadel/techdoc/roadmap.txt
@@ -15,9 +15,19 @@ Goals for 6.00
   all deliveries through the same set of functions, regardless of whether a
   message is submitted through Citadel protocol, SMTP, or from the networker.
   (Done.)
+
 * Get the Global Address Book working (Done, just need some polish)
-* Optimize the IMAP server and add the search command
+
+* Optimize the IMAP server and add the search command.
+  Netscape makes this query:
+7 UID fetch 1662,1750,1774,2788:2790 (UID RFC822.SIZE FLAGS BODY.PEEK[HEADER.FIELDS (From To Cc Subject Date Message-ID Priority X-Priority References Newsgroups)])
+  Microsoft VirusSpreader makes this query:
+000W UID FETCH 1:* (BODY.PEEK[HEADER.FIELDS
+(References X-Ref X-Priority X-MSMail-Priority X-MSOESRec Newsgroups)] ENVELOPE
+RFC822.SIZE UID FLAGS INTERNALDATE)
+
 * Nested folders ... at least in IMAP
+
 * LDAP directory support?