Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Swap order of EHLO/HELO and rDNS in Received header #270

Merged
merged 1 commit into from

2 participants

@smfreegard
Collaborator

Why? Because I've just noticed that SpamAssassin parses the Received header with the rDNS and HELO in the wrong order currently.

This patch corrects this and makes our Received header similar to Sendmail/Postfix order.

@baudehlo baudehlo merged commit 8d26e92 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 17, 2012
  1. @smfreegard
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 3 deletions.
  1. +4 −3 connection.js
View
7 connection.js
@@ -1095,10 +1095,11 @@ Connection.prototype.received_line = function() {
}
return [
'from ',
- // If no rDNS then use an IP literal here
+ this.hello_host, ' (',
+ // If there is no rDNS, then don't display it
((!/^(?:DNSERROR|NXDOMAIN)/.test(this.remote_info))
- ? this.remote_info : '[' + this.remote_ip + ']'),
- ' (', this.hello_host, ' [', this.remote_ip, ']) ',
+ ? this.remote_info + ' ' : ''),
+ '[', this.remote_ip, '])',
"\n\t",
'by ', config.get('me'), ' (Haraka/', version, ') with ', smtp,
' id ', this.transaction.uuid,
Something went wrong with that request. Please try again.