Fix the subject handling. Issue submitted by Michael Starks #1370 #1377
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If CLEANFULL is enabled during the build, and maild.full_subject=0 the email subjects should be smaller. At some point the logic may have been reversed (or the documentation and memories of users are backwards). Either way, allow this to work the way it's understood to work.
Closed
calve
reviewed
Sep 10, 2018
| @@ -135,7 +135,7 @@ MailMsg *OS_RecvMailQ(file_queue *fileq, struct tm *p, | |||
| } | |||
|
|
|||
| /* We have two subject options - full and normal */ | |||
| if (Mail->subject_full) { | |||
| if (Mail->subject_full == 0) { | |||
There was a problem hiding this comment.
This seems to not match the documentation of internal_options.conf
# Maild full subject (0=disabled, 1=enabled)
maild.full_subject=0
Am I missing something ?
There was a problem hiding this comment.
I just packaged OSSEC 3.0.0 and upgraded my monitor;
- on 2.9.3,
maild.full_subject=1is honored and I receiveOSSEC Alerts ...(full) mails. - on 3.0.0,
maild.full_subject=1is not honored and I receiveOSSEC Notifications ...mails. - on 3.0.0,
maild.full_subject=0is somewhat honored and I receiveOSSEC Alerts ...(full) mails.
By the documentation, I did not expected the two last behaviour, but rather the contrary
I suspect this line should be Mail->subject_full == 1?
There was a problem hiding this comment.
Since the behavior expected in the original issue didn't work if Mail->subject_full == 1, I'm guessing the answer is no. I think we should just remove this nonsense and not ever have to worry about it again.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If
CLEANFULLis enabled during the build, andmaild.full_subject=0the email subjects should be smaller. At some point the logic may
have been reversed (or the documentation and memories of users are
backwards).
Either way, allow this to work the way it's understood to work.
I'm not sure if the default in
internal_options.confshould change to 1. I think this would restore the default behavior people may be expecting, but I'm not sure how much it matters.