From 2405c716e275d582a82a5e3310a89559280841d9 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Fri, 5 Dec 2008 21:05:16 +0000 Subject: [PATCH] Supposedly user info could be removed from received header regardless of edit_identity setting, but this was not the case - now it is; Also add one more clarifying note to config script. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13364 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- class/deliver/Deliver.class.php | 2 +- config/conf.pl | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php index 11a8e138..9952a06e 100644 --- a/class/deliver/Deliver.class.php +++ b/class/deliver/Deliver.class.php @@ -590,7 +590,7 @@ class Deliver { } else { // use default received headers $header[] = "Received: from $received_from" . $rn; - if ($edit_identity || ! isset($hide_auth_header) || ! $hide_auth_header) + if (!isset($hide_auth_header) || !$hide_auth_header) $header[] = " (SquirrelMail authenticated user $username)" . $rn; $header[] = " by $SERVER_NAME with HTTP;" . $rn; $header[] = " $date" . $rn; diff --git a/config/conf.pl b/config/conf.pl index c8c7b197..e87edef8 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -2578,6 +2578,11 @@ sub command311b { this setting will make it difficult to determine who sent what where. Use at your own risk. + Note: If you have defined a header encryption key in your SMTP or + Sendmail settings (see the \"Server Settings\" option page), this + setting is ignored because all user information in outgoing messages + is encoded. + "; if ( lc($hide_auth_header) eq "true" ) { -- 2.25.1