Permalink
Browse files

Merge pull request #270 from smfreegard/master

Swap order of EHLO/HELO and rDNS in Received header
  • Loading branch information...
2 parents abf4fd6 + 3e718e3 commit 8d26e92f51540f6a3d14ce1b50b52a5ba251326d @baudehlo committed Dec 17, 2012
Showing with 4 additions and 3 deletions.
  1. +4 −3 connection.js
View
@@ -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,

0 comments on commit 8d26e92

Please sign in to comment.