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 global option inheritance in unix socket sources #900

Merged

Conversation

MrAnno
Copy link
Collaborator

@MrAnno MrAnno commented Feb 3, 2016

This is a backport PR, the original pull request can be found here: #896

The global create-dirs and pass-unix-credentials options were not
inherited in afunix-source if the options{}; block was positioned lower in the
configuration file than the given module declaration.

This pull request fixes this issue by moving the "inheritance" assignment from
afunix_sd_new_instance to afunix_sd_init.

@MrAnno MrAnno force-pushed the afsocket-globalcfg-inher-fix-3.7 branch from aacd88f to 24f4551 Compare February 4, 2016 09:50
The global `create-dirs` option was not inherited in afunix-source
if the `options{};` block was positioned lower in the
configuration file than the given module declaration.

This commit fixes this issue by moving the "inheritance" assignment from
`afunix_sd_new_instance` to `afunix_sd_init`.

Signed-off-by: László Várady <laszlo.varady@balabit.com>
The global `pass-unix-credentials` option was not inherited in afunix-source
if the `options{};` block was positioned lower in the
configuration file than the given module declaration.

This commit fixes this issue by moving the "inheritance" assignment from
`afunix_sd_new_instance` to `afunix_sd_init`.

Signed-off-by: László Várady <laszlo.varady@balabit.com>
@bazsi
Copy link
Collaborator

bazsi commented Feb 4, 2016

👍

@ihrwein ihrwein added the bug label Feb 5, 2016
@ihrwein
Copy link
Contributor

ihrwein commented Feb 5, 2016

👍

ihrwein added a commit that referenced this pull request Feb 5, 2016
Fix global option inheritance in afunix-source
@ihrwein ihrwein merged commit 9f2354a into syslog-ng:3.7/master Feb 5, 2016
@ihrwein
Copy link
Contributor

ihrwein commented Feb 5, 2016

Thanks!

@MrAnno MrAnno removed the bug label Feb 5, 2016
@MrAnno MrAnno changed the title Fix global option inheritance in afunix-source Fix global option inheritance in unix socket source Feb 10, 2016
@MrAnno MrAnno changed the title Fix global option inheritance in unix socket source Fix global option inheritance in unix socket sources Feb 10, 2016
@MrAnno MrAnno added the bug label Feb 10, 2016
@MrAnno MrAnno added this to the syslog-ng-3.7.3 milestone Mar 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants