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

Fix time #1340

Merged
merged 2 commits into from
Dec 28, 2017
Merged

Fix time #1340

merged 2 commits into from
Dec 28, 2017

Conversation

ddpbsd
Copy link
Member

@ddpbsd ddpbsd commented Dec 26, 2017

This should fix issue #210 by not adding 12 to 12pm.

12 pm caused issues with the <time> rule option. __gethour would add
12 to any hour if it was labeled with "pm" and later ruled out any
entries '>= 12'. Unfortunately this included 12 pm, which is a valid
time. So check if the hour is 12, if it is we don't adjust it, otherwise
+12.
@ddpbsd ddpbsd merged commit 72a30ff into ossec:master Dec 28, 2017
@ddpbsd ddpbsd mentioned this pull request Jan 2, 2018
5 tasks
ddpbsd added a commit to ddpbsd/ossec-hids that referenced this pull request Jan 3, 2018
@PSanchezR PSanchezR mentioned this pull request Jan 5, 2018
6 tasks
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.

1 participant