Merge pull request #26 from bigio/master

create a correct Received header if the connection is authenticated
The-McGrail-Foundation · Mar 4, 2021 · 34ffd6f · 34ffd6f
2 parents da02c71 + c69ee7d
commit 34ffd6f
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/mimedefang.pl.in b/mimedefang.pl.in
@@ -771,20 +771,25 @@ sub synthesize_received_header {
     my($hdr);
 
     my($hn) = $SendmailMacros{"if_name"};
+    my($auth) = $SendmailMacros{"auth_authen"};
 
     my $strdate = rfc2822_date();
 
     $hn = get_host_name() unless (defined($hn) and ($hn ne ""));
     if ($RealRelayHostname ne "[$RealRelayAddr]") {
-	$hdr = "Received: from $Helo ($RealRelayHostname [$RealRelayAddr])\n";
+      $hdr = "Received: from $Helo ($RealRelayHostname [$RealRelayAddr])\n";
     } else {
-	$hdr = "Received: from $Helo ([$RealRelayAddr])\n";
+      $hdr = "Received: from $Helo ([$RealRelayAddr])\n";
+    }
+    if($auth) {
+      $hdr .= "\tby $hn (envelope-sender $Sender) (MIMEDefang) with ESMTPA id $MsgID";
+    } else {
+      $hdr .= "\tby $hn (envelope-sender $Sender) (MIMEDefang) with ESMTP id $MsgID";
     }
-    $hdr .= "\tby $hn (envelope-sender $Sender) (MIMEDefang) with ESMTP id $MsgID";
     if ($#Recipients != 0) {
-	$hdr .= "; ";
+      $hdr .= "; ";
     } else {
-	$hdr .= "\n\tfor " . $Recipients[0] . "; ";
+      $hdr .= "\n\tfor " . $Recipients[0] . "; ";
     }
 
     $hdr .= $strdate . "\n";