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.

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

If the option is set, and to anything but true, we don't advertise th… #2869

Merged
merged 2 commits into from
Dec 4, 2020
Merged

If the option is set, and to anything but true, we don't advertise th… #2869

merged 2 commits into from
Dec 4, 2020

Conversation

gene-hightower
Copy link
Contributor

…e SMTPUTF8 extension.

Fixes #2868

Changes proposed in this pull request:

Checklist:

  • docs updated
  • tests updated
  • Changes updated

@msimerson
Copy link
Member

Hi @gene-hightower , lets try instead making sure it's always defined:

diff --git a/connection.js b/connection.js
index 7a2a27bf..49b205e5 100644
--- a/connection.js
+++ b/connection.js
@@ -90,6 +90,7 @@ class Connection {
 
         this.cfg = config.get('smtp.ini', {
             booleans: [
+                '+main.smtputf8',
                 '+headers.add_received',
                 '+headers.show_version',
                 '+headers.clean_auth_results',

@msimerson
Copy link
Member

Related to #2866

@gene-hightower
Copy link
Contributor Author

Great! Much better idea: how do we get this merged?

@msimerson
Copy link
Member

apply that patch to this branch, revert the previous change, and push. Then this PR will have that and I'll merge it

@gene-hightower
Copy link
Contributor Author

apply that patch to this branch, revert the previous change, and push. Then this PR will have that and I'll merge it

Done. Thanks again for working with me to make this happen.

Copy link
Member

@msimerson msimerson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Did you test locally and verify this works as expected?

@gene-hightower
Copy link
Contributor Author

Looks good! Did you test locally and verify this works as expected?

Yes, I tested with my application and it works now just like it should. (I tested with true, false, and no value set. I did not test with other random values)

@msimerson msimerson merged commit 0ab7304 into haraka:master Dec 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The new smtputf8 flag has changed the default (when not set) to disable the extension
2 participants