* When entering a message into Citadel with authenticated SMTP, stamp the

  room name as MAILROOM (Mail>) so it doesn't end up with an ugly moniker
  like "0000058008.Sent Items"

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index b08e4db1213b38df0eb43f4f4928339e39644d17..a4b5e0423c0e087a8e9186e0eb262edf59833cfe 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
  $Log$
+ Revision 605.9  2003/03/06 04:58:11  ajc
+ * When entering a message into Citadel with authenticated SMTP, stamp the
+   room name as MAILROOM (Mail>) so it doesn't end up with an ugly moniker
+   like "0000058008.Sent Items"
+
  Revision 605.8  2003/03/05 04:55:32  ajc
  * serv_smtp.c: when authenticated, do not log out when a RSET command is
    issued.  This breaks clients which carelessly issue RSET before each
@@ -4517,3 +4522,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 146977c9a9a3db789d0a090b2270de57dec052c6..b9070b46859bbec58e6a37e8afc7513e2b32339f 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -509,16 +509,23 @@ void smtp_data(void) {
        /* If the user is locally authenticated, FORCE the From: header to
         * show up as the real sender.  Yes, this violates the RFC standard,
         * but IT MAKES SENSE.  Comment it out if you don't like this behavior.
+        *
+        * We also set the "message room name" ('O' field) to MAILROOM
+        * (which is Mail> on most systems) to prevent it from getting set
+        * to something ugly like "0000058008.Sent Items>" when the message
+        * is read with a Citadel client.
         */
        if (CC->logged_in) {
                if (msg->cm_fields['A'] != NULL) phree(msg->cm_fields['A']);
                if (msg->cm_fields['N'] != NULL) phree(msg->cm_fields['N']);
                if (msg->cm_fields['H'] != NULL) phree(msg->cm_fields['H']);
                if (msg->cm_fields['F'] != NULL) phree(msg->cm_fields['F']);
+               if (msg->cm_fields['O'] != NULL) phree(msg->cm_fields['O']);
                msg->cm_fields['A'] = strdoop(CC->usersupp.fullname);
                msg->cm_fields['N'] = strdoop(config.c_nodename);
                msg->cm_fields['H'] = strdoop(config.c_humannode);
                msg->cm_fields['F'] = strdoop(CC->cs_inet_email);
+               msg->cm_fields['O'] = strdoop(MAILROOM);
        }
 
        /* Submit the message into the Citadel system. */