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

F/minor fixes #794

Merged
merged 2 commits into from
Nov 23, 2015
Merged

F/minor fixes #794

merged 2 commits into from
Nov 23, 2015

Conversation

bazsi
Copy link
Collaborator

@bazsi bazsi commented Nov 21, 2015

This branch contains two minor fixes that are fallouts of previous changes on master.

These are not needed anymore as the entire module is only compiled in case
there's SQL support. Since we prefixed all defined with "SYSLOG_NG" this
module was broken as the Makefile used the old name with the -D option.

Signed-off-by: Balazs Scheidler <balazs.scheidler@balabit.com>
We were trying to assign prefix to a GString, which could be NULL.
This patch fixes this by handling prefix == NULL separately.

Signed-off-by: Balazs Scheidler <balazs.scheidler@balabit.com>
@ihrwein
Copy link
Contributor

ihrwein commented Nov 23, 2015

👍

bazsi added a commit that referenced this pull request Nov 23, 2015
@bazsi bazsi merged commit b061b63 into master Nov 23, 2015
@bazsi bazsi removed the in progress label Nov 23, 2015
@bazsi bazsi deleted the f/minor-fixes branch November 23, 2015 09:37
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.

2 participants