* serv_smtp.c: HELO and EHLO responses now reply with the detected

  IP address and reverse DNS lookup of the connecting host

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 67acde9b63c0c37d2fca97169b032f262d4628be..8fff6d76b01375e72b2d5163353479bb95363bca 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 614.10  2004/01/27 19:56:29  ajc
+ * serv_smtp.c: HELO and EHLO responses now reply with the detected
+   IP address and reverse DNS lookup of the connecting host
+
  Revision 614.9  2004/01/24 05:47:50  ajc
  * Got Citadel talking to LDAP.  Still requires manual creation of schema
    and container entries, which I don't like; we'll have to fix that.  It
@@ -5244,3 +5248,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 5941ebaf697c78deab0b4f5c2079f68bc3bcba6c..73739f4880e4282b7bd3cc3b1cf238e25a8b21fa 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -161,10 +161,23 @@ void smtp_hello(char *argbuf, int which_command) {
        }
 
        if (which_command == 0) {
-               cprintf("250 Greetings and joyous salutations.\r\n");
+               cprintf("250 Hello %s (%s [%s])\r\n",
+                       SMTP->helo_node,
+                       CC->cs_host,
+                       CC->cs_addr
+               );
        }
        else {
-               cprintf("250-Greetings and joyous salutations.\r\n");
+               if (which_command == 1) {
+                       cprintf("250-Hello %s (%s [%s])\r\n",
+                               SMTP->helo_node,
+                               CC->cs_host,
+                               CC->cs_addr
+                       );
+               }
+               else {
+                       cprintf("250-Greetings and joyous salutations.\r\n");
+               }
                cprintf("250-HELP\r\n");
                cprintf("250-SIZE %ld\r\n", config.c_maxmsglen);
                cprintf("250-PIPELINING\r\n");
@@ -174,6 +187,7 @@ void smtp_hello(char *argbuf, int which_command) {
 }
 
 
+
 /*
  * Implement HELP command.
  */