* When outputting a message in non-RFC822 format, don't display an Internet

  address if the user is local.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 984535f5f2789d9ab2743b42db435d5829e498d8..172fcae206a1a76a623ff870378ec4367fe71b30 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 590.103  2002/02/08 18:10:07  ajc
+ * When outputting a message in non-RFC822 format, don't display an Internet
+   address if the user is local.
+
  Revision 590.102  2002/02/07 04:42:49  ajc
  * Silently refuse to add directory entries for Internet addresses already
    belonging to other users.
@@ -3300,4 +3304,3 @@ 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/msgbase.c b/citadel/msgbase.c
index 7e92d9996f847e940a1267d4b62df67ab035439e..7f9529006a12b4c92718a5e8b1111f0e9cdf023c 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1082,6 +1082,19 @@ int CtdlOutputPreLoadedMsg(struct CtdlMessage *TheMessage,
                                                        msgkeys[k],
                                                        display_name);
                                        }
+                                       /* Don't show Internet address for
+                                        * local users
+                                        */
+                                       else if (k == 'F') {
+                                               if (do_proto) if (TheMessage->cm_fields['N'] != NULL) if (strcasecmp(TheMessage->cm_fields['N'], config.c_nodename)) {
+                                                       cprintf("%s=%s\n",
+                                                               msgkeys[k],
+                                                               TheMessage->cm_fields[k]
+                                                       );
+
+                                               }
+                                       }
+                                       /* Masquerade display name if needed */
                                        else {
                                                if (do_proto) cprintf("%s=%s\n",
                                                        msgkeys[k],