Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix default EHLO banner formatting #3365

Merged
merged 1 commit into from
May 17, 2024
Merged

Fix default EHLO banner formatting #3365

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
self.fail();
});

self.client.on('close', has_error => {

Check warning on line 172 in connection.js

View workflow job for this annotation

GitHub Actions / lint / lint 

'has_error' is defined but never used
if (self.state >= states.DISCONNECTING) return;
self.remote.closed = true;
self.loginfo('client dropped connection', log_data);
Expand Down Expand Up @@ -201,7 +201,7 @@

const ha_list = net.isIPv6(self.remote.ip) ? haproxy_hosts_ipv6 : haproxy_hosts_ipv4;

if (ha_list.some((element, index, array) => {

Check warning on line 204 in connection.js

View workflow job for this annotation

GitHub Actions / lint / lint 

'index' is defined but never used

Check warning on line 204 in connection.js

View workflow job for this annotation

GitHub Actions / lint / lint 

'array' is defined but never used
return ipaddr.parse(self.remote.ip).match(element[0], element[1]);
})) {
self.proxy.allowed = true;
Expand Down Expand Up @@ -685,7 +685,7 @@
}
/////////////////////////////////////////////////////////////////////////////
// SMTP Responses
connect_init_respond (retval, msg) {

Check warning on line 688 in connection.js

View workflow job for this annotation

GitHub Actions / lint / lint 

'retval' is defined but never used

Check warning on line 688 in connection.js

View workflow job for this annotation

GitHub Actions / lint / lint 

'msg' is defined but never used
// retval and message are ignored
this.logdebug('running connect_init_respond');
plugins.run_hooks('lookup_rdns', this);
Expand Down Expand Up @@ -850,7 +850,7 @@
default:
// RFC5321 section 4.1.1.1
// Hostname/domain should appear after 250
this.respond(250, `${this.local.host} Hello ${this.get_remote('host')}${this.ehlo_hello_message}`);
this.respond(250, `${this.local.host} Hello ${this.get_remote('host')}, ${this.ehlo_hello_message}`);
}
}
ehlo_respond (retval, msg) {
Expand Down Expand Up @@ -883,7 +883,7 @@
// Hostname/domain should appear after 250

const response = [
`${this.local.host} Hello ${this.get_remote('host')}${this.ehlo_hello_message}`,
`${this.local.host} Hello ${this.get_remote('host')}, ${this.ehlo_hello_message}`,
"PIPELINING",
"8BITMIME",
];
Expand All @@ -901,7 +901,7 @@
}
}
}
capabilities_respond (retval, msg) {

Check warning on line 904 in connection.js

View workflow job for this annotation

GitHub Actions / lint / lint 

'retval' is defined but never used
this.respond(250, this.capabilities);
}
quit_respond (retval, msg) {
Expand Down
Loading